[CN UPDATE] Client:2.5.60 Data:25-04-30-05-10-18_7ba4b2

Author: Vulpisfoglia_BOT_rev20250407

zh_CN/gamedata/[uc]lua/GlobalConfig.lua

@@ -1,6 +1,6 @@
 GlobalConfig = 
 {
-  CUR_FUNC_VER = "V060",
+  CUR_FUNC_VER = "V061",
 }
 
 

zh_CN/gamedata/[uc]lua/feature/activity/LuaActivityUtil.lua

@@ -577,7 +577,7 @@ function LuaActivityUtil:_CheckIfCheckinVsUncomplete(actId)
     return false
   end
 
-  return playerActData.availSignCnt > 0
+  return playerActData.availSignCnt > 0 or playerActData.voteRewardState == 1
 end
 
 function LuaActivityUtil:_CheckIfCheckinAllUncomplete(actId)
@@ -693,6 +693,31 @@ function LuaActivityUtil:_CheckIfActAccessFinished(actId)
   return actData.constData.dayCount <= playerAccess.rewardsCount;
 end
 
+
+
+function LuaActivityUtil:_CheckIfCheckinVsFinished(actId)
+  local checkinVsPlayers = CS.Torappu.PlayerData.instance.data.activity.checkinVsActivityList
+  if checkinVsPlayers == nil then
+    return false
+  end
+  local suc, playerActData = checkinVsPlayers:TryGetValue(actId)
+  if not suc then
+    return false
+  end
+
+  local checkinVsActs = CS.Torappu.ActivityDB.data.activity.versusCheckInData
+  if checkinVsActs == nil then
+    return false
+  end
+  local suc1, actData = checkinVsActs:TryGetValue(actId)
+  if not suc1 then  
+    return false
+  end
+  local signTotalCnt = actData.checkInDict.Count
+
+  return playerActData.signedCnt >= signTotalCnt
+end
+
 function LuaActivityUtil:_CheckIfActAccessUncomplete(actId)
   local playerData = CS.Torappu.PlayerData.instance.data.activity;
   if string.isNullOrEmpty(actId) or playerData.checkinAccessList == nil then
@@ -751,7 +776,7 @@ function LuaActivityUtil:_CheckIfActivityFinished(type, validAct)
   elseif type == CS.Torappu.ActivityType.CHECKIN_ALL_PLAYER then
 
   elseif type == CS.Torappu.ActivityType.CHECKIN_VS then
-
+    return self:_CheckIfCheckinVsFinished(actId)
   elseif type == CS.Torappu.ActivityType.SWITCH_ONLY then
     return self:_CheckIfSwitchOnlyFinished(actId)
   elseif type == CS.Torappu.ActivityType.UNIQUE_ONLY then

zh_CN/gamedata/[uc]lua/hotfixes/AbilityStandardHotfixer.lua

@@ -0,0 +1,24 @@
+
+local AbilityStandardHotfixer = Class("AbilityStandardHotfixer", HotfixBase)
+
+local function _Fix_OnAttackFinished(self, arg)
+  if arg == nil then
+    self:OnAttackFinished(self)
+  else
+    self:OnAttackFinished(arg)
+  end
+end
+
+function AbilityStandardHotfixer:OnInit()
+  xlua.private_accessible(CS.Torappu.Battle.AbilityStandard)
+
+  self:Fix_ex(CS.Torappu.Battle.AbilityStandard, "OnAttackFinished",
+  function(self, arg)
+    local ok, errorInfo = xpcall(_Fix_OnAttackFinished, debug.traceback, self, arg)
+      if not ok then
+        LogError("fix AbilityStandard OnAttackFinished error" .. errorInfo)
+      end
+  end)
+end
+
+return AbilityStandardHotfixer

zh_CN/gamedata/[uc]lua/hotfixes/ActVecBreakV2SquadBuffSelectStateHotfixer.lua

