diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index 90e29466..575d578f 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -66,7 +66,7 @@ function M:InitView(url)
end)
view:GetChild("tex_name").text = DataManager.SelfUser.nick_name
- view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id)
+ view:GetChild("tex_id").text = string.format("ID:%s", DataManager.SelfUser.account_id)
view:GetChild("gcm_diamo").text = tostring(DataManager.SelfUser.diamo)
diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
index 24a426c2..74b98408 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
@@ -1101,6 +1101,7 @@ function M:InitView(url)
-- 快速开始按钮
local btn_start2 = self._view:GetChild('btn_start2')
+ btn_start2.visible = true
btn_start2.onClick:Set(
function()
local currentPlayID = self:GetSelectedPlayID()
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png
index 85f03107..e078dbbb 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes
index 8d46756e..f8239774 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png
index 78256ea4..ab4b6654 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes
index 51849c74..0e96c4ac 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
index 2982f257..686a1ec8 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
@@ -16,6 +16,7 @@
"hidden": true
},
"n130_naup": {
+ "locked": true,
"hidden": true
},
"n140_csp4": {
diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml
index 060a4fa7..35ae617a 100644
--- a/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/wb_new_ui/assets/Hotupdate/Version.xml
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
index c645b00b..e6d2d0d5 100644
--- a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
+++ b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
@@ -1,10 +1,10 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml
index 343a3bbc..a128075d 100644
--- a/wb_new_ui/assets/Lobby/Main.xml
+++ b/wb_new_ui/assets/Lobby/Main.xml
@@ -10,75 +10,80 @@
-
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
-
+
-
+
-
-
-
-
-
+
-
+
-
-
+
-
-
+
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -94,7 +99,7 @@
-
+
@@ -105,20 +110,20 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_huodong.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_huodong.xml
new file mode 100644
index 00000000..f7d1862c
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_huodong.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_kefu.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_kefu.xml
new file mode 100644
index 00000000..bb5e4991
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_kefu.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_setting.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_setting.xml
new file mode 100644
index 00000000..466e1e65
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_setting.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
index 89c6355a..13718239 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_wanfa.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_wanfa.xml
new file mode 100644
index 00000000..612850e5
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_wanfa.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_xiaoxi.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_xiaoxi.xml
new file mode 100644
index 00000000..7f1e34dc
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_xiaoxi.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_zhanji.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_zhanji.xml
new file mode 100644
index 00000000..45cc48f0
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_zhanji.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml b/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
index 9958b628..4a5a198d 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml b/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
index 8f55749f..2468e6d9 100644
--- a/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/Lobby/images/index/Group 641.png b/wb_new_ui/assets/Lobby/images/index/Group 641.png
new file mode 100644
index 00000000..60723e64
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/index/Group 641.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 714e1202..6bf7125e 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -581,9 +581,9 @@
-
+
-
+
@@ -597,7 +597,7 @@
-
+
@@ -657,6 +657,13 @@
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 3f0826be..51482f7f 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -20,8 +20,8 @@
-
-
+
+
@@ -149,7 +149,7 @@
-
+
@@ -173,9 +173,9 @@
-
+
-
+
@@ -188,7 +188,7 @@
-
+
@@ -206,7 +206,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
index 5a99830d..a790dbfc 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
@@ -4,13 +4,14 @@
+
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
index 732ea797..e088cdb6 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
@@ -1,28 +1,32 @@
-
-
+
+
-
+
-
+
+
-
+
+
-
+
-
+
+
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml
index 1349b611..a9d8cdd1 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml
index f0bed38b..481bdff0 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml
index 33fab0a9..2e17d014 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 2f37a2c2..5c29d019 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -954,7 +954,7 @@
-
+