diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua
index 62b32364..7fc31ac5 100644
--- a/lua_probject/base_project/Game/View/LoginView.lua
+++ b/lua_probject/base_project/Game/View/LoginView.lua
@@ -289,9 +289,9 @@ end
function M:LoginCallBack(result, data)
self.isWXCallBackMark = true
- --print("微信登录返回================================================================")
- --print("result===>"..result)
- --pt(data)
+ print("微信登录返回================================================================")
+ print("result===>"..result)
+ pt(data)
if (not result) or result ~= 0 then
if result == 10 then
ViewUtil.ShowModalWait(true, nil, 2)
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
index 58724acb..cb5dbd16 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
@@ -4,76 +4,78 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 970845fb..b27193b1 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -13,7 +13,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
index 484fb1e2..13201bab 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index f41870db..ec8ee2b7 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index 39fd8507..9aedcbd6 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png
index a9e413da..a83a676b 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png
index 44bb3a95..51b41491 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png
index ab227365..76384462 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png
index e3c30386..db9d7b35 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png
index 3ebc5023..31607d4b 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png
index 47aa293d..9d84e2f6 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png
index 7de9fd17..421afdbd 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
index 63ac0fe2..5314c0af 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
index 101d620e..b73069ac 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
index 344ea265..f5111333 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
index b432dd84..32f45590 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
index 55b963fa..2ecb3273 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png
index 4fed1f22..35362fe4 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
index e4afea69..53ca8d13 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
index 952bdab1..9c6ea0fb 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index db9d72d9..f0146291 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index f5f5e284..612e4730 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index 916d4564..7ce66132 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes 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
deleted file mode 100644
index 1fc87fa1..00000000
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and /dev/null 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 fd30057d..f274aa87 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
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 89db4799..48daf239 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