@@ -0,0 +1,39 @@
+local luaUtils = CS.Torappu.Lua.Util;
+
+local ActVecBreakV2SquadBuffSelectStateHotfixer = Class("ActVecBreakV2SquadBuffSelectStateHotfixer", HotfixBase)
+
+local function _BuffItemClickFix(self, stageId)
+  local model = self.m_stateBean.property.Value;
+  local page = self:GetPage();
+  if not model or not model.buffListModel or not model.selectedBuffIdList or
+      string.isNullOrEmpty(stageId) or not page then
+    return;
+  end
+  local buffItemModel = model.buffListModel:GetBuffItemByStageId(stageId);
+  if not buffItemModel then
+    return;
+  end
+  if not buffItemModel.isStageStarted then
+    local timeStr = CS.Torappu.FormatUtil.FormatTimeDeltaStrFromNow(buffItemModel.stageStartTs);
+    CS.Torappu.Activity.VecBreakV2.ActVecBreakV2Util.TextToast(page, luaUtils.Format(StringRes.VEC_BREAK_V2_UNLOCK_TIME_HINT_STR, timeStr));
+    return;
+  end
+  if not buffItemModel.isBuffUnlocked then
+    CS.Torappu.Activity.VecBreakV2.ActVecBreakV2Util.TextToast(page, model.buffLockToast);
+    return;
+  end
+  self:_BuffItemClick(stageId);
+end
+
+function ActVecBreakV2SquadBuffSelectStateHotfixer:OnInit()
+  xlua.private_accessible(typeof(CS.Torappu.Activity.VecBreakV2.ActVecBreakV2SquadBuffSelectState))
+  self:Fix_ex(CS.Torappu.Activity.VecBreakV2.ActVecBreakV2SquadBuffSelectState, "_BuffItemClick", function (self, stageId)
+    local ok, errorInfo = xpcall(_BuffItemClickFix, debug.traceback, self, stageId)
+    if not ok then
+      LogError("[Act Vec Break] stage squad buff fix error: ".. errorInfo);
+      self:_BuffItemClick(stageId);
+    end
+  end)
+end
+
+return ActVecBreakV2SquadBuffSelectStateHotfixer;

zh_CN/gamedata/[uc]lua/hotfixes/CommonCharSelectCardDefaultViewModelHotfixer.lua

@@ -0,0 +1,47 @@
+
+
+local CommonCharSelectCardDefaultViewModelHotfixer = Class("CommonCharSelectCardDefaultViewModelHotfixer", HotfixBase)
+
+local function OnEquipChangedFix(self, newEquipId)
+  
+  local charQuery = CS.Torappu.CharQuery.TemplateChar(self.m_basicInfo.charId, self.m_basicInfo.tmplId);
+
+  local evolvePhase = self.m_basicInfo.evolvePhase;
+  local potentialRank = self.m_basicInfo.potentialRank;
+  local level = self.m_basicInfo.level;
+  local favorPoint = self.m_basicInfo.favorPoint;
+
+  local equipQueries = nil;
+  if not string.isNullOrEmpty(newEquipId) then
+    local suc, playerEquip = self.equips:TryGetValue(newEquipId)
+    if suc then
+      equipQueries = {
+        CS.Torappu.CharacterData.UniqueEquipPair(newEquipId, playerEquip.level),
+      };
+    end
+  end
+
+  local attrData = CS.Torappu.DataConvertUtil.AchieveCharAttributes(
+      charQuery, evolvePhase, potentialRank, level, favorPoint, equipQueries);
+  if attrData ~= nil then
+    local patchBuilder = CS.Torappu.UI.BasicCharInfoModel.PatchBuilder();
+    patchBuilder.attrData = attrData;
+    patchBuilder:BuildTo(self.m_basicInfo);
+
+    local advancedCharInst = CS.Torappu.AdvancedCharacterInst(
+        charQuery, level, evolvePhase, potentialRank, equipQueries);
+    self.m_attackRange = CS.Torappu.DataConvertUtil.AchieveCharacterAttackRange(advancedCharInst);
+  end
+end
+function  CommonCharSelectCardDefaultViewModelHotfixer:OnInit()
+  xlua.private_accessible(typeof(CS.Torappu.UI.TemplateCharSelect.Common.CommonCharSelectCardDefaultViewModel))
+  self:Fix_ex(typeof(CS.Torappu.UI.TemplateCharSelect.Common.CommonCharSelectCardDefaultViewModel), "OnEquipChanged", function(self, newEquipId)
+    local ok, errorInfo = xpcall(OnEquipChangedFix, debug.traceback, self, newEquipId)
+    if not ok then
+      LogError("[hotfix] CommonCharSelectCardDefaultViewModel:OnEquipChanged fix error: ".. errorInfo);
+      self:OnEquipChanged(newEquipId);
+    end
+  end);
+end
+
+return CommonCharSelectCardDefaultViewModelHotfixer;

zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua

@@ -3,10 +3,11 @@ local list =
 {
 
   "HotFixes/TestStubHotfixer",
-  "HotFixes/BattleControllerHotfixer",
-  "HotFixes/StageZoneSelectStateHotfixer",
-  "HotFixes/UICommentedTextHotfixer",
-  "HotFixes/EnemyDuelBattleFinishRankItemViewHotfixer"
+  "HotFixes/SwitchableMultiEffectByBuffStackCntHotfixer",
+  "HotFixes/LoginHotfixer",
+  "HotFixes/ActVecBreakV2SquadBuffSelectStateHotfixer",
+  "HotFixes/CommonCharSelectCardDefaultViewModelHotfixer",
+  "HotFixes/AbilityStandardHotfixer",
 };
 
 return list;

zh_CN/gamedata/[uc]lua/hotfixes/LoginHotfixer.lua

@@ -0,0 +1,76 @@
+
+
+
+
+local LoginHotfixer = Class("LoginHotfixer", HotfixBase)
+
+local UIAssetLoader = CS.Torappu.UI.UIAssetLoader
+local function _InjectLoginBkg(self)
+  if self.isResumedFromStack then
+    return
+  end
+  local bkg = CS.Torappu.Lua.LuaUIUtil.GetImage(self.gameObject, "image_bkg_back")
+  if bkg == nil then
+    return
+  end
+  local loadAsset_generic = xlua.get_generic_method(UIAssetLoader, "LoadAsset")
+  local loadAssetFunc = loadAsset_generic(CS.UnityEngine.Sprite)
+  local sprite = loadAssetFunc(UIAssetLoader.instance, "Arts/UI/Login/image_white")
+  if sprite == nil then
+    return
+  end
+  bkg.sprite = sprite
+  bkg.color = CS.UnityEngine.Color.white
+end
+
+local function SetMoviePath(self, path)
+  local status = self:GetCurrentStatus()
+  if CS.Torappu.GameFlowController.currentScene == "hot_update" then
+    local isTargetMovie = string.find(path, "MT01")  
+    if isTargetMovie then
+      local size = self._rect.sizeDelta;
+      size.x = 1560
+      size.y = 720
+      self._rect.sizeDelta = size
+    end
+    if status == CS.Torappu.Video.AbstractMediaPlayerHolder.Status.PLAYEND and isTargetMovie then
+      self:Play()
+      return
+    end
+    self:SetPath(path)
+    self:Play()
+    return
+  end
+  self:SetPath(path)
+end
+
+local function OnApplicationPause(self ,status)
+  return
+end
+
+function LoginHotfixer:OnInit()
+  self:Fix_ex(CS.Torappu.UI.Login.LoginInitState, "OnResume", function(self)
+    local ok, err = xpcall(_InjectLoginBkg, debug.traceback, self)
+    if not ok then
+      LogError("Failed to InjectLoginBkg : " .. err)
+    end
+    self:OnResume()
+  end)
+  xlua.private_accessible(typeof(CS.Torappu.Video.SofdecMediaPlayer))
+  self:Fix_ex(CS.Torappu.Video.SofdecMediaPlayer, "SetPath", function(self,path)
+    local ok, err = xpcall(SetMoviePath, debug.traceback, self,path)
+    if not ok then
+      self:SetPath(path)
+      LogError("Failed to SetMoviePath : " .. err)
+    end
+  end)
+  xlua.private_accessible(typeof(CS.Torappu.UI.HotUpdate.HotUpdaterPreMainMediaView))
+  self:Fix_ex(CS.Torappu.UI.HotUpdate.HotUpdaterPreMainMediaView, "OnApplicationPause", function(self,status)
+    local ok, err = xpcall(OnApplicationPause, debug.traceback, self,status)
+    if not ok then
+      LogError("Failed to OnApplicationPause : " .. err)
+    end
+  end)
+end
+
+return LoginHotfixer

