diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index d8e837f5..73512dc5 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -692,7 +692,7 @@ function M:OnEvtEnterWitness(msg) end function M:OnEvtExieWitness(msg) - DispatchEvent(self._dispatcher, GameEvent.WitnessPlayerLeave, msg.playyer) + DispatchEvent(self._dispatcher, GameEvent.WitnessPlayerLeave, msg.player) end function M:OnEventFzAction(msg) diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 340f0463..cde17e18 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -915,22 +915,7 @@ function M:EventInit() _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, handler(self, self.OnPlayerWitnessEnter)) - _gamectr:AddEventListener( - GameEvent.WitnessPlayerLeave, - function(...) - -- print("刷新托管数据=====") - local arg = { ... } - local player = arg[1] - local witnessPlayerList = _room.witness_player_list - for i, _player in ipairs(witnessPlayerList) do - if _player.uid == player then - table.remove(witnessPlayerList, i) - return - end - end - _room._flag_updateWitness = true - end - ) + _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, handler(self, self.OnPlayerWitnessLeave)) _gamectr:AddEventListener(GameEvent.HOMESTATE, function(...) local arg = { ... } @@ -1037,6 +1022,19 @@ function M:OnPlayerWitnessEnter(...) self._room.witness_player_list = witnessPlayerList end +function M:OnPlayerWitnessLeave(...) + ---- print("刷新托管数据=====") + local arg = { ... } + local player = arg[1] + local witnessPlayerList = self._room.witness_player_list + for i, _player in ipairs(witnessPlayerList) do + if _player.uid == player then + table.remove(witnessPlayerList, i) + return + end + end +end + function M:OnPlayerEnter(...) printlog("进入房间222222222222222222++++++++++++++++++++++++++++") local arg = { ... } diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 99b19cbb..af13d851 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -169,6 +169,28 @@ function M:EventInit() end end) + _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...) + ---- print("刷新托管数据=====") + local arg = { ... } + local player = arg[1] + local witnessPlayerList = self._room.witness_player_list + for i, _player in ipairs(witnessPlayerList) do + if _player.aid == player then + table.remove(witnessPlayerList, i) + break + end + end + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index a7b48370..f5cc16d7 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -527,6 +527,28 @@ function M:OnPlayerWitnessEnter(...) end end +function M:OnPlayerWitnessLeave(...) + ---- print("刷新托管数据=====") + local arg = { ... } + local player = arg[1] + local witnessPlayerList = self._room.witness_player_list + for i, _player in ipairs(witnessPlayerList) do + if _player.aid == player then + table.remove(witnessPlayerList, i) + break + end + end + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end +end + function M:CountCardLeftNum(card) local player_list = DataManager.CurrenRoom.player_list local count = 4 diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index 16b82023..0ab66ea5 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ - + @@ -44,14 +44,14 @@