diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua
index 7561d507..b09b8e84 100644
--- a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua
+++ b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua
@@ -79,14 +79,14 @@ function M:fill_user_info()
pw_view:Show()
end)
- self:fill_item("iuo_retrieve", password, function()
- local _data_info = {}
- _data_info.only_retrieve = true
- local pw_view = IDPasswordAlone.new(_data_info, function()
- self:fill_user_info()
- end)
- pw_view:Show()
- end)
+ -- self:fill_item("iuo_retrieve", password, function()
+ -- local _data_info = {}
+ -- _data_info.only_retrieve = true
+ -- local pw_view = IDPasswordAlone.new(_data_info, function()
+ -- self:fill_user_info()
+ -- end)
+ -- pw_view:Show()
+ -- end)
local invitation = self._user.invitation
local item_invte = self.user_info:GetChild("item_invte")
diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json
index 2455e9f8..5445bed3 100644
--- a/wb_new_ui/.objs/fonts.json
+++ b/wb_new_ui/.objs/fonts.json
@@ -8,36 +8,17 @@ ui://27vd145boviihyz
ui://27vd145bqz637ij2
ui://27vd145bz5om44
ui://3qr8nmi47q1m2h
-ui://visk5g30gq7mp
-ui://visk5g30gq7m3n
-ui://visk5g30gq7m38
-ui://visk5g30gq7m4h
-ui://visk5g30gq7m1c
ui://fnuxqeflkllg1u
ui://fnuxqeflkllg1v
ui://egnzysm7ffp38o
ui://egnzysm7ffp35q
-ui://v2hilfzbgq7mbt
-ui://v2hilfzbgq7mbs
-ui://v2hilfzbgq7m2k
-ui://v2hilfzbgq7ml
ui://1utjt0r2ufu98l
ui://1utjt0r2ufu98k
ui://ppu1wv7699we4s
ui://ppu1wv7699we2l
-ui://oubpz2r2ofil78
-ui://oubpz2r2ofil77
ui://9n9stu2enaueci9
ui://9n9stu2enauecht
-ui://awernf6xbazq7b
-ui://awernf6xbazq7a
-ui://qpsoxvainaueci9
-ui://qpsoxvainauecht
-ui://b8jloj2qnaueci9
-ui://b8jloj2qnauecht
-ui://v09du5djgq7m6
ui://eyxz924gffp34g
-ui://v2emygzogq7m8
ui://4wmd3o8gvlhjde
ui://z3z0ysurvlhj7t
ui://96mvx2mlvlhjcsv
@@ -56,4 +37,4 @@ ui://4skil1l6vmtu1l8
ui://4skil1l6piv91ln
ui://4skil1l6jsw9117
ui://m7iejg46eany7iev
-ui://m7iejg46hz877im7
+ui://m7iejg46hz877ioj
diff --git a/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info
new file mode 100644
index 00000000..d6938b5d
--- /dev/null
+++ b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n4_hz87": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
index 50f90b8e..46e69696 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
@@ -3,6 +3,9 @@
"n154_cioe": {
"hidden": true
},
+ "n152_cioe": {
+ "hidden": true
+ },
"n214_ovii": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
index e0787291..9e26dfee 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n120_l7wn": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info
index 06937148..e9ce61ad 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n133_et16": {
+ "hidden": true
+ },
"n107_sbng": {
"hidden": true
},
@@ -12,10 +15,16 @@
"n101_sbng": {
"hidden": true
},
+ "n147_iaes": {
+ "hidden": true
+ },
"n78_nk4v": {
"hidden": true
},
- "n133_et16": {
+ "n138_iaes": {
+ "hidden": true
+ },
+ "n141_iaes": {
"hidden": true
},
"n98_yetw": {
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info
index ee959abf..0c6f5467 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info
@@ -19,8 +19,7 @@
"hidden": true
},
"n7_kwi0": {
- "hidden": true,
- "collapsed": true
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
index e1565a76..23ec9e08 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
@@ -3,9 +3,6 @@
"n35_rpaz": {
"collapsed": true
},
- "n45_tqi8": {
- "collapsed": true
- },
"n33_rpaz": {
"collapsed": true
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info
index 19cdda91..e1485f0f 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info
@@ -6,9 +6,6 @@
"n51_t1hq": {
"collapsed": true
},
- "n46_rpaz": {
- "collapsed": true
- },
"n44_rpaz": {
"collapsed": true
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
index 26667d5b..f64d3345 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
@@ -3,12 +3,6 @@
"n86_kwi0": {
"hidden": true
},
- "n134_lcv1": {
- "collapsed": true
- },
- "n197_imp5": {
- "collapsed": true
- },
"n157_sbng": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info
index 72174507..5308e708 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info
@@ -1,7 +1,7 @@
{
"objectStatus": {
- "n121_l679": {
- "collapsed": true
+ "n123_omkm": {
+ "hidden": true
},
"n142_m16m": {
"hidden": true
@@ -12,9 +12,6 @@
"n122_j120": {
"hidden": true
},
- "n123_omkm": {
- "hidden": true
- },
"n86_kwi0": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info b/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info
index 3530ca0d..a8a0bfde 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/lcv1hwt.info
@@ -1,9 +1,12 @@
{
"objectStatus": {
- "n134_lcv1": {
+ "n139_qjw9": {
"collapsed": true
},
- "n104_kwi0": {
+ "n140_qjw9": {
+ "collapsed": true
+ },
+ "n134_lcv1": {
"collapsed": true
}
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info
index ecec8f54..0c262103 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n104_vyn3": {
+ "hidden": true
+ },
"n94_jj65": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 128f6f43..59e22c68 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,55 +1,112 @@
{
"libview.firstColumnWidth": 338,
+ "test.device": "720p Phone",
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://m7iejg46ilon7ias",
+ "ui://m7iejg46i5987i75",
"ui://m7iejg4610snh5j",
- "ui://m7iejg46ilon7i9l",
- "ui://m7iejg46ilon7i9m",
- "ui://m7iejg46iaes7idc",
- "ui://m7iejg46iaes7idk",
- "ui://m7iejg46hwww2f",
- "ui://m7iejg46iaes7idb",
- "ui://m7iejg46iaes7idj",
- "ui://m7iejg46yvb27ik0",
- "ui://m7iejg46mpllhuq",
- "ui://2zlli80mw9te0",
- "ui://2d9xdj6zfn7fao",
- "ui://2d9xdj6zker3jg",
- "ui://2d9xdj6zoviicm0",
- "ui://0khx14aryvb27i4z",
- "ui://0khx14aryvb27i51",
- "ui://0khx14are0py2",
- "ui://27vd145bl0lz9",
+ "ui://m7iejg46cvc87i5y",
+ "ui://m7iejg46nk4vhwh",
+ "ui://m7iejg46r0qx7i6u",
+ "ui://m7iejg46ruljhmp",
+ "ui://m7iejg46r96th8e",
+ "ui://m7iejg4610xl7i1w",
+ "ui://m7iejg46qlxihsl",
+ "ui://m7iejg46kwi0hld",
+ "ui://m7iejg46kwi0hmb",
+ "ui://m7iejg46kwi0hk0",
+ "ui://m7iejg46qlxihsm",
+ "ui://m7iejg46kwi0hk1",
+ "ui://m7iejg46kwi0hkb",
+ "ui://m7iejg46ilon7i9k",
+ "ui://m7iejg46ilon7ia2",
+ "ui://m7iejg46tt6k7ika",
+ "ui://l0ds4ys6h1uu26",
+ "ui://z1qthxavlrfi0",
+ "ui://m7iejg46l7wn7i80",
+ "ui://m7iejg46lf2qhju",
+ "ui://m7iejg46l7wn7i81",
+ "ui://m7iejg46l7wn7i82",
+ "ui://m7iejg46kwdo7i97",
+ "ui://m7iejg468h207i99",
+ "ui://m7iejg46nwgkhx0",
+ "ui://m7iejg46nwgkhx2",
+ "ui://m7iejg46kk3uhro",
+ "ui://m7iejg46l7wn7i83",
+ "ui://m7iejg46kwi0hm5",
+ "ui://m7iejg46l679hwn",
+ "ui://9n9stu2eprgzee",
+ "ui://9n9stu2em9jahb",
+ "ui://m7iejg46k5m97i76",
+ "ui://m7iejg46tqi8hwa",
+ "ui://m7iejg46f6brhwx",
"ui://m7iejg46hsbhhjn",
- "ui://m7iejg46t1hqhy5",
- "ui://m7iejg46gojuhh5",
- "ui://m7iejg46jgh8hwv",
- "ui://m7iejg46avqi7ijp",
- "ui://m7iejg46r0qx7i6v",
"ui://m7iejg46imp57ih3",
- "ui://m7iejg46imp57igy",
- "ui://m7iejg46ilon7ibl",
- "ui://m7iejg46imp57ihp",
"ui://m7iejg46kwi0hma",
- "ui://m7iejg46ilon7ia2"
+ "ui://2zlli80mw9te0",
+ "ui://0khx14are0py2",
+ "ui://2d9xdj6zfn7fao",
+ "ui://2d9xdj6zlumrgj",
+ "ui://m7iejg46jqcwc",
+ "ui://x3mp2cn6r5wqh",
+ "ui://27vd145bl0lz9",
+ "ui://m7iejg46jgh8hwv",
+ "ui://3qr8nmi4v38kq",
+ "ui://3qr8nmi4xtwh1n",
+ "ui://3qr8nmi4v38kr",
+ "ui://s63l0suw6cpqv",
+ "ui://s63l0suw6cpqr",
+ "ui://s63l0suw6cpqt",
+ "ui://s63l0suw6cpqs",
+ "ui://fnuxqeflnrnod",
+ "ui://fnuxqefl8kzvy",
+ "ui://fnuxqeflxtwhv",
+ "ui://fnuxqefl8kzv10",
+ "ui://egnzysm7ffp36a",
+ "ui://27vd145bpgy941",
+ "ui://2d9xdj6zxbqujn",
+ "ui://2d9xdj6znaupko",
+ "ui://2d9xdj6zsvin7e2f",
+ "ui://egnzysm7ffp35o",
+ "ui://4skil1l6uwvl1qp",
+ "ui://4skil1l6piv91o7",
+ "ui://4skil1l6piv91o5",
+ "ui://4skil1l6piv91mg",
+ "ui://4skil1l6piv91nt",
+ "ui://4skil1l6piv91ny",
+ "ui://v0j9abjygq7mdl",
+ "ui://m7iejg46e5q7hu2",
+ "ui://1utjt0r2ufu923",
+ "ui://1utjt0r2ufu945",
+ "ui://3qr8nmi4v38ku",
+ "ui://m7iejg46avqi7ijp",
+ "ui://m7iejg46kk3uhrs",
+ "ui://m7iejg465ff3hud",
+ "ui://m7iejg46hsbhhj4",
+ "ui://m7iejg46irlqhyt",
+ "ui://m7iejg46ilon7ibl",
+ "ui://m7iejg46jr1l7i3c",
+ "ui://m7iejg46lcv1hwt",
+ "ui://m7iejg46cioeho9",
+ "ui://m7iejg46z3847i6r",
+ "ui://m7iejg46imp57ihp",
+ "ui://m7iejg46z3847i6m",
+ "ui://m7iejg46kwi0hkr"
],
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://2d9xdj6zfn7fao",
+ "doc.activeDoc": "ui://2d9xdj6zsvin7e2f",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "2d9xdj6z",
+ "m7iejg46",
"/",
- "2d9xdj6z",
- "/images/",
- "2d9xdj6z",
- "/images/clip_createRoom/",
- "2d9xdj6z",
- "/images/clip_group/"
+ "m7iejg46",
+ "/mgr/"
],
"snapToGrid": true,
+ "test.orientation": "landscape",
"backgroundColor": 6710886,
"libview.currentGroup": "",
"gridSize": 30,
diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml
index b992cda0..3651d6e0 100644
--- a/wb_new_ui/assets/Common/MessageBox.xml
+++ b/wb_new_ui/assets/Common/MessageBox.xml
@@ -5,13 +5,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Common/MessageBox1.xml b/wb_new_ui/assets/Common/MessageBox1.xml
index 43b720f8..a0e4b50c 100644
--- a/wb_new_ui/assets/Common/MessageBox1.xml
+++ b/wb_new_ui/assets/Common/MessageBox1.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/wb_new_ui/assets/Common/buttons/Btn_close.xml b/wb_new_ui/assets/Common/buttons/Btn_close.xml
index 0565df2a..311c78e5 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_close.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_close.xml
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml b/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml
index 096e76ed..90eb266a 100644
--- a/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml
+++ b/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml
@@ -4,11 +4,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png b/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png
index 5587f500..fe53ee44 100644
Binary files a/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png and b/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png differ
diff --git a/wb_new_ui/assets/Common/font/images/ann_queding.png b/wb_new_ui/assets/Common/font/images/ann_queding.png
index 47d01b44..10c880ea 100644
Binary files a/wb_new_ui/assets/Common/font/images/ann_queding.png and b/wb_new_ui/assets/Common/font/images/ann_queding.png differ
diff --git a/wb_new_ui/assets/Common/font/images/ann_queren.png b/wb_new_ui/assets/Common/font/images/ann_queren.png
index 874a00c5..10c880ea 100644
Binary files a/wb_new_ui/assets/Common/font/images/ann_queren.png and b/wb_new_ui/assets/Common/font/images/ann_queren.png differ
diff --git a/wb_new_ui/assets/Common/font/images/ann_quxiao.png b/wb_new_ui/assets/Common/font/images/ann_quxiao.png
index 7495a1c6..f11d3a28 100644
Binary files a/wb_new_ui/assets/Common/font/images/ann_quxiao.png and b/wb_new_ui/assets/Common/font/images/ann_quxiao.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png
index cd622749..da07a77f 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png
index 0e1be941..2c6e631b 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png
index e5f7be47..41f7922d 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/dismiss_room/W01.png b/wb_new_ui/assets/Common/font/images/dismiss_room/W01.png
index 16c73d32..9f77ca0d 100644
Binary files a/wb_new_ui/assets/Common/font/images/dismiss_room/W01.png and b/wb_new_ui/assets/Common/font/images/dismiss_room/W01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/dismiss_room/W02.png b/wb_new_ui/assets/Common/font/images/dismiss_room/W02.png
index 35a04d72..45ad2500 100644
Binary files a/wb_new_ui/assets/Common/font/images/dismiss_room/W02.png and b/wb_new_ui/assets/Common/font/images/dismiss_room/W02.png differ
diff --git a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png
index 1f4b52dd..2fd31da7 100644
Binary files a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png and b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/wwww.png b/wb_new_ui/assets/Common/font/images/wwww.png
index 9badefe4..9c254383 100644
Binary files a/wb_new_ui/assets/Common/font/images/wwww.png and b/wb_new_ui/assets/Common/font/images/wwww.png differ
diff --git a/wb_new_ui/assets/Common/images/Group 749.png b/wb_new_ui/assets/Common/images/Group 749.png
index 25092c0e..74d48aca 100644
Binary files a/wb_new_ui/assets/Common/images/Group 749.png and b/wb_new_ui/assets/Common/images/Group 749.png differ
diff --git a/wb_new_ui/assets/Common/images/Rectangle 343.png b/wb_new_ui/assets/Common/images/Rectangle 343.png
index 627f4e5c..5af695f8 100644
Binary files a/wb_new_ui/assets/Common/images/Rectangle 343.png and b/wb_new_ui/assets/Common/images/Rectangle 343.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index 28e38c28..a74921a0 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -124,13 +124,13 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png
index 431ea053..60743774 100644
Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/images/准备.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/images/准备.png
index e74b5a6b..febb5dbf 100644
Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/images/准备.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/images/准备.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png
index c20bbcc1..b8523e53 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 716.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 716.png
index 6fd09126..8c429d4c 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 716.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 716.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 720.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 720.png
index 1f636228..95224120 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 720.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 720.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png
index f8a1b05b..a2973810 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 726.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 726.png
index 6ceb32da..90a60b67 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 726.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 726.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 727.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 727.png
index 9e9dce3f..fbe7d455 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 727.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 727.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 729.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 729.png
index 427440e1..65a824b4 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 729.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 729.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 730.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 730.png
index f1cdf7d3..f8e43123 100644
Binary files a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 730.png and b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 730.png differ
diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml
index 7328052f..2259bb06 100644
--- a/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/wb_new_ui/assets/Hotupdate/Version.xml
@@ -15,15 +15,13 @@
-
+
-
-
-
+
-
+
@@ -36,7 +34,7 @@
-
+
diff --git a/wb_new_ui/assets/Hotupdate/images/Group 534.png b/wb_new_ui/assets/Hotupdate/images/Group 534.png
index ce773814..b6d0cc48 100644
Binary files a/wb_new_ui/assets/Hotupdate/images/Group 534.png and b/wb_new_ui/assets/Hotupdate/images/Group 534.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
index e088f52c..f639a2b3 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
@@ -1,33 +1,33 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -41,7 +41,7 @@
-
+
diff --git a/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png b/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png
index bf2da76c..c3284e5c 100644
Binary files a/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png and b/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml b/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
index 159e9091..e04c55a5 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
@@ -13,7 +13,7 @@
-
+
@@ -22,14 +22,14 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/images/new/gerenxinxi.png b/wb_new_ui/assets/Lobby/images/new/gerenxinxi.png
index 29e50277..0fc9bf45 100644
Binary files a/wb_new_ui/assets/Lobby/images/new/gerenxinxi.png and b/wb_new_ui/assets/Lobby/images/new/gerenxinxi.png differ
diff --git a/wb_new_ui/assets/Lobby/images/new/shezhi.png b/wb_new_ui/assets/Lobby/images/new/shezhi.png
index 23f37065..56fe1c72 100644
Binary files a/wb_new_ui/assets/Lobby/images/new/shezhi.png and b/wb_new_ui/assets/Lobby/images/new/shezhi.png differ
diff --git a/wb_new_ui/assets/Login/Main.xml b/wb_new_ui/assets/Login/Main.xml
index 28e1f4b6..db3f8321 100644
--- a/wb_new_ui/assets/Login/Main.xml
+++ b/wb_new_ui/assets/Login/Main.xml
@@ -9,7 +9,7 @@
-
+
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 d61f924c..34f19957 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
@@ -1,6 +1,6 @@
-
+
@@ -9,77 +9,77 @@
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 301.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 301.png
index fc4bc87d..814be3a4 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 301.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 301.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 302.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 302.png
index 077df386..d5808884 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 302.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/Rectangle 302.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
index 24b40dd2..45d7391b 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -15,13 +15,13 @@
-
+
-
+
@@ -50,7 +50,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png
index 3c933550..04bda008 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_pjjs.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_pjjs.png
index 9b9eb53b..f049c865 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_pjjs.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_pjjs.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/over_btn_zlyj_1.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/over_btn_zlyj_1.png
index 397f3234..6e4e078b 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/over_btn_zlyj_1.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/over_btn_zlyj_1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png
index 9598f6d9..0d50dbc5 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/share_record1.png b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/share_record1.png
index cdad0f2f..b75032e5 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/share_record1.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/share_record1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
index b45daa08..f0f8f464 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
@@ -3,21 +3,21 @@
-
+
-
+
-
+
-
+
-
-
+
+
@@ -38,7 +38,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/title_lose.png b/wb_new_ui/assets/Main_Majiang/component/clearing/title_lose.png
index 2e81c1e9..73c4c262 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/title_lose.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/title_lose.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/title_win.png b/wb_new_ui/assets/Main_Majiang/component/clearing/title_win.png
index cc264f0a..e25ec2d5 100644
Binary files a/wb_new_ui/assets/Main_Majiang/component/clearing/title_win.png and b/wb_new_ui/assets/Main_Majiang/component/clearing/title_win.png differ
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 1a1e9901..cee8ced5 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -4,9 +4,9 @@
-
+
-
+
@@ -93,12 +93,12 @@
-
+
-
+
@@ -109,7 +109,7 @@
-
+
@@ -119,22 +119,22 @@
-
+
-
+
-
+
-
+
-
+
@@ -158,11 +158,11 @@
-
+
-
+
@@ -203,15 +203,15 @@
-
+
-
-
+
+
@@ -221,7 +221,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_AddFriend.xml b/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
index 5e390c39..1bd101bf 100644
--- a/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
+++ b/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
@@ -41,16 +41,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_Banklog.xml b/wb_new_ui/assets/NewGroup/Win_Banklog.xml
index 455c1724..dd9bc7a1 100644
--- a/wb_new_ui/assets/NewGroup/Win_Banklog.xml
+++ b/wb_new_ui/assets/NewGroup/Win_Banklog.xml
@@ -5,7 +5,7 @@
-
+
@@ -19,15 +19,15 @@
-
+
-
-
-
-
+
+
+
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
index 0380a0e5..d2c7c215 100644
--- a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
+++ b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
@@ -10,15 +10,15 @@
-
-
-
+
+
+
-
+
-
+
@@ -31,6 +31,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
index a6a28033..1fb1e591 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
@@ -43,16 +43,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput1.xml b/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
index 0fec68f1..3b2371c9 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
@@ -46,15 +46,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
index a2292743..71bcd42f 100644
--- a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
+++ b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
@@ -121,7 +121,7 @@
-
+
@@ -133,8 +133,11 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_Mail.xml b/wb_new_ui/assets/NewGroup/Win_Mail.xml
index 527c1b1b..bb0d0d16 100644
--- a/wb_new_ui/assets/NewGroup/Win_Mail.xml
+++ b/wb_new_ui/assets/NewGroup/Win_Mail.xml
@@ -5,7 +5,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
index 79f0b7d9..46e91e6f 100644
--- a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
+++ b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml b/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
index 08fc5d89..9ff00419 100644
--- a/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
+++ b/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
@@ -8,12 +8,12 @@
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_PartnerBanPls.xml b/wb_new_ui/assets/NewGroup/Win_PartnerBanPls.xml
index 08f8df7d..d4180df2 100644
--- a/wb_new_ui/assets/NewGroup/Win_PartnerBanPls.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PartnerBanPls.xml
@@ -4,7 +4,7 @@
-
+
@@ -15,10 +15,10 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml b/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
index eb86af28..f614af95 100644
--- a/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
@@ -7,7 +7,7 @@
-
+
@@ -16,19 +16,19 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml b/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
index d635fde7..e0868105 100644
--- a/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
@@ -9,16 +9,16 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml b/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
index cc31860c..f1ba8283 100644
--- a/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
@@ -3,43 +3,43 @@
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml b/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
index 970d1a01..215f448a 100644
--- a/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_SelectGames.xml b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
index f4507fe0..69bea672 100644
--- a/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
+++ b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
@@ -13,13 +13,13 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml b/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
index 93efbb52..328a28b3 100644
--- a/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
+++ b/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_SetTag.xml b/wb_new_ui/assets/NewGroup/Win_SetTag.xml
index 68190de6..e5a812d2 100644
--- a/wb_new_ui/assets/NewGroup/Win_SetTag.xml
+++ b/wb_new_ui/assets/NewGroup/Win_SetTag.xml
@@ -12,12 +12,12 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_TakeHp.xml b/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
index ffdf98b4..4e11b59a 100644
--- a/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
+++ b/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
@@ -7,10 +7,10 @@
-
+
-
+
@@ -46,15 +46,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_Takelog.xml b/wb_new_ui/assets/NewGroup/Win_Takelog.xml
index fcb5489a..3b7b41b6 100644
--- a/wb_new_ui/assets/NewGroup/Win_Takelog.xml
+++ b/wb_new_ui/assets/NewGroup/Win_Takelog.xml
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_bxx.xml b/wb_new_ui/assets/NewGroup/Win_bxx.xml
index b234329d..05799b88 100644
--- a/wb_new_ui/assets/NewGroup/Win_bxx.xml
+++ b/wb_new_ui/assets/NewGroup/Win_bxx.xml
@@ -8,10 +8,10 @@
-
+
-
+
@@ -19,20 +19,20 @@
-
+
-
+
-
+
-
+
@@ -53,12 +53,12 @@
-
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/date_set/Group 511.png b/wb_new_ui/assets/NewGroup/component/Btn/date_set/Group 511.png
index 8764d38e..612a0f8f 100644
Binary files a/wb_new_ui/assets/NewGroup/component/Btn/date_set/Group 511.png and b/wb_new_ui/assets/NewGroup/component/Btn/date_set/Group 511.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/date_set/Polygon 3.png b/wb_new_ui/assets/NewGroup/component/Btn/date_set/Polygon 3.png
index e754cbcf..fd45988d 100644
Binary files a/wb_new_ui/assets/NewGroup/component/Btn/date_set/Polygon 3.png and b/wb_new_ui/assets/NewGroup/component/Btn/date_set/Polygon 3.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml b/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
index 71df128f..36d4c9b1 100644
--- a/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
+++ b/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml b/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
index e3f3fd6b..a86d6a5e 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
@@ -5,26 +5,26 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Invite.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Invite.xml
index efb3e7a2..45436fdc 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Invite.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Invite.xml
@@ -1,5 +1,5 @@
-
+
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 fb15a9b0..67a8fa9c 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
@@ -1,13 +1,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
index cd7af9a8..fc3884fd 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,20 +12,20 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -38,19 +38,19 @@
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/btn_jiesan.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/btn_jiesan.xml
index 0f8b0041..31e37392 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/btn_jiesan.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/btn_jiesan.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
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 ce730fb0..7af0e987 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,6 +1,6 @@
-
+
@@ -14,18 +14,18 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/jiesan.png b/wb_new_ui/assets/NewGroup/component/Lst_info/jiesan.png
index 80ac4486..e65289dd 100644
Binary files a/wb_new_ui/assets/NewGroup/component/Lst_info/jiesan.png and b/wb_new_ui/assets/NewGroup/component/Lst_info/jiesan.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/room_info/item_room_player.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/room_info/item_room_player.xml
index 8de00b67..34420a71 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/room_info/item_room_player.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/room_info/item_room_player.xml
@@ -4,9 +4,9 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/快速开始.png b/wb_new_ui/assets/NewGroup/component/Lst_info/快速开始.png
index 1f455e13..5c8bd234 100644
Binary files a/wb_new_ui/assets/NewGroup/component/Lst_info/快速开始.png and b/wb_new_ui/assets/NewGroup/component/Lst_info/快速开始.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/选择玩法.png b/wb_new_ui/assets/NewGroup/component/Lst_info/选择玩法.png
index 85055d0f..476f3d5d 100644
Binary files a/wb_new_ui/assets/NewGroup/component/Lst_info/选择玩法.png and b/wb_new_ui/assets/NewGroup/component/Lst_info/选择玩法.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
index bfd0a5a2..963434e7 100644
--- a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
+++ b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
@@ -10,10 +10,10 @@
-
+
-
+
@@ -21,7 +21,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h2.xml b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h2.xml
index e10e54c3..c36b1fde 100644
--- a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h2.xml
+++ b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h2.xml
@@ -1,21 +1,21 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_v.xml b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_v.xml
index fb6c18b8..db8e6521 100644
--- a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_v.xml
+++ b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_v.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Group 882.png b/wb_new_ui/assets/NewGroup/component/nav/Group 882.png
index 06a7ce62..83b27e59 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/Group 882.png and b/wb_new_ui/assets/NewGroup/component/nav/Group 882.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Group 907.png b/wb_new_ui/assets/NewGroup/component/nav/Group 907.png
index 61fecd6a..07f6f995 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/Group 907.png and b/wb_new_ui/assets/NewGroup/component/nav/Group 907.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/button_08.png b/wb_new_ui/assets/NewGroup/component/nav/button_08.png
index 32495009..a2f26b95 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/button_08.png and b/wb_new_ui/assets/NewGroup/component/nav/button_08.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/bxxx.png b/wb_new_ui/assets/NewGroup/component/nav/bxxx.png
index db96bcb4..bd2abb2b 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/bxxx.png and b/wb_new_ui/assets/NewGroup/component/nav/bxxx.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png b/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png
index 8b87620a..5810aef8 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png and b/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/match_back.png b/wb_new_ui/assets/NewGroup/component/nav/match_back.png
index b607a758..950f076f 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/match_back.png and b/wb_new_ui/assets/NewGroup/component/nav/match_back.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png b/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png
index 75a99736..c75ad4d3 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png and b/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/select_play/btn_game_select.xml b/wb_new_ui/assets/NewGroup/component/select_play/btn_game_select.xml
index 40da3b2d..f28c58cd 100644
--- a/wb_new_ui/assets/NewGroup/component/select_play/btn_game_select.xml
+++ b/wb_new_ui/assets/NewGroup/component/select_play/btn_game_select.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/images/Group 893.png b/wb_new_ui/assets/NewGroup/images/Group 893.png
index 5e7db18a..e5734eec 100644
Binary files a/wb_new_ui/assets/NewGroup/images/Group 893.png and b/wb_new_ui/assets/NewGroup/images/Group 893.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/Group 894.png b/wb_new_ui/assets/NewGroup/images/Group 894.png
index 6cb1db4a..e1eba8e9 100644
Binary files a/wb_new_ui/assets/NewGroup/images/Group 894.png and b/wb_new_ui/assets/NewGroup/images/Group 894.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/Group 895.png b/wb_new_ui/assets/NewGroup/images/Group 895.png
index 907f1ee7..88ab5666 100644
Binary files a/wb_new_ui/assets/NewGroup/images/Group 895.png and b/wb_new_ui/assets/NewGroup/images/Group 895.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/Vector-1.png b/wb_new_ui/assets/NewGroup/images/Vector-1.png
index 27ecb303..92846d45 100644
Binary files a/wb_new_ui/assets/NewGroup/images/Vector-1.png and b/wb_new_ui/assets/NewGroup/images/Vector-1.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Frame 18.png b/wb_new_ui/assets/NewGroup/images/allNumber/Frame 18.png
index 3aa5cc6e..8dd46c9b 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Frame 18.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Frame 18.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Group 583.png b/wb_new_ui/assets/NewGroup/images/allNumber/Group 583.png
index bad209f6..5e034a7b 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Group 583.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Group 583.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Group 584.png b/wb_new_ui/assets/NewGroup/images/allNumber/Group 584.png
index a8c33154..e1ad6fa1 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Group 584.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Group 584.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Group 585.png b/wb_new_ui/assets/NewGroup/images/allNumber/Group 585.png
index 86500d58..42ec189a 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Group 585.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Group 585.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Group 588.png b/wb_new_ui/assets/NewGroup/images/allNumber/Group 588.png
index a983fa20..70c82885 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Group 588.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Group 588.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/allNumber/Rectangle 376.png b/wb_new_ui/assets/NewGroup/images/allNumber/Rectangle 376.png
index 3e2912b0..5810aef8 100644
Binary files a/wb_new_ui/assets/NewGroup/images/allNumber/Rectangle 376.png and b/wb_new_ui/assets/NewGroup/images/allNumber/Rectangle 376.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/baoxianxiang.png b/wb_new_ui/assets/NewGroup/images/baoxianxiang.png
index d6e9a84b..10581132 100644
Binary files a/wb_new_ui/assets/NewGroup/images/baoxianxiang.png and b/wb_new_ui/assets/NewGroup/images/baoxianxiang.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/baoxianxiangjilu.png b/wb_new_ui/assets/NewGroup/images/baoxianxiangjilu.png
index 081d0da2..17835393 100644
Binary files a/wb_new_ui/assets/NewGroup/images/baoxianxiangjilu.png and b/wb_new_ui/assets/NewGroup/images/baoxianxiangjilu.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/button_cqg.png b/wb_new_ui/assets/NewGroup/images/button_cqg.png
index fdebbf5c..9ea29ec1 100644
Binary files a/wb_new_ui/assets/NewGroup/images/button_cqg.png and b/wb_new_ui/assets/NewGroup/images/button_cqg.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png b/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png
index fdebbf5c..9ea29ec1 100644
Binary files a/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png and b/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/button_sjjl.png b/wb_new_ui/assets/NewGroup/images/button_sjjl.png
index 06ec28e4..43cbaa67 100644
Binary files a/wb_new_ui/assets/NewGroup/images/button_sjjl.png and b/wb_new_ui/assets/NewGroup/images/button_sjjl.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png b/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png
index 06ec28e4..43cbaa67 100644
Binary files a/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png and b/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 652.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 652.png
index 73557487..98cdecb4 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 652.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 652.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 652@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 652@2x.png
index 6929164b..4195d01b 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 652@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 652@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 653.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 653.png
index e002991e..a134d833 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 653.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 653.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 653@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 653@2x.png
index 46e05a57..201a7247 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 653@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 653@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 654.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 654.png
index 71ee71ed..03541fe9 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 654.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 654.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 654@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 654@2x.png
index 105ac651..cdcabf0f 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 654@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 654@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 658.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 658.png
index 524647f8..6c178d17 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 658.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 658.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 658@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 658@2x.png
index 3b46a64d..9909fa04 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 658@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 658@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 659.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 659.png
index cfb9e59a..98441cba 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 659.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 659.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 659@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 659@2x.png
index 72a62526..85236d91 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 659@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 659@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 660.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 660.png
index a3e2f518..af7748d5 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 660.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 660.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 660@2x.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 660@2x.png
index 01b45a5a..a54225b2 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 660@2x.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 660@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/caozuoshezhi.png b/wb_new_ui/assets/NewGroup/images/caozuoshezhi.png
index 7b191dbe..b4c80b3e 100644
Binary files a/wb_new_ui/assets/NewGroup/images/caozuoshezhi.png and b/wb_new_ui/assets/NewGroup/images/caozuoshezhi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/chengyuan.png b/wb_new_ui/assets/NewGroup/images/chengyuan.png
index 127e1ebc..3cf6c25d 100644
Binary files a/wb_new_ui/assets/NewGroup/images/chengyuan.png and b/wb_new_ui/assets/NewGroup/images/chengyuan.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/fanhui.png b/wb_new_ui/assets/NewGroup/images/common/fanhui.png
index b607a758..950f076f 100644
Binary files a/wb_new_ui/assets/NewGroup/images/common/fanhui.png and b/wb_new_ui/assets/NewGroup/images/common/fanhui.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/fangjianjilu.png b/wb_new_ui/assets/NewGroup/images/fangjianjilu.png
index df695e42..88ab5666 100644
Binary files a/wb_new_ui/assets/NewGroup/images/fangjianjilu.png and b/wb_new_ui/assets/NewGroup/images/fangjianjilu.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/gerenxinxi.png b/wb_new_ui/assets/NewGroup/images/gerenxinxi.png
index 29e50277..2605513a 100644
Binary files a/wb_new_ui/assets/NewGroup/images/gerenxinxi.png and b/wb_new_ui/assets/NewGroup/images/gerenxinxi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/gerenzhanji.png b/wb_new_ui/assets/NewGroup/images/gerenzhanji.png
index 2c140e3e..e1eba8e9 100644
Binary files a/wb_new_ui/assets/NewGroup/images/gerenzhanji.png and b/wb_new_ui/assets/NewGroup/images/gerenzhanji.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/index/Group 633.png b/wb_new_ui/assets/NewGroup/images/index/Group 633.png
index eff2c614..0c6054cd 100644
Binary files a/wb_new_ui/assets/NewGroup/images/index/Group 633.png and b/wb_new_ui/assets/NewGroup/images/index/Group 633.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/index/Group 633@2x.png b/wb_new_ui/assets/NewGroup/images/index/Group 633@2x.png
index d582ca8b..afde00c0 100644
Binary files a/wb_new_ui/assets/NewGroup/images/index/Group 633@2x.png and b/wb_new_ui/assets/NewGroup/images/index/Group 633@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 593.png b/wb_new_ui/assets/NewGroup/images/info/Group 593.png
index 8262480b..c8e55d10 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 593.png and b/wb_new_ui/assets/NewGroup/images/info/Group 593.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 593@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 593@2x.png
index 67a13327..bb0c666c 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 593@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 593@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 595.png b/wb_new_ui/assets/NewGroup/images/info/Group 595.png
index 688eab5d..f0acd4ca 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 595.png and b/wb_new_ui/assets/NewGroup/images/info/Group 595.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 595@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 595@2x.png
index 5bc60c4d..6cf6b232 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 595@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 595@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 596.png b/wb_new_ui/assets/NewGroup/images/info/Group 596.png
index 69d741b1..b517294f 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 596.png and b/wb_new_ui/assets/NewGroup/images/info/Group 596.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 596@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 596@2x.png
index fa703a95..cfdc4bb9 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 596@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 596@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 597.png b/wb_new_ui/assets/NewGroup/images/info/Group 597.png
index 1a5f198a..4d13ab02 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 597.png and b/wb_new_ui/assets/NewGroup/images/info/Group 597.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 597@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 597@2x.png
index 15a0c35e..6b287411 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 597@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 597@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 598.png b/wb_new_ui/assets/NewGroup/images/info/Group 598.png
index 3724a9e5..cad2b6b9 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 598.png and b/wb_new_ui/assets/NewGroup/images/info/Group 598.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 598@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 598@2x.png
index df47629d..d9d5001d 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 598@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 598@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 628.png b/wb_new_ui/assets/NewGroup/images/info/Group 628.png
index 71bb2857..fa6f0603 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 628.png and b/wb_new_ui/assets/NewGroup/images/info/Group 628.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 628@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 628@2x.png
index 548f4fa2..c9a447e4 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 628@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 628@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 629.png b/wb_new_ui/assets/NewGroup/images/info/Group 629.png
index 66753532..a7b3ba72 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 629.png and b/wb_new_ui/assets/NewGroup/images/info/Group 629.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/Group 629@2x.png b/wb_new_ui/assets/NewGroup/images/info/Group 629@2x.png
index caf055ca..6aca44c0 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/Group 629@2x.png and b/wb_new_ui/assets/NewGroup/images/info/Group 629@2x.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/button-02.png b/wb_new_ui/assets/NewGroup/images/info/button-02.png
index c2c17230..55cf7473 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/button-02.png and b/wb_new_ui/assets/NewGroup/images/info/button-02.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/button_01.png b/wb_new_ui/assets/NewGroup/images/info/button_01.png
index 0e15fa2b..9c23bd24 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/button_01.png and b/wb_new_ui/assets/NewGroup/images/info/button_01.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/gl.png b/wb_new_ui/assets/NewGroup/images/info/gl.png
index 78409e0e..6fdc81d4 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/gl.png and b/wb_new_ui/assets/NewGroup/images/info/gl.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/room_info/jrzz.png b/wb_new_ui/assets/NewGroup/images/info/room_info/jrzz.png
index 907556bd..9d09d7c0 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/room_info/jrzz.png and b/wb_new_ui/assets/NewGroup/images/info/room_info/jrzz.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/room_info/sczz.png b/wb_new_ui/assets/NewGroup/images/info/room_info/sczz.png
index 67b4d13e..715023ce 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/room_info/sczz.png and b/wb_new_ui/assets/NewGroup/images/info/room_info/sczz.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/info/wf.png b/wb_new_ui/assets/NewGroup/images/info/wf.png
index 3b7c5ad1..4ad88da7 100644
Binary files a/wb_new_ui/assets/NewGroup/images/info/wf.png and b/wb_new_ui/assets/NewGroup/images/info/wf.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png
index 8d23ca03..71dfb33e 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png
index 0829a6bf..57cd6ce7 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png
index 1f7b62d1..145bc7ea 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png
index 513d14bc..cbce39f2 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png
index 567b9e08..af3cfb5a 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png
index 32ec51be..67867d80 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png
index f2417ba3..27ec6cfc 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png
index 66726adc..66ea6836 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png
index 1c12e9fb..46523bb5 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png
index 11dcb4e8..3c6cfcd4 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png and b/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/jifenjilu.png b/wb_new_ui/assets/NewGroup/images/jifenjilu.png
index dac783bf..8a123172 100644
Binary files a/wb_new_ui/assets/NewGroup/images/jifenjilu.png and b/wb_new_ui/assets/NewGroup/images/jifenjilu.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png b/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png
index ce77a561..130c9a61 100644
Binary files a/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png and b/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/mail/Rectangle 399.png b/wb_new_ui/assets/NewGroup/images/mail/Rectangle 399.png
index f04f8fa4..5810aef8 100644
Binary files a/wb_new_ui/assets/NewGroup/images/mail/Rectangle 399.png and b/wb_new_ui/assets/NewGroup/images/mail/Rectangle 399.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/menkang/Group 759.png b/wb_new_ui/assets/NewGroup/images/menkang/Group 759.png
index 0963f45b..f11d3a28 100644
Binary files a/wb_new_ui/assets/NewGroup/images/menkang/Group 759.png and b/wb_new_ui/assets/NewGroup/images/menkang/Group 759.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/menkang/Group 760.png b/wb_new_ui/assets/NewGroup/images/menkang/Group 760.png
index 8fd56fd6..10c880ea 100644
Binary files a/wb_new_ui/assets/NewGroup/images/menkang/Group 760.png and b/wb_new_ui/assets/NewGroup/images/menkang/Group 760.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/menkang/btn_cancel.xml b/wb_new_ui/assets/NewGroup/images/menkang/btn_cancel.xml
index 0bd5b9be..5df83bd2 100644
--- a/wb_new_ui/assets/NewGroup/images/menkang/btn_cancel.xml
+++ b/wb_new_ui/assets/NewGroup/images/menkang/btn_cancel.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/images/menkang/btn_ok.xml b/wb_new_ui/assets/NewGroup/images/menkang/btn_ok.xml
index a5eea4ed..ae59b9a0 100644
--- a/wb_new_ui/assets/NewGroup/images/menkang/btn_ok.xml
+++ b/wb_new_ui/assets/NewGroup/images/menkang/btn_ok.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/images/menkanshezhi.png b/wb_new_ui/assets/NewGroup/images/menkanshezhi.png
index d8cf15d8..da24844b 100644
Binary files a/wb_new_ui/assets/NewGroup/images/menkanshezhi.png and b/wb_new_ui/assets/NewGroup/images/menkanshezhi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/pilaozhi.png b/wb_new_ui/assets/NewGroup/images/pilaozhi.png
index 66e04cec..5bf529cf 100644
Binary files a/wb_new_ui/assets/NewGroup/images/pilaozhi.png and b/wb_new_ui/assets/NewGroup/images/pilaozhi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/quntongji.png b/wb_new_ui/assets/NewGroup/images/quntongji.png
index 56cb8ee9..a6c78c8e 100644
Binary files a/wb_new_ui/assets/NewGroup/images/quntongji.png and b/wb_new_ui/assets/NewGroup/images/quntongji.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/resetbg.png b/wb_new_ui/assets/NewGroup/images/resetbg.png
index 2f1efacd..f3581807 100644
Binary files a/wb_new_ui/assets/NewGroup/images/resetbg.png and b/wb_new_ui/assets/NewGroup/images/resetbg.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/room/Ellipse 13.png b/wb_new_ui/assets/NewGroup/images/room/Ellipse 13.png
index 0c633ddc..cde257da 100644
Binary files a/wb_new_ui/assets/NewGroup/images/room/Ellipse 13.png and b/wb_new_ui/assets/NewGroup/images/room/Ellipse 13.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/song1.png b/wb_new_ui/assets/NewGroup/images/song1.png
index cacab63e..51c88659 100644
Binary files a/wb_new_ui/assets/NewGroup/images/song1.png and b/wb_new_ui/assets/NewGroup/images/song1.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/tichujilu.png b/wb_new_ui/assets/NewGroup/images/tichujilu.png
index 758b2208..bb85e3ac 100644
Binary files a/wb_new_ui/assets/NewGroup/images/tichujilu.png and b/wb_new_ui/assets/NewGroup/images/tichujilu.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/tongji/Group 657.png b/wb_new_ui/assets/NewGroup/images/tongji/Group 657.png
index c1bac8bf..2af5d0ea 100644
Binary files a/wb_new_ui/assets/NewGroup/images/tongji/Group 657.png and b/wb_new_ui/assets/NewGroup/images/tongji/Group 657.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/tongji/Group 675.png b/wb_new_ui/assets/NewGroup/images/tongji/Group 675.png
index 72c97920..dd05be62 100644
Binary files a/wb_new_ui/assets/NewGroup/images/tongji/Group 675.png and b/wb_new_ui/assets/NewGroup/images/tongji/Group 675.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/tongji/Group 677.png b/wb_new_ui/assets/NewGroup/images/tongji/Group 677.png
index c6473b0b..a18987e3 100644
Binary files a/wb_new_ui/assets/NewGroup/images/tongji/Group 677.png and b/wb_new_ui/assets/NewGroup/images/tongji/Group 677.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/wanfashezhi.png b/wb_new_ui/assets/NewGroup/images/wanfashezhi.png
index b3c76647..a0aad764 100644
Binary files a/wb_new_ui/assets/NewGroup/images/wanfashezhi.png and b/wb_new_ui/assets/NewGroup/images/wanfashezhi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/xia1.png b/wb_new_ui/assets/NewGroup/images/xia1.png
index 4958beb5..6b628c77 100644
Binary files a/wb_new_ui/assets/NewGroup/images/xia1.png and b/wb_new_ui/assets/NewGroup/images/xia1.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/xiajizengsong.png b/wb_new_ui/assets/NewGroup/images/xiajizengsong.png
index 510518ab..0bd04a7d 100644
Binary files a/wb_new_ui/assets/NewGroup/images/xiajizengsong.png and b/wb_new_ui/assets/NewGroup/images/xiajizengsong.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/xiaoxi.png b/wb_new_ui/assets/NewGroup/images/xiaoxi.png
index 7d742130..30e04fba 100644
Binary files a/wb_new_ui/assets/NewGroup/images/xiaoxi.png and b/wb_new_ui/assets/NewGroup/images/xiaoxi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/yaoqing.png b/wb_new_ui/assets/NewGroup/images/yaoqing.png
index 598f8da0..21573d62 100644
Binary files a/wb_new_ui/assets/NewGroup/images/yaoqing.png and b/wb_new_ui/assets/NewGroup/images/yaoqing.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/zhankuang.png b/wb_new_ui/assets/NewGroup/images/zhankuang.png
index 5cb99487..e2a61929 100644
Binary files a/wb_new_ui/assets/NewGroup/images/zhankuang.png and b/wb_new_ui/assets/NewGroup/images/zhankuang.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_Group.xml b/wb_new_ui/assets/NewGroup/mgr/View_Group.xml
index 6b16269d..81163d9b 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_Group.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_Group.xml
@@ -2,24 +2,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
index 7441af0d..7c086b79 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
@@ -5,12 +5,12 @@
-
+
-
+
@@ -27,19 +27,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -62,7 +62,7 @@
-
+
@@ -118,11 +118,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
index fe094da6..1fb84b68 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml
index 3f938e9b..f482961b 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberHpList.xml
@@ -1,6 +1,6 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -53,20 +53,20 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
@@ -76,7 +76,7 @@
-
+
@@ -94,6 +94,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInvite.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInvite.xml
index 108368d8..715de713 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInvite.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInvite.xml
@@ -1,60 +1,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
index 5c7d4f1d..6911c342 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
@@ -16,7 +16,7 @@
-
+
@@ -54,20 +54,20 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index 17b3f878..c672de96 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -1,6 +1,6 @@
-
+
@@ -24,16 +24,16 @@
-
+
-
+
-
+
-
+
@@ -44,7 +44,7 @@
-
+
@@ -89,11 +89,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberStat.xml
index e9fc0743..863906c7 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberStat.xml
@@ -8,27 +8,27 @@
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml
index 2c05189e..1d197387 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMenKang.xml
@@ -39,14 +39,14 @@
-
+
-
-
-
-
+
+
+
+
@@ -65,14 +65,14 @@
-
-
-
-
-
+
+
+
+
+
-
+
@@ -85,7 +85,7 @@
-
+
@@ -96,12 +96,12 @@
-
+
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
index 515504f7..0257a2e4 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
@@ -17,22 +17,22 @@
-
+
-
+
-
+
-
+
@@ -76,11 +76,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
index becd037e..e7a80ae7 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
@@ -6,7 +6,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -69,10 +69,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
index e9b0a2da..146b670b 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
@@ -12,15 +12,15 @@
-
+
-
-
-
+
+
+
@@ -40,43 +40,43 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
index 8331157e..89f13e3d 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
@@ -25,28 +25,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -99,11 +99,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPiLaoZhi.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPiLaoZhi.xml
index e830b945..f4a6f427 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPiLaoZhi.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPiLaoZhi.xml
@@ -1,22 +1,22 @@
-
+
-
+
-
+
-
+
@@ -36,20 +36,20 @@
-
+
-
+
-
-
-
+
+
+
@@ -90,7 +90,7 @@
-
+
@@ -102,8 +102,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
index 9050e29b..a5b1bea2 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
@@ -17,22 +17,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupStat.xml
index 7c8607ed..ed437827 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupStat.xml
@@ -13,13 +13,13 @@
-
+
-
-
+
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/Win_BanSameTable.xml b/wb_new_ui/assets/NewGroup/mgr/Win_BanSameTable.xml
index bb4cd433..534c733b 100644
--- a/wb_new_ui/assets/NewGroup/mgr/Win_BanSameTable.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/Win_BanSameTable.xml
@@ -1,22 +1,22 @@
-
+
-
+
-
-
-
-
+
+
+
+
@@ -27,7 +27,7 @@
-
+
@@ -36,13 +36,13 @@
-
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml b/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
index b51daf1b..5c098d9c 100644
--- a/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml
@@ -23,32 +23,32 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -67,44 +67,44 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -120,13 +120,13 @@
-
+
-
+
-
+
@@ -139,29 +139,29 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/Win_Permission.xml b/wb_new_ui/assets/NewGroup/mgr/Win_Permission.xml
index 6e25d293..acceeb0c 100644
--- a/wb_new_ui/assets/NewGroup/mgr/Win_Permission.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/Win_Permission.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/btn_mul.xml b/wb_new_ui/assets/NewGroup/mgr/btn_mul.xml
new file mode 100644
index 00000000..bb24fd71
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/mgr/btn_mul.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/btn_ok.xml b/wb_new_ui/assets/NewGroup/mgr/btn_ok.xml
new file mode 100644
index 00000000..216f50aa
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/mgr/btn_ok.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
index 63c60224..790173ed 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
@@ -36,7 +36,7 @@
-
+
@@ -59,22 +59,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_sort_3.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_sort_3.xml
index 615bdedd..49d38aec 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_sort_3.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_sort_3.xml
@@ -1,14 +1,14 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/Group 467.png b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/Group 467.png
index 856483c9..4d678f33 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/Group 467.png and b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/Group 467.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member1.xml b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member1.xml
index 7ee127d0..ff448c4e 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member1.xml
@@ -11,7 +11,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -59,7 +59,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member2.xml b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member2.xml
index 8132a70a..fc4dc40d 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member2.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member2.xml
@@ -10,7 +10,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member3.xml b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member3.xml
index faf1a7e6..b7189b15 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member3.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member3.xml
@@ -10,7 +10,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member4.xml b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member4.xml
index 71e57bfa..b9af7c42 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member4.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/numberHpAlone/item_member4.xml
@@ -7,13 +7,13 @@
-
+
-
+
@@ -29,7 +29,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
index e0f132c1..8e72017c 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
@@ -5,21 +5,21 @@
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml
index dc4e57e9..7aa63c67 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_rewards.xml b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_rewards.xml
index c9dc61e9..225512d5 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_rewards.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_rewards.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/Group 806.png b/wb_new_ui/assets/NewGroup/mgr/imgs/Group 806.png
index d1de3744..f00b00da 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/Group 806.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/Group 806.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/Group 807.png b/wb_new_ui/assets/NewGroup/mgr/imgs/Group 807.png
index 5c9bff1d..2e8ba76a 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/Group 807.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/Group 807.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/Rectangle 173.png b/wb_new_ui/assets/NewGroup/mgr/imgs/Rectangle 173.png
index 9d07baae..ccdbed2b 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/Rectangle 173.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/Rectangle 173.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 5581.png b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 5581.png
index d0c4e134..10c880ea 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 5581.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 5581.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 571.png b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 571.png
index f5782470..f11d3a28 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 571.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 571.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/tqmx.png b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/tqmx.png
index b382cb4a..8124849f 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/tqmx.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/tqmx.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/x.png b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/x.png
index a46dab54..244c0e00 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/x.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/x.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/game/9bg_04.png b/wb_new_ui/assets/NewGroup/mgr/imgs/game/9bg_04.png
index b6cf2258..c2684c28 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/game/9bg_04.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/game/9bg_04.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_bianjiwanfa.png b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_bianjiwanfa.png
index 1f8218dd..04c2a259 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_bianjiwanfa.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_bianjiwanfa.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_huifuiyule.png b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_huifuiyule.png
index f828d5eb..e5f7cff8 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_huifuiyule.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_huifuiyule.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_jiinzhiyule.png b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_jiinzhiyule.png
index 1e250a30..169d378c 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_jiinzhiyule.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_jiinzhiyule.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_shanchuwanfa.png b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_shanchuwanfa.png
index e735e3bd..e8d13a95 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_shanchuwanfa.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/game/ann_shanchuwanfa.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 11.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 11.png
index fc993a48..d74eea04 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 11.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 11.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 16.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 16.png
index 030824f3..ac574155 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 16.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 16.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 18.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 18.png
index bb9ce27e..9dd4eda5 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 18.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 18.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 19.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 19.png
index 1a81d376..4bf99aa2 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 19.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Frame 19.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 448.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 448.png
index a55abf78..11225208 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 448.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 448.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 518.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 518.png
index d1de3744..f00b00da 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 518.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 518.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 519.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 519.png
index b4c850a1..2e8ba76a 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 519.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 519.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 546.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 546.png
index 043a65a2..094c6583 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 546.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 546.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 547.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 547.png
index b16ebb78..9f2bd9ba 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 547.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 547.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 551.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 551.png
index fb523bf9..5e034a7b 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 551.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Group 551.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 347.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 347.png
index a548a4af..8c096d5d 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 347.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 347.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 371.png b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 371.png
index b44ffd3b..57fa8139 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 371.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/numberHpAlone/Rectangle 371.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/设置.png b/wb_new_ui/assets/NewGroup/mgr/imgs/设置.png
new file mode 100644
index 00000000..61c92673
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/imgs/设置.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/Group 923.png b/wb_new_ui/assets/NewGroup/mgr/real/Group 923.png
new file mode 100644
index 00000000..d8abf1c9
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/Group 923.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/Group 924.png b/wb_new_ui/assets/NewGroup/mgr/real/Group 924.png
new file mode 100644
index 00000000..40c5b1eb
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/Group 924.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/button_approve.png b/wb_new_ui/assets/NewGroup/mgr/real/button_approve.png
new file mode 100644
index 00000000..c4dff394
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/button_approve.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/button_submit.png b/wb_new_ui/assets/NewGroup/mgr/real/button_submit.png
new file mode 100644
index 00000000..f0bf6f42
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/button_submit.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/xiugaimiam.png b/wb_new_ui/assets/NewGroup/mgr/real/xiugaimiam.png
new file mode 100644
index 00000000..f854b901
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/xiugaimiam.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/real/zhaohuizhanghao.png b/wb_new_ui/assets/NewGroup/mgr/real/zhaohuizhanghao.png
new file mode 100644
index 00000000..41287f74
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/real/zhaohuizhanghao.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/win_id_password_alone.xml b/wb_new_ui/assets/NewGroup/mgr/win_id_password_alone.xml
new file mode 100644
index 00000000..09d6a4e9
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/mgr/win_id_password_alone.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index ff90d3d0..266f8b5b 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -888,7 +888,7 @@
-
+
@@ -1223,6 +1223,16 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 66d65f68..74fb5394 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 0f0193e9..46d39f4f 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 00a3ed8e..d9b65864 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 ce275474..466ef596 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 a943172d..d503969b 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 76cf639e..ac4d0741 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 4e745090..f74ca766 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_15.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png
index 5140defc..db42e685 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.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 3ac68025..ba0730ce 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 dac34e17..7c662dbf 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 1fc36e27..a8ae2338 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 6ec304c6..b1ce0211 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 a9e413da..8ede012f 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 eec6829c..f7063a7a 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 f15039c4..f948131e 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 eef35b4f..27393606 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 7ed7bcf5..42f37ded 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 e3df1743..d326a6e5 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_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png
index e663a6e2..d67caa6b 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.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 bdd10bc4..61152d89 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/login/ui/Login_fui.bytes b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes
index 4592d6c7..89a206ec 100644
Binary files a/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes and b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes differ
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 3f63e590..b2789653 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 d314e55a..c34d43a1 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 97e6d943..1bb234ed 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 a378daf8..845998c8 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 d7274ebf..afe01c3b 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_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index 3d07219d..d3c1e3e0 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index aac01b43..21c04253 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png
index 83075536..9665d1eb 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png
index 4d6d1e63..9be086ce 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png
index b333d2e7..26fa8ae3 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png
index 0ed27b7e..3bd7c036 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png 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 5d5d8b4d..ff520bfc 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
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index 8e7ce88d..c2ab6374 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index 052dcbaa..6d310187 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 4f61b911..0be034e3 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0.png b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0.png
index e610a1ab..3355c1bc 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0.png and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png
index 7960f282..2b58620a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_2.png b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_2.png
index 15f2dbf8..008d26c9 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_2.png and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes
index c541769a..5284a434 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes differ
diff --git a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png
index 2ae642f6..d00c7ea3 100644
Binary files a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png and b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png differ
diff --git a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes
index 4269c767..42ade697 100644
Binary files a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes and b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes differ
diff --git a/wb_unity_pro/Assets/Scripts/VerCheck.cs b/wb_unity_pro/Assets/Scripts/VerCheck.cs
index 15c50d7d..700f1b6b 100644
--- a/wb_unity_pro/Assets/Scripts/VerCheck.cs
+++ b/wb_unity_pro/Assets/Scripts/VerCheck.cs
@@ -84,13 +84,13 @@ public class VerCheck : MonoBehaviour
- isDXYGFF= true;
+ isDXYGFF= false;
isGFF = false;
//string init_url = "http://8.138.94.89:9898/NewFK/config/init2_1.json";
//公用
- string init_url = "http://127.0.0.1:9898/NewFK/config/init2_1.json";
+ string init_url = "http://8.138.120.167:9898/NewFK/config/init2_1.json";
if (isGFF==false&&isDXYGFF==false)
{
diff --git a/wb_unity_pro/Assets/Scripts/VerCheck.cs_bak b/wb_unity_pro/Assets/Scripts/VerCheck.cs_bak
index 392bf35c..e40df743 100644
--- a/wb_unity_pro/Assets/Scripts/VerCheck.cs_bak
+++ b/wb_unity_pro/Assets/Scripts/VerCheck.cs_bak
@@ -84,7 +84,7 @@ public class VerCheck : MonoBehaviour
isDXYGFF= false;
isGFF = false;
- string init_url = "http://8.138.220.239:9898/NewFK/config/init2_1.json";
+ string init_url = "http://8.138.120.167:9898/NewFK/config/init2_1.json";
if (isGFF == false && isDXYGFF == false)
{
diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
index dc0371c8..f50144f0 100644
--- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset
+++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
@@ -12,12 +12,12 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
- companyName: yunque
- productName: "\u4E91\u9619"
+ companyName: yunque1
+ productName: "\u4E91\u96191"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
- m_ShowUnitySplashScreen: 0
+ m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 0
m_SplashScreenAnimation: 2