From 7bcb004ebb460fb3be5cb198bebde128ff69ded7 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Tue, 29 Jul 2025 01:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=89=8C=E7=9A=84=E5=93=AA=E4=B8=AA?= =?UTF-8?q?=E7=89=8C=E5=80=92=E7=89=8C=E3=80=81=E7=BB=93=E7=AE=97=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GroupMgrController.lua | 13 +++++++++---- .../Game/View/Family/FamilyChatRoom.lua | 3 +++ .../Game/View/Family/FamilyEventView.lua | 1 + .../extend/majiang/fuzhou/EXMainView.lua | 2 +- .../extend/majiang/jinxi/EXClearingView.lua | 2 +- .../extend/majiang/jinxi/EXMainView.lua | 3 ++- .../extend/majiang/lichuan/EXClearingView.lua | 2 +- .../extend/majiang/lichuan/EXMainView.lua | 3 ++- .../majiang/nancheng/EXClearingView.lua | 2 +- .../extend/majiang/nancheng/EXMainView.lua | 3 ++- .../Main_new/Main/Component/btn_nextRound.xml | 2 +- .../Main/Component/btn_showClearMain.xml | 2 +- wb_new_ui/assets/Main_Majiang/package.xml | 2 ++ .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 2271003 -> 2516584 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 4725217 -> 4656165 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3686673 -> 3695636 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 378626 -> 378668 bytes 17 files changed, 27 insertions(+), 13 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index edac9f58..ee358ab3 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -260,7 +260,9 @@ function M:OnEvtUpdateRoom(evt_data) for _, room in pairs(cmds) do for _, palyingUser in pairs(room.plist or {}) do local _player = group.memberMap[palyingUser.aid] - _player.playing = "startPlaying" + if _player then + _player.playing = "startPlaying" + end end end @@ -539,15 +541,18 @@ function M:OnMemberOnline(evt_data) local group = DataManager.groups:get(self.groupId) - for _, player in pairs(group.members) do + for _, player in pairs(group.members) do player.online = 0 end for _, uid in pairs(evt_data.onlineUserId) do local player = group.memberMap[uid] - player.online = 1 + + if player then + player.online = 1 + end end - + DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua index 0c7e03d4..26e1ec96 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua @@ -184,6 +184,9 @@ function FamilyChatRoom:Show() local getData = self.group.records == nil mgr_ctr:FG_ENTER_CHATROOM(self.root._group.id, getData, function(res) + if res.returnCode == 0 then + ViewUtil.ShowModalWait(self._root_view, "正在加载聊天室......") + end end) local cChatRoom = self.root._view:GetController("cIsChatRoom") diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index b90920df..b6c26c37 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -218,6 +218,7 @@ function M:_evtChatRoomData(...) return end view.com_FamilyChatRoom:Refalsh() + ViewUtil.CloseModalWait() end function M:_evtOnNewRecord(...) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 1529ac3f..09edf644 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -313,8 +313,8 @@ function M:EventInit() local info = self._player_card_info[index] self:RemoveCursor() --info:UpdateHandCard(false, false) - info:ShowHuCard(win_card) + local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card obj_win_card:GetController("bg").selectedIndex = 1 diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index 9b592eb4..43bc43fc 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne if result then result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + --table.sort(result.cardList) end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index ab56a247..3e1355ee 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -309,7 +309,8 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(true, false) + --info:UpdateHandCard(true, false) + info:ShowHuCard(win_card) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index ded6138b..970871aa 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua @@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne if result then result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + --table.sort(result.cardList) end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 1aabb032..7f8f3a3b 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -310,7 +310,8 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, false) + --info:UpdateHandCard(false, false) + info:ShowHuCard(win_card) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index 51d3a874..c864def5 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne if result then result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + --table.sort(result.cardList) end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 03bacbda..e8d9fabf 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -311,7 +311,8 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, false) + --info:UpdateHandCard(false, false) + info:ShowHuCard(win_card) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml index d1ca2f8d..a22f5fc0 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml @@ -2,7 +2,7 @@ - +