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