From 723531beb36550a3a4c1d37c6d93ea696ab1e314 Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Tue, 1 Jul 2025 21:41:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GroupMgrController.lua | 6 + lua_probject/base_project/Game/Protocol.lua | 7 +- .../Chat/Component/Btn_MessageTalk.xml | 6 +- .../Main_new/Chat/Image/button_voice.png | Bin 0 -> 10241 bytes .../Main_new/Main/Comp_ConterBox.xml | 22 ++-- .../Main_new/Main/Component/btn_closeRoom.xml | 6 +- .../Main_new/Main/Component/btn_head.xml | 4 +- .../Main_new/Main/Component/btn_invite.xml | 6 +- .../Main_new/Main/Component/btn_normol.xml | 2 +- .../Main_new/Main/Component/btn_ready.xml | 6 +- .../Main_new/Main/Component/btn_setting.xml | 4 +- .../Main/Image/Paizhuo_ziz_btn_zb_normal.png | Bin 0 -> 25122 bytes .../Main_new/Main/Image/btn_xiangq.png | Bin 0 -> 3697 bytes .../Main_new/Main/Image/button_chat.png | Bin 0 -> 7868 bytes .../Main_new/Main/Image/button_desk.png | Bin 0 -> 6555 bytes .../Main_new/Main/Image/button_setting.png | Bin 0 -> 10703 bytes .../Main_new/Main/Image/button_wanfa.png | Bin 0 -> 5285 bytes .../Main_new/Main/Image/dismiss_room.png | Bin 0 -> 17973 bytes .../Main_new/Main/Image/inivite_friend.png | Bin 0 -> 18358 bytes .../Main_new/Main/Image/item_dianchi.png | Bin 0 -> 1578 bytes .../Main_new/Main/Image/looker.png | Bin 0 -> 10959 bytes .../Main/Image/mj_club_yaoqingjulebu_btn.png | Bin 0 -> 12605 bytes .../Main_new/Main/PlayerHead_1.xml | 13 ++- .../Main_new/Main/ProgressBar_jiangxi.xml | 4 +- .../Main_new/Main_new_2/PlayerHead2_2.xml | 18 +-- .../Main_new_2/Player_card_info_2_2.xml | 4 +- .../Main_new/Main_new_2_jiangxi.xml | 103 +++++++++--------- .../Main_new_2/Component/btn_invite.xml | 4 +- .../Main_new_2/Component/btn_ready.xml | 6 +- wb_new_ui/assets/Main_Majiang/package.xml | 19 ++-- .../main_majiang/ui/main_majiang_atlas0.png | Bin 3761181 -> 3461501 bytes .../main_majiang/ui/main_majiang_atlas0_1.png | Bin 4256161 -> 4260003 bytes .../main_majiang/ui/main_majiang_atlas0_2.png | Bin 2454945 -> 2890491 bytes .../main_majiang/ui/main_majiang_atlas0_3.png | Bin 909531 -> 908392 bytes .../main_majiang/ui/main_majiang_fui.bytes | Bin 350408 -> 351317 bytes 35 files changed, 135 insertions(+), 105 deletions(-) create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Chat/Image/button_voice.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/btn_xiangq.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_chat.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_desk.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_setting.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_wanfa.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/dismiss_room.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/inivite_friend.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/item_dianchi.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/looker.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/mj_club_yaoqingjulebu_btn.png diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index f32e2f58..d90f09e6 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -48,6 +48,7 @@ function GroupMgrController.new() self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited + self._eventmap[Protocol.WEB_FG_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom -- self:connect(callback) return self end @@ -342,6 +343,11 @@ function M:FG_ResponseInvited(evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, invite_id, g_name, roomid, pid, groupid) end +function M:FG_Isopen_ChatRoom(evt_data) + print("收到是否开启聊天室推送") + pt(evt_data) +end + function M:PopEvent() local _cacheEvent = self._cacheEvent if (_cacheEvent:Count() > 0) then diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 5969647a..ea0a9fde 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -382,9 +382,12 @@ Protocol = { -- 未读邮件提示事件 FGMGR_EVT_NEW_MAIL = "update_mail_tip", -- 设置允许成员查看聊天室 - WEB_FG_OPEN_ISOPEN_CHATROOM = "13001", + WEB_FG_OPEN_ISOPEN_CHATROOM = "13001", -- 设置不允许成员查看聊天室 - WEB_FG_CLOSE_ISOPEN_CHATROOM = "13002", + WEB_FG_CLOSE_ISOPEN_CHATROOM = "13002", + + -- 监听聊天室是否开启 + WEB_FG_ISOPEN_CHATROOM = "12011", -- 设置是否允许观战 WEB_FG_SET_CANWATCH = "set_group_guest", diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml index 6fad232e..73bb94d9 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml @@ -2,7 +2,9 @@ - + + + -