diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index aff42a77..1f60e73b 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -1,39 +1,23 @@
 {
-<<<<<<< HEAD
   "libview.firstColumnWidth": 413,
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://27vd145bp2bz6s",
-    "ui://27vd145bh1uu30"
-=======
-  "libview.firstColumnWidth": 356,
-  "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://27vd145bhxjc7i4q",
-    "ui://kplym8mus9wxa",
-    "ui://fnuxqeflnrnod",
-    "ui://c7j2rnvqtpf02f",
-    "ui://y8prev1ms9wx7",
-    "ui://3z9lj55vjokmft",
-    "ui://4skil1l6piv91ny",
-    "ui://niy3ldiwl9mny",
-    "ui://niy3ldiwl9mn19",
-    "ui://9n9stu2eprgzei",
-    "ui://9n9stu2eprgzef"
->>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc
+    "ui://27vd145bh1uu30",
+    "ui://m7iejg46jgh8hwv"
   ],
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-<<<<<<< HEAD
-  "doc.activeDoc": "ui://27vd145bh1uu30",
-=======
-  "doc.activeDoc": "ui://9n9stu2eprgzef",
->>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc
+  "doc.activeDoc": "ui://m7iejg46jgh8hwv",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
-    "/"
+    "/",
+    "m7iejg46",
+    "/",
+    "m7iejg46",
+    "/mgr/"
   ],
   "snapToGrid": true,
   "backgroundColor": 6710886,
diff --git a/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png
index d4c633b3..8a19fec8 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes
index 47dd4a58..f92ff0a8 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 3be106d2..b0e539de 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index c6724858..760e01e3 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index 1aa7cd1c..7f76ba3b 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes
index 3a7c7b82..7a7d3cb3 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index d2f73a69..8b0ce5e2 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index 730b36c4..71cfd5d5 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 6d91483e..2ee78407 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index babee888..4b33f419 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/changdepaohuzi/ui/Extend_Poker_ChangdeWHZ_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/zipai/changdepaohuzi/ui/Extend_Poker_ChangdeWHZ_fui.bytes
index 4cd9f410..cf78b5f8 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/changdepaohuzi/ui/Extend_Poker_ChangdeWHZ_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/changdepaohuzi/ui/Extend_Poker_ChangdeWHZ_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/fulushou/ui/Extend_Poker_FuLuShou_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/zipai/fulushou/ui/Extend_Poker_FuLuShou_fui.bytes
index f371a9a9..480863ea 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/fulushou/ui/Extend_Poker_FuLuShou_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/fulushou/ui/Extend_Poker_FuLuShou_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/hsrunbeard/ui/Extend_Poker_HSRunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/zipai/hsrunbeard/ui/Extend_Poker_HSRunBeard_fui.bytes
index 8365aa1b..4cfb008b 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/hsrunbeard/ui/Extend_Poker_HSRunBeard_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/hsrunbeard/ui/Extend_Poker_HSRunBeard_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes
index c84c4667..d7edf349 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes
index 7809bb10..e603bbb7 100644
Binary files a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes and b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte
index 2376e55d..d1dbf05e 100644
Binary files a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes
index 7027ade6..da6be253 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes
index 3f030053..96058483 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes
index 9f1d526a..81db312a 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes
index a3258517..a906bca4 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes
index 856233fb..ebde728c 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes
index 0c09352d..cf5ccc94 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes
index f0a57345..920eba96 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes
index 8772e957..816b48b4 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes
index a3d26ee3..5ea531b2 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes
index ba56578d..d4db3efa 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes
index 07108c91..16ea6cbb 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes
index 7e8afb9f..3c0a3f73 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes differ
diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes
index f2f95851..17379ac6 100644
Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes differ