zh_CN/gamedata/[uc]lua/hotfixes/SwitchableMultiEffectByBuffStackCntHotfixer.lua

@@ -0,0 +1,75 @@
+local MathUtil = CS.Torappu.MathUtil
+local FP = CS.Torappu.FP
+local BattleController = CS.Torappu.Battle.BattleController
+local Vector3 = CS.UnityEngine.Vector3
+local ObjectPtrWrap = nil
+
+
+local SwitchableMultiEffectByBuffStackCntHotfixer = Class("SwitchableMultiEffectByBuffStackCntHotfixer", HotfixBase)
+
+local function EnsureObjectPtrWrap()
+  if ObjectPtrWrap == nil then
+    local genericMethod = xlua.get_generic_method(CS.Torappu.ObjectPtr, "Wrap")
+    ObjectPtrWrap = genericMethod(CS.Torappu.Battle.Effects.Effect)
+  end
+end
+function SwitchableMultiEffectByBuffStackCntHotfixer:OnInit()
+  xlua.private_accessible(typeof(CS.Torappu.Battle.Effects.SwitchableMultiEffectByBuffStackCnt))
+  self:Fix(typeof(CS.Torappu.Battle.Effects.SwitchableMultiEffectByBuffStackCnt), "_UpdateEffectWithBuffCnt", function(inst)
+    local owner = inst.owner:Lock()
+    if owner == nil then
+      return
+    end
+
+    local stackCnt = owner:GetBuffStackCount(inst._buffKey)
+    local validIdx = -1
+    for i = 1, inst._effects.Count do
+      local effectData = inst._effects[i-1]
+      local lhs = FP(stackCnt)
+      local rhs = FP(effectData.stackCnt)
+      if MathUtil.CompareFP(lhs, rhs, effectData.compareType) then
+        validIdx = i-1
+        break
+      end
+    end
+
+    EnsureObjectPtrWrap()
+
+    if validIdx >= 0 then
+      local newEffect = nil
+      local effectData = inst._effects[validIdx]
+      if inst.m_stackEffects == nil then
+        inst.m_stackEffects = {}
+        newEffect = BattleController.instance:CreateEffect(effectData.effect, owner, owner, Vector3(owner.faceVector.x, owner.faceVector.y, 0))
+        local effectPtr = ObjectPtrWrap(newEffect)
+        inst.m_stackEffects[validIdx] = effectPtr
+      else
+        local flag, _ = inst.m_stackEffects:TryGetValue(validIdx)
+        if not flag then
+          newEffect = BattleController.instance:CreateEffect(effectData.effect, owner, owner, Vector3(owner.faceVector.x, owner.faceVector.y, 0))
+          local effectPtr = ObjectPtrWrap(newEffect)
+          inst.m_stackEffects[validIdx] = effectPtr
+        end
+      end
+
+      for idx, ptr in pairs(inst.m_stackEffects) do
+        if ptr.isValid then
+          ptr:Lock():SetPausedByOthers(idx ~= validIdx)
+        end
+      end
+
+      inst.effect:SetPausedByOthers(true)
+    else
+      if inst.m_stackEffects ~= nil then
+        for idx, ptr in pairs(inst.m_stackEffects) do
+          if ptr.isValid then
+            ptr:Lock():SetPausedByOthers(true)
+          end
+        end
+      end
+      inst.effect:SetPausedByOthers(false)
+    end
+  end)
+end
+
+return SwitchableMultiEffectByBuffStackCntHotfixer