[CN UPDATE] Client:2.2.61 Data:24-04-30-14-20-51-275ddf

Kengxxiao · May 1, 2024 · e52a6dc · e52a6dc
1 parent 935e1c5
commit e52a6dc
Show file tree

Hide file tree

Showing 196 changed files with 399,972 additions and 90,841 deletions.
diff --git a/zh_CN/gamedata/[uc]lua/GlobalConfig.lua b/zh_CN/gamedata/[uc]lua/GlobalConfig.lua
@@ -1,6 +1,6 @@
 GlobalConfig = 
 {
-  CUR_FUNC_VER = "V049",
+  CUR_FUNC_VER = "V050",
 }
 
 

diff --git a/zh_CN/gamedata/[uc]lua/feature/wardrobe/WardrobeSkinGroupDetailState.lua b/zh_CN/gamedata/[uc]lua/feature/wardrobe/WardrobeSkinGroupDetailState.lua
@@ -15,6 +15,11 @@ function WardrobeSkinGroupDetailState:OnResume()
   self:Render()
 end
 
+function WardrobeSkinGroupDetailState:OnClose()
+
+  self._wrappedViewPager:ClearFunc()
+end
+
 function WardrobeSkinGroupDetailState:_RenderCheck(data)
   for k,v in pairs(data.skinList) do
     if (WardrobeUtil.CheckSkinOnSale(v)) then
@@ -69,19 +74,16 @@ function WardrobeSkinGroupDetailState:CheckData(data)
   for k,kvImgInfo in pairs(data.data.kvImgIdList) do
     local publishTime = skinGroupTimeRef[kvImgInfo.linkedSkinGroupId]
     if publishTime < currentTime then
-      local sprite = CS.Torappu.UI.Wardrobe.WardrobeKVSpriteLoader.LoadSpriteFromHubStatic(kvImgInfo.kvImgId, CS.Torappu.ResourceUrls.GetSkinKvHubPath())
-      table.insert(spriteList,sprite)
+      table.insert(spriteList,kvImgInfo.kvImgId)
     end
   end
-  local sprite =  CS.Torappu.UI.Wardrobe.WardrobeKVSpriteLoader.LoadSpriteFromHubStatic(string.format("default_kv_%s",data.data.brandId),CS.Torappu.ResourceUrls.GetSkinKvHubPath())
-  if (sprite ~= nil) then
-    table.insert(spriteList,sprite)
-  end
+  table.insert(spriteList,string.format("default_kv_%s",data.data.brandId))
   local pos = self._content.anchoredPosition
   pos.y = 0
   self._content.anchoredPosition = pos
   self._triEffect:ToInitScale()
-  self._wrappedViewPager:InitRender(spriteList)
+  self.spriteList = spriteList
+  self._wrappedViewPager:InitRenderFunc(spriteList,CS.Torappu.ResourceUrls.GetSkinKvHubPath())
 end
 
 function WardrobeSkinGroupDetailState:GetTransInfo()

diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua b/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua
@@ -3,8 +3,6 @@ local list =
 {
 
   "HotFixes/TestStubHotfixer",
-  "HotFixes/SandboxCatchedAnimalManagerHotfixer",
-  "HotFixes/HomeThemeTrackPointHotfixer"
 };
 
 return list;