diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info
index 3ae5f342..b68d2941 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info
@@ -2,6 +2,9 @@
"objectStatus": {
"n47_ab5p": {
"collapsed": true
+ },
+ "n45_ab5p": {
+ "collapsed": true
}
},
"adaptiveTest": true,
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 4c933947..e552e0f9 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -2,25 +2,78 @@
"libview.firstColumnWidth": 367,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://v0j9abjygq7med",
- "ui://v0j9abjygq7mcu"
+ "ui://m7iejg46ruljhmp",
+ "ui://2d9xdj6zngxlckb",
+ "ui://27vd145bko559b"
],
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://v0j9abjygq7mcu",
+ "doc.activeDoc": "ui://27vd145bko559b",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
"/",
"27vd145b",
+ "/buttons/",
+ "27vd145b",
+ "/component/",
+ "27vd145b",
+ "/component/share/",
+ "27vd145b",
+ "/font/",
+ "27vd145b",
+ "/font/images/",
+ "27vd145b",
+ "/font/images/btn_keyboard/",
+ "27vd145b",
+ "/font/images/win/",
+ "27vd145b",
"/images/",
+ "27vd145b",
+ "/images/btn_keyboard/",
+ "27vd145b",
+ "/images/currency/",
+ "27vd145b",
+ "/images/dismiss_room/",
+ "27vd145b",
+ "/images/game/",
+ "27vd145b",
+ "/images/head/",
+ "27vd145b",
+ "/images/head/realname/",
+ "2d9xdj6z",
+ "/",
+ "2d9xdj6z",
+ "/component/",
+ "2d9xdj6z",
+ "/component/user_info/",
+ "2d9xdj6z",
+ "/component/user_info/edit/",
"v0j9abjy",
"/",
+ "v0j9abjy",
+ "/component/",
+ "v0j9abjy",
+ "/component/clearing/",
+ "v0j9abjy",
+ "/component/clearing/clearing1/",
"lx6k641g",
"/",
"lx6k641g",
- "/image/"
+ "/image/",
+ "m7iejg46",
+ "/",
+ "m7iejg46",
+ "/component/",
+ "m7iejg46",
+ "/component/Lst_info/",
+ "m7iejg46",
+ "/component/nav/",
+ "m7iejg46",
+ "/images/",
+ "m7iejg46",
+ "/mgr/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/Win_ConnectTip.xml b/wb_new_ui/assets/Common/Win_ConnectTip.xml
index 6b8f263c..bd312f35 100644
--- a/wb_new_ui/assets/Common/Win_ConnectTip.xml
+++ b/wb_new_ui/assets/Common/Win_ConnectTip.xml
@@ -1,16 +1,16 @@
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/buttons/Btn_menu_h_small.xml b/wb_new_ui/assets/Common/buttons/Btn_menu_h_small.xml
index 98ceeb35..55e06074 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_menu_h_small.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_menu_h_small.xml
@@ -1,17 +1,18 @@
-
+
-
+
-
-
+
+
+
-
+
\ No newline at end of file
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 10c880ea..9692a8e0 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 10c880ea..9692a8e0 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 f11d3a28..3e46fca5 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/bg_05.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png
index 77ef4b00..35f7a13a 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png differ
diff --git a/wb_new_ui/assets/Common/font/images/w01(1).png b/wb_new_ui/assets/Common/font/images/w01(1).png
index b72a2e4b..55cbaf47 100644
Binary files a/wb_new_ui/assets/Common/font/images/w01(1).png and b/wb_new_ui/assets/Common/font/images/w01(1).png differ
diff --git a/wb_new_ui/assets/Common/font/images/w02(1).png b/wb_new_ui/assets/Common/font/images/w02(1).png
index 65cad5e2..2994dae4 100644
Binary files a/wb_new_ui/assets/Common/font/images/w02(1).png and b/wb_new_ui/assets/Common/font/images/w02(1).png differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 88c1e34d..d7d9cceb 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -492,7 +492,7 @@
-
+
@@ -1341,35 +1341,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/close.png b/wb_new_ui/assets/Lobby/component/user_info/edit/close.png
index bd08d7bb..cbb66bcf 100644
Binary files a/wb_new_ui/assets/Lobby/component/user_info/edit/close.png and b/wb_new_ui/assets/Lobby/component/user_info/edit/close.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/dk_sz.png b/wb_new_ui/assets/Lobby/component/user_info/edit/dk_sz.png
index bb1768d7..b385c1fa 100644
Binary files a/wb_new_ui/assets/Lobby/component/user_info/edit/dk_sz.png and b/wb_new_ui/assets/Lobby/component/user_info/edit/dk_sz.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_1.png b/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_1.png
new file mode 100644
index 00000000..29be5536
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_1.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_name.png b/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_name.png
new file mode 100644
index 00000000..2a17eca1
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/edit/in_real_address_name.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/nick_input.png b/wb_new_ui/assets/Lobby/component/user_info/edit/nick_input.png
new file mode 100644
index 00000000..125f4305
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/edit/nick_input.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/nick_title.png b/wb_new_ui/assets/Lobby/component/user_info/edit/nick_title.png
new file mode 100644
index 00000000..63edb1fd
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/edit/nick_title.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/qrxg.png b/wb_new_ui/assets/Lobby/component/user_info/edit/qrxg.png
index 429ef40c..0023a507 100644
Binary files a/wb_new_ui/assets/Lobby/component/user_info/edit/qrxg.png and b/wb_new_ui/assets/Lobby/component/user_info/edit/qrxg.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/edit/win_edit_nick.xml b/wb_new_ui/assets/Lobby/component/user_info/edit/win_edit_nick.xml
index 8bbf4643..eee84db0 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/edit/win_edit_nick.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/edit/win_edit_nick.xml
@@ -1,15 +1,15 @@
-
+
-
-
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/win_real_address.xml b/wb_new_ui/assets/Lobby/component/user_info/win_real_address.xml
index 8c41d8b0..f2aa1515 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/win_real_address.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/win_real_address.xml
@@ -1,6 +1,6 @@
-
+
@@ -31,18 +31,18 @@
-
+
-
+
-
+
-
+
-
+
@@ -50,5 +50,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 253bfa9a..a12b3550 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -211,7 +211,7 @@
-
+
@@ -420,6 +420,10 @@
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
index b22f5142..03122a3d 100644
--- a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
+++ b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
@@ -1,24 +1,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -31,6 +31,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_SelectGames.xml b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
index 9fac3745..ace5ea9b 100644
--- a/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
+++ b/wb_new_ui/assets/NewGroup/Win_SelectGames.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
-
+
+
@@ -13,13 +13,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/title_jiesan.png b/wb_new_ui/assets/NewGroup/images/title_jiesan.png
index c087a04d..8dae20ea 100644
Binary files a/wb_new_ui/assets/NewGroup/images/title_jiesan.png and b/wb_new_ui/assets/NewGroup/images/title_jiesan.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/wanfashezhi.png b/wb_new_ui/assets/NewGroup/images/wanfashezhi.png
index a0aad764..9f0c5b30 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/wanfaxinxi.png b/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png
index a92a14fc..ac7ddca6 100644
Binary files a/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png and b/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png differ
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 7aa63c67..65279979 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
@@ -1,14 +1,14 @@
-
+
-
-
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_bg.png b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_bg.png
new file mode 100644
index 00000000..6abab76d
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_bg.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_btnstart.png b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_btnstart.png
new file mode 100644
index 00000000..fd1e3628
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays_btnstart.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/qyq_txt_zdyqyq.png b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/qyq_txt_zdyqyq.png
index 39d5c525..7b71fe03 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/qyq_txt_zdyqyq.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/fagpack/qyq_txt_zdyqyq.png differ
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 992b19f6..08ff4b27 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1339,6 +1339,8 @@
+
+
\ No newline at end of file