Merge branch 'game' of http://127.0.0.1:3000/fatiao/ro-webgl into game
This commit is contained in:
commit
2efafd1530
@ -103,6 +103,7 @@ function UILiveRoomView:AddEventListener()
|
|||||||
--准备 数据
|
--准备 数据
|
||||||
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.SC_LIVE_ROOM_GET_READY_NTF,
|
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.SC_LIVE_ROOM_GET_READY_NTF,
|
||||||
function(data)
|
function(data)
|
||||||
|
self.card_player_list = {}
|
||||||
self.answer_player_list = {}
|
self.answer_player_list = {}
|
||||||
self.game_player_list = {}
|
self.game_player_list = {}
|
||||||
for k, v in pairs(data.ready_player_info_list) do
|
for k, v in pairs(data.ready_player_info_list) do
|
||||||
@ -110,6 +111,7 @@ function UILiveRoomView:AddEventListener()
|
|||||||
uid2info[v.uid] = info
|
uid2info[v.uid] = info
|
||||||
self.answer_player_list[v.uid] = info
|
self.answer_player_list[v.uid] = info
|
||||||
self.game_player_list[v.uid] = info
|
self.game_player_list[v.uid] = info
|
||||||
|
self.card_player_list[v.uid] = info
|
||||||
end
|
end
|
||||||
LogWarning("tzy_ready_ntf: " .. Inspect(data))
|
LogWarning("tzy_ready_ntf: " .. Inspect(data))
|
||||||
|
|
||||||
@ -178,10 +180,16 @@ function UILiveRoomView:AddEventListener()
|
|||||||
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.SC_LIVE_ROOM_RESULT_NTF,
|
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.SC_LIVE_ROOM_RESULT_NTF,
|
||||||
function(data)
|
function(data)
|
||||||
LogWarning("tzy_result_: " .. Inspect(data))
|
LogWarning("tzy_result_: " .. Inspect(data))
|
||||||
|
|
||||||
local itemlua = self:GetCurrPageLua()
|
local itemlua = self:GetCurrPageLua()
|
||||||
|
|
||||||
if data.room_id == LIVEROOM_TYPE_CARD then
|
if data.room_id == LIVEROOM_TYPE_CARD then
|
||||||
|
|
||||||
|
if self.card_player_list~=nil and self.card_player_list[data.uid] ~= nil then
|
||||||
self:Result_Card(itemlua, data)
|
self:Result_Card(itemlua, data)
|
||||||
|
else
|
||||||
|
self:Result_Card(itemlua, nil)
|
||||||
|
end
|
||||||
elseif data.room_id == LIVEROOM_TYPE_SELL then
|
elseif data.room_id == LIVEROOM_TYPE_SELL then
|
||||||
self:Result_Sell(itemlua, data)
|
self:Result_Sell(itemlua, data)
|
||||||
elseif data.room_id == LIVEROOM_TYPE_ANSWER then
|
elseif data.room_id == LIVEROOM_TYPE_ANSWER then
|
||||||
@ -1737,7 +1745,13 @@ end
|
|||||||
|
|
||||||
--结算 抽卡
|
--结算 抽卡
|
||||||
function UILiveRoomView:Result_Card(itemlua, data)
|
function UILiveRoomView:Result_Card(itemlua, data)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local r_card = itemlua.resultPad.rect_card
|
local r_card = itemlua.resultPad.rect_card
|
||||||
|
|
||||||
|
if data ==nil then return end
|
||||||
|
|
||||||
r_card:SetActive(true)
|
r_card:SetActive(true)
|
||||||
local title = r_card.text_title
|
local title = r_card.text_title
|
||||||
title.text.text = I18N.T("抽卡结果")
|
title.text.text = I18N.T("抽卡结果")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user