diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index 36787566..4684283d 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -467,14 +467,16 @@ function M:InitClip()
local hechengName = "ui://Lobby/hecheng 1_00"
local hecheng = self._view:GetChild('btn_joinroom')
local hechengIndex = 0
+ print("lingmengInitClip", taohua, renwu)
coroutine.start(
function()
while true do
taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName)
renwuIndex = self:ReplaceClip1(renwuEnd, renwu, renwuIndex, renwuName)
- pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
+ -- pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName)
- hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
+ -- hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
+ coroutine.wait(0.01)
end
end
)
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 741e8faa..c42a8c1f 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -8,12 +8,10 @@
],
"libview.iconScale": 0,
"doc.openedDocs": [
+ "ui://m7iejg4610snh5j",
"ui://2d9xdj6zfn7fao",
- "ui://2d9xdj6zzktq7d3s",
- "ui://2d9xdj6zlwcl5m",
- "ui://2d9xdj6zker3jg",
- "ui://2d9xdj6zoviicm0",
- "ui://2d9xdj6zker3je"
+ "ui://m7iejg46hsbhhjn",
+ "ui://m7iejg46r0qx7i6v"
],
"packageGroup.mine": [],
"test.device": "720p Phone",
@@ -22,22 +20,20 @@
"doc.activeDoc": "ui://2d9xdj6zfn7fao",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "27vd145b",
- "/",
- "27vd145b",
- "/component/",
- "27vd145b",
- "/component/create_room/",
- "27vd145b",
- "/component/head/",
"2d9xdj6z",
"/",
"2d9xdj6z",
"/images/",
"2d9xdj6z",
- "/images/movieClip/",
- "x3mp2cn6",
- "/"
+ "/images/clip_bg/",
+ "2d9xdj6z",
+ "/images/clip_createRoom/",
+ "2d9xdj6z",
+ "/images/clip_group/",
+ "2d9xdj6z",
+ "/images/clip_joinRoom/",
+ "2d9xdj6z",
+ "/images/movieClip/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml
index cfec7bbc..08a7a706 100644
--- a/wb_new_ui/assets/Lobby/Main.xml
+++ b/wb_new_ui/assets/Lobby/Main.xml
@@ -7,8 +7,10 @@
+
+
+
-
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 27256034..fd84b3e4 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -1,7 +1,7 @@
-
+
@@ -334,122 +334,122 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -510,396 +510,396 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file