diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
index 92a13c08..9e26dfee 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n92_omkm": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 59e22c68..5e9cb71a 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,6 +1,5 @@
{
"libview.firstColumnWidth": 338,
- "test.device": "720p Phone",
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://m7iejg46ilon7ias",
@@ -22,14 +21,11 @@
"ui://m7iejg46ilon7i9k",
"ui://m7iejg46ilon7ia2",
"ui://m7iejg46tt6k7ika",
- "ui://l0ds4ys6h1uu26",
- "ui://z1qthxavlrfi0",
- "ui://m7iejg46l7wn7i80",
"ui://m7iejg46lf2qhju",
"ui://m7iejg46l7wn7i81",
- "ui://m7iejg46l7wn7i82",
"ui://m7iejg46kwdo7i97",
"ui://m7iejg468h207i99",
+ "ui://m7iejg46r0qx7i6v",
"ui://m7iejg46nwgkhx0",
"ui://m7iejg46nwgkhx2",
"ui://m7iejg46kk3uhro",
@@ -68,6 +64,7 @@
"ui://2d9xdj6zxbqujn",
"ui://2d9xdj6znaupko",
"ui://2d9xdj6zsvin7e2f",
+ "ui://2zlli80mr6cyce9",
"ui://egnzysm7ffp35o",
"ui://4skil1l6uwvl1qp",
"ui://4skil1l6piv91o7",
@@ -94,17 +91,28 @@
"ui://m7iejg46z3847i6m",
"ui://m7iejg46kwi0hkr"
],
- "auxline1": true,
+ "test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://2d9xdj6zsvin7e2f",
+ "doc.activeDoc": "ui://m7iejg46r0qx7i6v",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "2d9xdj6z",
+ "/",
+ "2d9xdj6z",
+ "/component/",
+ "2d9xdj6z",
+ "/component/user_info/",
"m7iejg46",
"/",
"m7iejg46",
+ "/images/",
+ "m7iejg46",
+ "/images/bxx/",
+ "m7iejg46",
"/mgr/"
],
+ "auxline1": true,
"snapToGrid": true,
"test.orientation": "landscape",
"backgroundColor": 6710886,
diff --git a/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml b/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
index 52a99762..6e548178 100644
--- a/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
+++ b/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput1.xml b/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
index 3b2371c9..2a05d443 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
@@ -7,59 +7,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput2.xml b/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
index 9356629d..ac133145 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
@@ -7,59 +7,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput3.xml b/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
index 0fec68f1..2eb0af8b 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
@@ -7,59 +7,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_bxx.xml b/wb_new_ui/assets/NewGroup/Win_bxx.xml
index 05799b88..e9dd6330 100644
--- a/wb_new_ui/assets/NewGroup/Win_bxx.xml
+++ b/wb_new_ui/assets/NewGroup/Win_bxx.xml
@@ -1,6 +1,6 @@
-
+
@@ -18,8 +18,8 @@
-
-
+
+
@@ -29,8 +29,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 571.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 571.png
index 79949e4f..d2d015eb 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 571.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 571.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/bxx/Group 572.png b/wb_new_ui/assets/NewGroup/images/bxx/Group 572.png
index b3c14dd3..f31365bf 100644
Binary files a/wb_new_ui/assets/NewGroup/images/bxx/Group 572.png and b/wb_new_ui/assets/NewGroup/images/bxx/Group 572.png 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 89a206ec..7ee1d6b9 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/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index d3c1e3e0..7684051c 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 21c04253..9c793a8c 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_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index ff520bfc..089a02b8 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