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 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Image/button_voice.png b/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Image/button_voice.png
new file mode 100644
index 00000000..7607c002
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Chat/Image/button_voice.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml
index b88bc926..f86e8554 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml
@@ -1,21 +1,27 @@
-
-
+
+
-
-
+
+
+
+
+
-
+
+
-
+
+
-
+
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml
index b1f9ef9a..5a09477c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml
@@ -2,7 +2,9 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_head.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_head.xml
index fa490085..20f87195 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_head.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_head.xml
@@ -5,10 +5,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml
index 07c944af..5fea1c85 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml
@@ -2,7 +2,9 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml
index 4912fd7a..287a0238 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml
index fc98753d..34167b92 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml
@@ -2,7 +2,9 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_setting.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_setting.xml
index 2d60be6f..3fe92302 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_setting.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_setting.xml
@@ -2,7 +2,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png
new file mode 100644
index 00000000..0f37c9d5
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/btn_xiangq.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/btn_xiangq.png
new file mode 100644
index 00000000..1fe3e433
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/btn_xiangq.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_chat.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_chat.png
new file mode 100644
index 00000000..25b767e0
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_chat.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_desk.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_desk.png
new file mode 100644
index 00000000..008dc83a
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_desk.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_setting.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_setting.png
new file mode 100644
index 00000000..dd954b8b
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_setting.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_wanfa.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_wanfa.png
new file mode 100644
index 00000000..1feba8ca
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_wanfa.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/dismiss_room.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/dismiss_room.png
new file mode 100644
index 00000000..ad301973
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/dismiss_room.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/inivite_friend.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/inivite_friend.png
new file mode 100644
index 00000000..ceb588a1
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/inivite_friend.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/item_dianchi.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/item_dianchi.png
new file mode 100644
index 00000000..cee73e52
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/item_dianchi.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/looker.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/looker.png
new file mode 100644
index 00000000..4dd273b5
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/looker.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/mj_club_yaoqingjulebu_btn.png b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/mj_club_yaoqingjulebu_btn.png
new file mode 100644
index 00000000..fc057a9f
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/mj_club_yaoqingjulebu_btn.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
index 1fb90872..a835f181 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
@@ -34,7 +34,9 @@
-
+
+
+
@@ -62,12 +64,11 @@
-
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
index 3bc44b27..a666a62c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
index 0373db61..a2a74f5e 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
@@ -11,8 +11,8 @@
-
-
+
+
@@ -34,8 +34,8 @@
-
-
+
+
@@ -55,12 +55,12 @@
-
-
-
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
index 7f67e7ca..e44d0708 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
@@ -3,7 +3,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
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 c8d5b689..98050d9b 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,12 +1,12 @@
-
+
-
+
@@ -30,19 +30,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -76,25 +76,25 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -102,79 +102,76 @@
-
+
-
-
+
-
-
+
-
+
-
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -230,9 +227,9 @@
-
+
-
+
@@ -241,11 +238,11 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_invite.xml b/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_invite.xml
index a7fe1e1a..642ad504 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_invite.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_invite.xml
@@ -2,7 +2,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_ready.xml b/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_ready.xml
index fc98753d..21bf3b7d 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_ready.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_ready.xml
@@ -2,7 +2,9 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 97d1bb06..30802843 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -961,7 +961,6 @@
-
@@ -982,8 +981,6 @@
-
-
@@ -992,7 +989,6 @@
-
@@ -1213,7 +1209,6 @@
-
@@ -1223,7 +1218,6 @@
-
@@ -1337,7 +1331,6 @@
-
@@ -1399,6 +1392,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png
index 0dbba2a9..7779191b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png
index d18b49f6..6101f311 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png
index d200d640..488430d7 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png
index df419f6d..f016c8ef 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
index 7c848e1e..8cfe7ae9 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes differ