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/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/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 e02ca29c..a12b3550 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -422,6 +422,8 @@
+
+
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 9b89fd9a..b271e2ea 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 c5ac394d..ccb80df6 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_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 8a4b4dd1..6a68a107 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 629a4858..9f52ee40 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index bfae2d66..4c68ab11 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index 0fe80cc6..129c7d17 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 acd9bbc1..99e6e237 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 ee160daa..a58b315a 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_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index ceae2d8c..fd30057d 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/main_poker/ui/Main_Poker_atlas0.png b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png
index 80f940a4..a02df361 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes
index 334a9ab8..c93733f5 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes differ