diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index 6149e9f0..83f32916 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -47,8 +47,10 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + if result then + result.cardList = json.decode(result.cardList) + table.sort(result.cardList) + end self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard:SetVirtual() @@ -127,6 +129,8 @@ function M:fillResult0(room, peopleNum, result) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, room.room_config.round, gamePlay) + self.list_lastCard.numItems = #result.cardList + self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList) for i = 1, peopleNum do local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) @@ -151,7 +155,6 @@ function M:fillResult0(room, peopleNum, result) infoList.gang_score = infoList.gang_score or 0 infoList.hu_score = infoList.hu_score or 0 infoList.round_score = infoList.round_score or 0 - self.list_lastCard.numItems = #result.cardList playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua index ab82a79f..13725234 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua @@ -332,7 +332,9 @@ function M:OneventResult1(evt_data) --0：小结算 1：小大结算 2：大结算 self._room._reload_flag = false self._room.playing = false - evt_data.result.cardList = evt_data.cardList + if evt_data.result then + evt_data.result.cardList = evt_data.cardList + end if 0 == over then local result = evt_data.result self._cacheEvent:Enqueue(function() diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index 3b443c33..1bc7f836 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -47,8 +47,10 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + if result then + result.cardList = json.decode(result.cardList) + table.sort(result.cardList) + end self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard:SetVirtual() @@ -127,6 +129,8 @@ function M:fillResult0(room, peopleNum, result) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, room.room_config.round, gamePlay) + self.list_lastCard.numItems = #result.cardList + self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList) for i = 1, peopleNum do local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) @@ -151,7 +155,6 @@ function M:fillResult0(room, peopleNum, result) infoList.gang_score = infoList.gang_score or 0 infoList.hu_score = infoList.hu_score or 0 infoList.round_score = infoList.round_score or 0 - self.list_lastCard.numItems = #result.cardList playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index eebf2f38..c49be0c7 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -332,7 +332,9 @@ function M:OneventResult1(evt_data) --0：小结算 1：小大结算 2：大结算 self._room._reload_flag = false self._room.playing = false - evt_data.result.cardList = evt_data.cardList + if evt_data.result then + evt_data.result.cardList = evt_data.cardList + end if 0 == over then local result = evt_data.result self._cacheEvent:Enqueue(function() diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index 7d269374..ded6138b 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua @@ -47,8 +47,10 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + if result then + result.cardList = json.decode(result.cardList) + table.sort(result.cardList) + end self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard:SetVirtual() @@ -125,6 +127,8 @@ function M:fillResult0(room, peopleNum, result) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, room.room_config.round, gamePlay) + self.list_lastCard.numItems = #result.cardList + self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList) for i = 1, peopleNum do local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) @@ -149,7 +153,6 @@ function M:fillResult0(room, peopleNum, result) infoList.gang_score = infoList.gang_score or 0 infoList.hu_score = infoList.hu_score or 0 infoList.round_score = infoList.round_score or 0 - self.list_lastCard.numItems = #result.cardList playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 450714d4..852c04a7 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -333,7 +333,9 @@ function M:OneventResult1(evt_data) --0：小结算 1：小大结算 2：大结算 self._room._reload_flag = false self._room.playing = false - evt_data.result.cardList = evt_data.cardList + if evt_data.result then + evt_data.result.cardList = evt_data.cardList + end if 0 == over then local result = evt_data.result self._cacheEvent:Enqueue(function() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index e305144d..f380fe86 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -47,8 +47,10 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + if result then + result.cardList = json.decode(result.cardList) + table.sort(result.cardList) + end self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard:SetVirtual() @@ -125,6 +127,8 @@ function M:fillResult0(room, peopleNum, result) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, room.room_config.round, gamePlay) + self.list_lastCard.numItems = #result.cardList + self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList) for i = 1, peopleNum do local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) @@ -149,7 +153,6 @@ function M:fillResult0(room, peopleNum, result) infoList.gang_score = infoList.gang_score or 0 infoList.hu_score = infoList.hu_score or 0 infoList.round_score = infoList.round_score or 0 - self.list_lastCard.numItems = #result.cardList playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua index 99a225d0..36c3b4e3 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua @@ -332,7 +332,9 @@ function M:OneventResult1(evt_data) --0：小结算 1：小大结算 2：大结算 self._room._reload_flag = false self._room.playing = false - evt_data.result.cardList = evt_data.cardList + if evt_data.result then + evt_data.result.cardList = evt_data.cardList + end if 0 == over then local result = evt_data.result self._cacheEvent:Enqueue(function() diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml new file mode 100644 index 00000000..be816b97 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + +