[CN UPDATE] Client:2.3.21 Data:24-07-31-04-23-55-e2099f

Kengxxiao · Aug 1, 2024 · e29ca9a · e29ca9a
1 parent b9f6dc9
commit e29ca9a
Show file tree

Hide file tree

Showing 206 changed files with 298,378 additions and 155,093 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 = "V052",
+  CUR_FUNC_VER = "V053",
 }
 
 

diff --git a/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionActModel.lua b/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionActModel.lua
@@ -74,39 +74,24 @@ end
 
 
 function CollectionActModel:GetActCfg(actid)
-  if actid == CollectionActID.act3d5 then
-    return
-    {
-      baseColor = ColorRes.COMMON_BLUE,
-      baseColorHex = "0075A9";
-      pointItemName = CS.Torappu.I18N.StringMap.Get("ACTIVITY_3D5_POINT_SIMPLE_NAME");
-      taskItemScale = 0.7;
-    };
-  elseif actid == CollectionActID.act4d5 then
-    return
-    {
-      baseColor = CS.UnityEngine.Color(0.973,0.412,0.000);
-      baseColorHex = "F86900";
-      pointItemName = CS.Torappu.I18N.StringMap.Get("ACTIVITY_4D5_POINT_SIMPLE_NAME");
-      taskItemScale = 0.5;
-    };
-  elseif actid == CollectionActID.act6d8 then
-    return
-    {
-      baseColor = CS.UnityEngine.Color(1.000,0.255,0.157);
-      baseColorHex = "ff4128";
-      pointItemName = CS.Torappu.I18N.StringMap.Get("ACTIVITY_6D8_POINT_SIMPLE_NAME");
-      taskItemScale = 0.5;
-    };
-  elseif actid == CollectionActID.act9d4 then
-    return
-    {
-      baseColor = CS.UnityEngine.Color(0.957,0.396,0.145);
-      baseColorHex = "f46525";
-      pointItemName = CS.Torappu.I18N.StringMap.Get("ACTIVITY_9D4_POINT_SIMPLE_NAME");
-      taskItemScale = 0.5;
-    };
+  local cfg = {
+    baseColor = CS.UnityEngine.Color.white;
+    baseColorHex = "000000";
+    pointItemName = "";
+    taskItemScale = 0.5;
+  }
+
+  local suc, homeActCfg = CS.Torappu.ActivityDB.data.homeActConfig:TryGetValue(actid);
+  if not suc then
+    return cfg;
   end
+
+  local pointItemViewModel = CollectionActModel.me:FindPointRewardItem(actid);
+
+  cfg.pointItemName = pointItemViewModel.name;
+  cfg.baseColorHex = homeActCfg.actTopBarColor;
+  cfg.baseColor = CS.Torappu.ColorRes.TweenHtmlStringToColor(homeActCfg.actTopBarColor);
+  return cfg;
 end
 
 ActivityServiceCode = 

diff --git a/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionDailyTaskItem.lua b/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionDailyTaskItem.lua
@@ -9,7 +9,7 @@ function CollectionDailyTaskItem:Refresh(actId, cfg)
 
   local rewardData = CollectionActModel.me:FindPointRewardItem(actId);
   self._descLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.ACTIVITY_3D5_HELP_DAILY_DESC, cfg.pointItemName);
-  self._itemDescLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.ACTIVITY_3D5_HELP_DAILY_ITEM_DESC, cfg.pointItemName);
+  self._itemDescLabel.text = StringRes.ACT_COLLECTION_HELP_DAILY_ITEM_DESC;
   if not self.m_itemCell then
     local itemCard = CS.Torappu.UI.UIAssetLoader.instance.staticOutlinks.uiItemCard;
     self.m_itemCell = CS.UnityEngine.GameObject.Instantiate(itemCard, self._itemIconRoot):GetComponent("Torappu.UI.UIItemCard");

diff --git a/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionMainDlg.lua b/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionMainDlg.lua
@@ -82,7 +82,7 @@ function CollectionMainDlg:_RefreshContent()
   self._pointCnt.text = tostring(pointCurCnt);
   self._pointIcon.sprite = CS.Torappu.UI.ItemUtil.LoadItemIconUI(pointItemData:GetItemType(), pointItemData.itemId, pointItemData.itemIconId);
 
-  self._helpBtnDesc.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.ACTIVITY_3D5_HELP_BTN_DESC, itemCfg.pointItemName);
+  self._helpBtnDesc.text = CS.Torappu.Lua.Util.Format(StringRes.ACT_COLLECTION_HELP_BTN_DESC, itemCfg.pointItemName);
 
   local completeIdx = 0;
   local lastCanGetIdx = 0;

diff --git a/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun2MainDlg.lua b/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun2MainDlg.lua
@@ -261,5 +261,11 @@ function ActFun2MainDlg:EventOnStartBattleClick()
   actMeta.meta = bundle
 
   param.actMeta = actMeta
+
+  local gameTagMeta = {
+    gameTag = CS.Torappu.Battle.GameTagMeta.ACTFUN
+  }
+  param.gameTagMeta = gameTagMeta
+
   CS.Torappu.BattleStartController.StartBattle(param)
 end
diff --git a/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun3MainDlg.lua b/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun3MainDlg.lua
@@ -235,6 +235,11 @@ function ActFun3MainDlg:StartAct3FunBattle(actId, stageId)
     isDeterministic = false,
     modeType = CS.Torappu.Battle.GameModeMeta.GameModeType.DANMAKU
   }
+
+  local gameTagMeta = {
+    gameTag = CS.Torappu.Battle.GameTagMeta.ACTFUN
+  }
+
   local param = {
     stageId = stageId,
     isPractise = false,
@@ -253,6 +258,7 @@ function ActFun3MainDlg:StartAct3FunBattle(actId, stageId)
     actMeta = actMeta,
     gameModeMeta = gameModeMeta,
     isOverrideBGM = true,
+    gameTagMeta = gameTagMeta,
   }
   CS.Torappu.BattleStartController.StartBattle(param)
 end
diff --git a/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun4MainDlg.lua b/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun4MainDlg.lua
@@ -339,6 +339,10 @@ function ActFun4MainDlg:_StartActFun4Battle(actId, stageId)
     modeType = CS.Torappu.Battle.GameModeMeta.GameModeType.FUNLIVE,
     extraData = funLiveInput
   }
+  local gameTagMeta = {
+    gameTag = CS.Torappu.Battle.GameTagMeta.ACTFUN
+  }
+
   local param = {
     stageId = stageId,
     isPractise = false,
@@ -357,6 +361,7 @@ function ActFun4MainDlg:_StartActFun4Battle(actId, stageId)
     actMeta = actMeta,
     gameModeMeta = gameModeMeta,
     isOverrideBGM = true,
+    gameTagMeta = gameTagMeta,
   }
   CS.Torappu.BattleStartController.StartBattle(param)
 end

diff --git a/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun5MainDlg.lua b/zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun5MainDlg.lua
@@ -210,6 +210,10 @@ function ActFun5MainDlg:StartAct5FunBattle(actId, stageId)
     isDeterministic = false,
     modeType = CS.Torappu.Battle.GameModeMeta.GameModeType.ACT_5_FUN
   }
+  local gameTagMeta = {
+    gameTag = CS.Torappu.Battle.GameTagMeta.ACTFUN
+  }
+
   local param = {
     stageId = stageId,
     isPractise = false,
@@ -228,6 +232,7 @@ function ActFun5MainDlg:StartAct5FunBattle(actId, stageId)
     actMeta = actMeta,
     gameModeMeta = gameModeMeta,
     isOverrideBGM = true,
+    gameTagMeta = gameTagMeta,
   }
   CS.Torappu.BattleStartController.StartBattle(param)
 end
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua b/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua
@@ -3,8 +3,8 @@ local list =
 {
 
   "HotFixes/TestStubHotfixer",
-  "HotFixes/CastSkillWithLimitTimesHotfixer",
-  "HotFixes/RoguelikeTopicHotfixer"
+  "HotFixes/RemovableSharedRandomTileGlobalBuffHotfixer",
+  "HotFixes/NameCardEditHotfixer"
 };
 
 return list;
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/NameCardEditHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/NameCardEditHotfixer.lua
@@ -0,0 +1,47 @@
+
+local NameCardEditHotfixer = Class("NameCardEditHotfixer", HotfixBase)
+local AVGVideoPanelHotfixer = Class("AVGVideoPanelHotfixer", HotfixBase)
+
+local function _CheckUnlock(self)
+  local guideController = CS.Torappu.UI.UIGuideController
+  local lockTarget = CS.Torappu.UI.UILockTarget.NAME_CARD_SKIN_CHANGE
+  local isUnlocked = guideController.CheckIfUnlocked(lockTarget)
+  if not isUnlocked then
+    guideController.ToastOnLockedItemClicked(lockTarget)
+    return
+  end
+
+  self:OnConfirmBtnClick()
+end
+
+local function FixAwake(self)
+  self:Awake()
+  local canvas = self:GetComponentInParent(typeof(CS.UnityEngine.Canvas))
+  if canvas ~= nil then
+    canvas.sortingOrder = 103
+  end
+end
+
+function NameCardEditHotfixer:OnInit()
+  xlua.private_accessible(CS.Torappu.UI.Friend.NameCardSkinChangeState)
+  self:Fix_ex(CS.Torappu.UI.Friend.NameCardSkinChangeState, "OnConfirmBtnClick", function(self)
+    local ok, errorInfo = xpcall(_CheckUnlock, debug.traceback, self)
+    if not ok then
+      LogError("[NameCardEditHotfixer] fix OnConfirmBtnClick error:" .. errorInfo)
+    end
+  end)
+
+  xlua.private_accessible(CS.Torappu.AVG.AVGVideoPanel)
+  self:Fix_ex(CS.Torappu.AVG.AVGVideoPanel, "Awake", function(self)
+    local ok, errorInfo = xpcall(FixAwake, debug.traceback, self)
+    if not ok then
+      LogError("[AVGVideoPanelHotfixer] fix ExecuteVideo error:" .. errorInfo)
+    end
+  end)
+end
+
+function NameCardEditHotfixer:OnDispose()
+end
+
+return NameCardEditHotfixer
+
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/RemovableSharedRandomTileGlobalBuffHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/RemovableSharedRandomTileGlobalBuffHotfixer.lua
@@ -0,0 +1,56 @@
+
+local RemovableSharedRandomTileGlobalBuffHotfixer = Class("RemovableSharedRandomTileGlobalBuffHotfixer", HotfixBase)
+
+local function _TryRemoveBindingTiles(self, tiles)
+  if tiles == nil then
+    return false
+  end
+  local hasNew = false
+  local tilesCount = tiles.Count
+  local luaCreateCnt = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.createCnt
+  local luaS_targetTiles = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.s_targetTiles
+  local luaEffectHolder = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.effectHolder
+  for i = 0, tilesCount - 1 do
+    local tile = tiles[i]
+    if tile ~= nil then
+      if self:FilterTile(tile) then
+        flag, cnt = luaCreateCnt:TryGetValue(tile.gridPosition)
+        if flag and cnt > 0 then
+          luaCreateCnt[tile.gridPosition] = cnt - 1
+          if cnt - 1 <= 0 then
+            luaS_targetTiles:Remove(tile.gridPosition)
+            self.targetTiles:Remove(tile.gridPosition)
+            local character = tile:GetCharacter()
+            if character ~= nil then
+              self:TryRemoveBuff(character, false)
+            end
+            if not string.isNullOrEmpty(self.tileEffect) then
+              hasEffect, curTileEffect = luaEffectHolder:TryGetValue(tile)
+              if hasEffect and curTileEffect ~= nil then
+                curTileEffect:FinishMe(true)
+                luaEffectHolder:Remove(tile)
+              end
+            end
+            hasNew = true
+          end
+        end
+      end
+    end
+  end
+  return hasNew
+end
+
+function RemovableSharedRandomTileGlobalBuffHotfixer:OnInit()
+  xlua.private_accessible(CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff)
+  self:Fix_ex(CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff, "TryRemoveBindingTiles", function(self, tiles)
+    local ok, errorInfo = xpcall(_TryRemoveBindingTiles, debug.traceback, self, tiles)
+    if not ok then
+      LogError("[RemovableSharedRandomTileGlobalBuffHotfixer] fix" .. errorInfo)
+    end
+  end)     
+end
+
+function RemovableSharedRandomTileGlobalBuffHotfixer:OnDispose()
+end
+
+return RemovableSharedRandomTileGlobalBuffHotfixer;