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 @@ - + + + -