diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index e7a943be..806def0b 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -91,7 +91,7 @@ function M:InitView(url)
local headView = HeadView.new(DataManager.SelfUser,true)
headView:Show()
end)--]]
- btn_agent.displayObject.gameObject:SetActive(false)
+ --btn_agent.displayObject.gameObject:SetActive(false)
local btn_record = self._view:GetChild("btn_record")
-- btn_record.onClick:Add(handler(self, function ()
diff --git a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
index 92f8ad93..c5f252b3 100644
--- a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
+++ b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n27_csp4": {
+ "hidden": true
+ },
"n24_xn94": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/0khx14ar/pcy012.info b/wb_new_ui/.objs/metas/0khx14ar/pcy012.info
new file mode 100644
index 00000000..e5bfea59
--- /dev/null
+++ b/wb_new_ui/.objs/metas/0khx14ar/pcy012.info
@@ -0,0 +1,3 @@
+{
+ "adaptiveTest": true
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
index e970272b..667e9f69 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
@@ -1,40 +1,43 @@
{
"objectStatus": {
- "n54_lwcl": {
- "hidden": true
- },
- "n113_ker3": {
- "hidden": true
- },
- "n142_syg7": {
- "hidden": true
- },
- "n138_csp4": {
- "hidden": true
- },
- "n125_g8kk": {
- "hidden": true
- },
- "n51_lwcl": {
- "hidden": true
- },
"n122_g8kk": {
"hidden": true
},
- "n130_naup": {
- "locked": true
- },
- "n139_csp4": {
- "hidden": true
- },
"n120_g8kk": {
"hidden": true
},
+ "n89_goju": {
+ "hidden": true
+ },
+ "n130_naup": {
+ "locked": true
+ },
+ "n142_syg7": {
+ "hidden": true
+ },
+ "n111_ker3": {
+ "locked": true
+ },
+ "n50_lwcl": {
+ "hidden": true
+ },
+ "n138_csp4": {
+ "hidden": true
+ },
+ "n113_ker3": {
+ "hidden": true
+ },
"n100_lumr": {
"hidden": true
},
+ "n139_csp4": {
+ "hidden": true
+ },
"n119_g8kk": {
"hidden": true
+ },
+ "n51_lwcl": {
+ "hidden": true
}
},
"adaptiveTest": true,
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info
new file mode 100644
index 00000000..bf7836f5
--- /dev/null
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/lwcl5m.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n10_nw0i": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info
index 8a1c5c15..92572797 100644
--- a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info
+++ b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info
@@ -6,5 +6,6 @@
"n22_ab5p": {
"hidden": true
}
- }
+ },
+ "adaptiveTest": 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 6f7f5555..1991555a 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
@@ -43,6 +43,5 @@
"hidden": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info
new file mode 100644
index 00000000..a8b21149
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iaj.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n12_n96g": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info
new file mode 100644
index 00000000..a8b21149
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ep9w7iak.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n12_n96g": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info
index f73f3991..0c3ed6ac 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info
@@ -1,7 +1,10 @@
{
"objectStatus": {
- "n7_nyna": {
- "collapsed": true
+ "n11_rfcn": {
+ "hidden": true
+ },
+ "n8_m1dc": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info b/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info
index 9e26dfee..e5bfea59 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/jvvohyf.info
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+ "adaptiveTest": true
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info b/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info
new file mode 100644
index 00000000..a8b21149
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ul317i9z.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n12_n96g": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info b/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info
new file mode 100644
index 00000000..a8b21149
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ul317ia0.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n12_n96g": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info b/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info
new file mode 100644
index 00000000..a8b21149
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ul317ia1.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n12_n96g": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 4ebb9809..ccbb44fe 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,52 +1,69 @@
{
- "libview.firstColumnWidth": 413,
+ "libview.firstColumnWidth": 384,
"libview.iconScale": 0,
"doc.openedDocs": [
+ "ui://2d9xdj6zfn7fao",
+ "ui://2zlli80mw9te0",
"ui://m7iejg4610snh5j",
- "ui://m7iejg46jgh8hwv",
- "ui://m7iejg46kwi0hk0",
- "ui://m7iejg46qlxihsl",
- "ui://m7iejg46qlxihsm",
- "ui://m7iejg46kwi0hld",
- "ui://m7iejg46kwi0hmb",
- "ui://m7iejg46f6brhww",
- "ui://m7iejg46nwgkhx0",
- "ui://m7iejg46l7wn7i83",
- "ui://27vd145bc6bub0",
- "ui://m7iejg46nwgkhx1"
+ "ui://m7iejg46jvvohyf",
+ "ui://m7iejg46ep9w7iah",
+ "ui://m7iejg46ep9w7iai",
+ "ui://m7iejg46ul317ia3",
+ "ui://m7iejg46ul317ia4",
+ "ui://m7iejg46ul317ia5"
],
"test.device": "Xiaomi 9",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://m7iejg46l7wn7i83",
+ "doc.activeDoc": "ui://m7iejg4610snh5j",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "egnzysm7",
+ "27vd145b",
"/",
"27vd145b",
"/buttons/",
"27vd145b",
- "/component/",
- "27vd145b",
- "/component/dismiss_room/",
- "27vd145b",
- "/component/dismiss_room/btn_keyboard/",
- "27vd145b",
"/font/",
"27vd145b",
"/font/images/",
"27vd145b",
- "/font/images/btn_keyboard/",
+ "/font/images/win/",
+ "egnzysm7",
+ "/",
+ "0khx14ar",
+ "/",
+ "0khx14ar",
+ "/images/",
+ "2d9xdj6z",
+ "/",
+ "2d9xdj6z",
+ "/component/",
+ "2d9xdj6z",
+ "/component/index/",
+ "2d9xdj6z",
+ "/images/",
+ "2d9xdj6z",
+ "/images/LobbyMui/",
+ "2zlli80m",
+ "/",
+ "2zlli80m",
+ "/images/",
+ "2zlli80m",
+ "/images/LoginMui/",
"m7iejg46",
"/",
"m7iejg46",
- "/mgr/",
+ "/component/",
"m7iejg46",
- "/mgr/component/",
+ "/component/Lst_info/",
"m7iejg46",
- "/mgr/component/member/",
+ "/component/Lst_room/",
"m7iejg46",
- "/mgr/component/member/partner/"
+ "/images/",
+ "m7iejg46",
+ "/images/NGXiangTangMui/",
+ "m7iejg46",
+ "/images/room/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/buttons/Btn_close.xml b/wb_new_ui/assets/Common/buttons/Btn_close.xml
index 65b104dc..ae7f4e32 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_close.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_close.xml
@@ -3,7 +3,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml
index 769582f1..7d426f72 100644
--- a/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/wb_new_ui/assets/Hotupdate/Version.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -11,20 +11,20 @@
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
index bc9ddfc4..59f661e0 100644
--- a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
+++ b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml
@@ -1,10 +1,12 @@
-
+
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Hotupdate/image 217.png b/wb_new_ui/assets/Hotupdate/image 217.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/image 217.png differ
diff --git a/wb_new_ui/assets/Hotupdate/images/Frame 552.png b/wb_new_ui/assets/Hotupdate/images/Frame 552.png
new file mode 100644
index 00000000..2b28eac8
Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/images/Frame 552.png differ
diff --git a/wb_new_ui/assets/Hotupdate/images/Rectangle 5528.png b/wb_new_ui/assets/Hotupdate/images/Rectangle 5528.png
new file mode 100644
index 00000000..551abb96
Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/images/Rectangle 5528.png differ
diff --git a/wb_new_ui/assets/Hotupdate/images/Rectangle 5529.png b/wb_new_ui/assets/Hotupdate/images/Rectangle 5529.png
new file mode 100644
index 00000000..e4e258c7
Binary files /dev/null and b/wb_new_ui/assets/Hotupdate/images/Rectangle 5529.png differ
diff --git a/wb_new_ui/assets/Hotupdate/package.xml b/wb_new_ui/assets/Hotupdate/package.xml
index 7d449696..afb22f8b 100644
--- a/wb_new_ui/assets/Hotupdate/package.xml
+++ b/wb_new_ui/assets/Hotupdate/package.xml
@@ -21,6 +21,10 @@
+
+
+
+
diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml
index 3d9f1afe..d22a6612 100644
--- a/wb_new_ui/assets/Lobby/Main.xml
+++ b/wb_new_ui/assets/Lobby/Main.xml
@@ -4,54 +4,59 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
+
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -62,12 +67,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -92,7 +97,7 @@
-
+
diff --git a/wb_new_ui/assets/Lobby/component/group/Button8.xml b/wb_new_ui/assets/Lobby/component/group/Button8.xml
index 153e255f..19ced009 100644
--- a/wb_new_ui/assets/Lobby/component/group/Button8.xml
+++ b/wb_new_ui/assets/Lobby/component/group/Button8.xml
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml b/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
index 12f33c08..32883b8f 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
@@ -1,8 +1,10 @@
-
+
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu.xml
index 964132fb..abd71d21 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_menu.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu.xml
@@ -2,9 +2,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml b/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
index d6b9f916..1ef2754d 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
@@ -1,9 +1,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml b/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
index aa79eaab..cc63d334 100644
--- a/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml b/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
index 3c3cf354..95f40189 100644
--- a/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
+++ b/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
@@ -1,10 +1,17 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 296.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 296.png
new file mode 100644
index 00000000..33450cd4
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 296.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 298.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 298.png
new file mode 100644
index 00000000..fbfcfa29
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 298.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 299.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 299.png
new file mode 100644
index 00000000..0a59aaf6
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 299.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 345.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 345.png
new file mode 100644
index 00000000..ab9a24b9
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 345.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 346.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 346.png
new file mode 100644
index 00000000..4e5606fb
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 346.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 347.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 347.png
new file mode 100644
index 00000000..342245f3
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 347.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 348.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 348.png
new file mode 100644
index 00000000..02791066
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 348.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 349.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 349.png
new file mode 100644
index 00000000..de56b38e
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 349.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 419.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 419.png
new file mode 100644
index 00000000..c1e1f946
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 419.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 603.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 603.png
new file mode 100644
index 00000000..f9e9ed9b
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 603.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/diamond.png b/wb_new_ui/assets/Lobby/images/LobbyMui/diamond.png
new file mode 100644
index 00000000..9e031c89
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/diamond.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/dt_zs_di.png b/wb_new_ui/assets/Lobby/images/LobbyMui/dt_zs_di.png
new file mode 100644
index 00000000..0d10e0c8
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/dt_zs_di.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/image 217.png b/wb_new_ui/assets/Lobby/images/LobbyMui/image 217.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/image 217.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index f161a7b3..019f3c28 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -328,6 +328,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Login/Main.xml b/wb_new_ui/assets/Login/Main.xml
index 7b0f0c14..0cc9c321 100644
--- a/wb_new_ui/assets/Login/Main.xml
+++ b/wb_new_ui/assets/Login/Main.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/wb_new_ui/assets/Login/commpoent/Btn_phone.xml b/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
index 221ab681..37bf7f98 100644
--- a/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
+++ b/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
@@ -2,7 +2,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Login/commpoent/Btn_wx.xml b/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
index 6da3dbb1..1e1e6984 100644
--- a/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
+++ b/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
@@ -2,7 +2,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml b/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
index 99e43efa..114bcc7f 100644
--- a/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
+++ b/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
@@ -1,17 +1,21 @@
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
@@ -20,28 +24,28 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/Login/images/LoginMui/Frame 521.png b/wb_new_ui/assets/Login/images/LoginMui/Frame 521.png
new file mode 100644
index 00000000..141931ba
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/Frame 521.png differ
diff --git a/wb_new_ui/assets/Login/images/LoginMui/Frame 580.png b/wb_new_ui/assets/Login/images/LoginMui/Frame 580.png
new file mode 100644
index 00000000..bf5d2c20
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/Frame 580.png differ
diff --git a/wb_new_ui/assets/Login/images/LoginMui/Frame 639.png b/wb_new_ui/assets/Login/images/LoginMui/Frame 639.png
new file mode 100644
index 00000000..2e4bbb84
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/Frame 639.png differ
diff --git a/wb_new_ui/assets/Login/images/LoginMui/Frame 640.png b/wb_new_ui/assets/Login/images/LoginMui/Frame 640.png
new file mode 100644
index 00000000..ffbb4279
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/Frame 640.png differ
diff --git a/wb_new_ui/assets/Login/images/LoginMui/Rectangle 757.png b/wb_new_ui/assets/Login/images/LoginMui/Rectangle 757.png
new file mode 100644
index 00000000..c6860933
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/Rectangle 757.png differ
diff --git a/wb_new_ui/assets/Login/images/LoginMui/image 217.png b/wb_new_ui/assets/Login/images/LoginMui/image 217.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_new_ui/assets/Login/images/LoginMui/image 217.png differ
diff --git a/wb_new_ui/assets/Login/package.xml b/wb_new_ui/assets/Login/package.xml
index 9af1f246..36844312 100644
--- a/wb_new_ui/assets/Login/package.xml
+++ b/wb_new_ui/assets/Login/package.xml
@@ -22,6 +22,12 @@
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 49436940..69e37294 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -103,21 +103,21 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -160,9 +160,10 @@
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2.xml
index c06ee2ef..16a24fab 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_1.xml
index fc31ab59..51ef04db 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_1.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_2.xml
index bc17b596..2a058da5 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_2.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_2.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_3.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_3.xml
index 6840b242..8e4e8fcc 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_3.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_3.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_4.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_4.xml
index 2323f4e0..51ef04db 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_4.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_4.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_5.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_5.xml
index 43e0f1fa..644c5e17 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_5.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_desk2_5.xml
@@ -1,15 +1,13 @@
-
+
-
-
+
-
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml
index abc0ac0d..1a32beb3 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml
@@ -1,22 +1,20 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2.xml
index e7a14d1b..55cebebb 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_1.xml
index 222a61e8..27c0b5ab 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_1.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_2.xml
index fa8f2dac..28007f1d 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_2.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_2.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_3.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_3.xml
index edfc4d54..9af133d4 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_3.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_3.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_4.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_4.xml
index 5c41a426..caae3b86 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_4.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_4.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_5.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_5.xml
index 4208cba4..615acad0 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_5.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Item_room2_5.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-1.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-1.png
new file mode 100644
index 00000000..d2ae2887
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-1.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-2.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-2.png
new file mode 100644
index 00000000..166e25e1
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-2.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-3.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-3.png
new file mode 100644
index 00000000..b3facd0b
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-3.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-4.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-4.png
new file mode 100644
index 00000000..04453aad
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-4.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-5.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-5.png
new file mode 100644
index 00000000..ac6e7b2f
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-5.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-6.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-6.png
new file mode 100644
index 00000000..026fe996
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/2-6.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Frame 390.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Frame 390.png
new file mode 100644
index 00000000..c97e875b
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Frame 390.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Rectangle 673.png b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Rectangle 673.png
new file mode 100644
index 00000000..aed506d5
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/NGXiangTangMui/Rectangle 673.png differ
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 34669376..f87a2441 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -920,6 +920,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png
deleted file mode 100644
index 081d3028..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png
deleted file mode 100644
index 3bac7baf..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png and /dev/null 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 0f6353dd..c1d8f969 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 f7feee3d..525b283a 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 f8b1a6a3..a4a6f763 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_atlas_ht5v7cnr.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ht5v7cnr.png
deleted file mode 100644
index 9f1b4d6c..00000000
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ht5v7cnr.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ht5v7cnr.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ht5v7cnr.png.meta
deleted file mode 100644
index ceea1a82..00000000
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ht5v7cnr.png.meta
+++ /dev/null
@@ -1,128 +0,0 @@
-fileFormatVersion: 2
-guid: f26b9dffc11564a48b2955ab480a9d95
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: -1
- wrapV: -1
- wrapW: -1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: 4
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 1
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png
deleted file mode 100644
index ff0ebcb5..00000000
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png.meta
similarity index 95%
rename from wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta
rename to wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png.meta
index 6a7efe39..646631d0 100644
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta
+++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_lrbs7co7.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c3bf0d4c2973d744d898043768c3e83b
+guid: 648908d5c039d4546a00c7df438bf3bd
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
+ assetBundleName:
assetBundleVariant:
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 db7bdd73..e75845fe 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_atlas0.png b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png
index 4cb434b1..efb8f1bc 100644
Binary files a/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png and b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png.meta
similarity index 95%
rename from wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta
rename to wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png.meta
index c6154dc7..c3232a6e 100644
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta
+++ b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas_mag17cj8.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e2e33887c1ff88b4a8772b5b091df544
+guid: 09127112dd6f4c44cad90b4c47eb62a1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
+ assetBundleName:
assetBundleVariant:
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 5b2db200..4ad621e0 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 6ead507e..ab7a532c 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 d254c461..218fddd0 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 4da89f50..ddbf3ec9 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_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 4bb6d9dc..24474473 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/Resources/base/embed/ui/Hotupdate_atlas0.png b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png
index ecec408d..895d2731 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_atlas_lrbs7i4w.png b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas_lrbs7i4w.png
new file mode 100644
index 00000000..0987bea0
Binary files /dev/null and b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas_lrbs7i4w.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas_lrbs7i4w.png.meta
similarity index 95%
rename from wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta
rename to wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas_lrbs7i4w.png.meta
index f84c6f66..ebe9f238 100644
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta
+++ b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas_lrbs7i4w.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 91856ffa6c475db4a8161e3fef331c28
+guid: a4903c642f2532d4d823cd9d42ed8fb3
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
+ assetBundleName:
assetBundleVariant:
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 caeb4110..f1feda4c 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