[CN UPDATE] Client:2.2.81 Data:24-05-28-13-45-33-2fd577

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

@@ -1,6 +1,6 @@
 GlobalConfig = 
 {
-  CUR_FUNC_VER = "V050",
+  CUR_FUNC_VER = "V051",
 }
 
 

zh_CN/gamedata/[uc]lua/feature/AudioConsts.lua

@@ -9,8 +9,6 @@ AudioConsts =
   ACT4FUN_VALUE_BOOM_UP = "ON_ACT4FUN_SCFULL";
   ACT4FUN_VALUE_BOOM_LOW = "ON_ACT4FUN_SCLACK";
   ACT4FUN_END_FAILED = "ON_ACT4FUN_SCWARNING";
-  ACT1SIGNVS_BOAT_ENTER = "ON_ACT1SIGNVS_DRAGONBOATLOAD";
-  ACT1SIGNVS_BOAT_URGE = "ON_ACT1SIGNVS_DRAGONBOATURGE";
   ACT1BLESSING_PACKET_ENTRY = "ON_ACT1BLESSING_SFSGNENTR";
   ACT1BLESSING_OPEN_PACKET = "ON_ACT1BLESSING_SFSGNOPN";
   ACT5FUN_ENTER = "ON_ACT5FUN_ENTER";

zh_CN/gamedata/[uc]lua/feature/activity/checkinvs/CheckinVsMainDlg.lua

@@ -16,6 +16,8 @@ local CheckinVsDefine = require("Feature/Activity/CheckinVs/CheckinVsDefine")
 
 
 
+
+
 CheckinVsMainDlg = Class("CheckinVsMainDlg", DlgBase)
 
 CheckinVsMainDlg.SHOW_GAINED_ITEMS_DELAY = 2
@@ -28,7 +30,7 @@ function CheckinVsMainDlg:OnInit()
   self._enterAnim:SampleClipAtBegin(self.ENTER_ANIM_NAME)
   local tween = self._enterAnim:PlayWithTween(self.ENTER_ANIM_NAME)
   tween:SetEase(Ease.Linear)
-  TorappuAudio.PlayUI(AudioConsts.ACT1SIGNVS_BOAT_ENTER)
+  TorappuAudio.PlayUI(self._boatEnterAudioName)
 
   CS.Torappu.Lua.LuaUIUtil.BindBackPressToButton(self._btnClose)
   self:AddButtonClickListener(self._btnClose, self._EventOnCloseClick)
@@ -173,7 +175,7 @@ function CheckinVsMainDlg:_HandleCheckinVsRsp(response, choice)
   else
     self.m_isAnimPlay = true
     self.m_mainView:PlayBoatAnim(choice)
-    TorappuAudio.PlayUI(AudioConsts.ACT1SIGNVS_BOAT_URGE)
+    TorappuAudio.PlayUI(self._boatUrgeAudioName)
     self:Delay(self.SHOW_GAINED_ITEMS_DELAY, function()
       if response.items ~= nil and #response.items > 0  then
         UIMiscHelper.ShowGainedItems(response.items)

zh_CN/gamedata/[uc]lua/feature/activity/checkinvs/view/CheckinVsMainView.lua

@@ -45,6 +45,15 @@ local CheckinVsMainViewModel = require("Feature/Activity/CheckinVs/CheckinVsMain
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -57,8 +66,6 @@ local CheckinVsMainViewModel = require("Feature/Activity/CheckinVs/CheckinVsMain
 
 local CheckinVsMainView = Class("CheckinVsMainView", UIPanel)
 
-CheckinVsMainView.LOW_BOAT_POS_VAL = -80
-CheckinVsMainView.HIGH_BOAT_POS_VAL = -50
 CheckinVsMainView.SWEET_BOAT_ANIM_NAME = "act1signvs_boat_sweet"
 CheckinVsMainView.SALTY_BOAT_ANIM_NAME = "act1signvs_boat_salt"
 CheckinVsMainView.TITLE_FREE_SPRITE_NAME = "title_free_party"
@@ -246,24 +253,36 @@ function CheckinVsMainView:_InitBoatView()
   local socialState = self.m_viewModel.socialState
   local actDay = self.m_viewModel.actDay
   local canVote = self.m_viewModel.canVote
+  local isSweetAhead = false
+  local isSaltyAhead = false
+  local needShowBaseLine = true
   if actDay == 1 and canVote then
-    sweetBoatPos.y = self.LOW_BOAT_POS_VAL
-    saltyBoatPos.y = self.LOW_BOAT_POS_VAL
+    sweetBoatPos.y = tonumber(self._lowBoatPosVal)
+    saltyBoatPos.y = tonumber(self._lowBoatPosVal)
+    needShowBaseLine = false
   elseif socialState == CheckinVsDefine.TasteChoice.SWEET then
-    sweetBoatPos.y = self.HIGH_BOAT_POS_VAL
-    saltyBoatPos.y = self.LOW_BOAT_POS_VAL
+    sweetBoatPos.y = tonumber(self._highBoatPosVal)
+    saltyBoatPos.y = tonumber(self._lowBoatPosVal)
+    isSweetAhead = true
   elseif socialState == CheckinVsDefine.TasteChoice.SALTY then
-    sweetBoatPos.y = self.LOW_BOAT_POS_VAL
-    saltyBoatPos.y = self.HIGH_BOAT_POS_VAL
+    sweetBoatPos.y = tonumber(self._lowBoatPosVal)
+    saltyBoatPos.y = tonumber(self._highBoatPosVal)
+    isSaltyAhead = true
   else
-    sweetBoatPos.y = self.LOW_BOAT_POS_VAL
-    saltyBoatPos.y = self.LOW_BOAT_POS_VAL
+    sweetBoatPos.y = tonumber(self._lowBoatPosVal)
+    saltyBoatPos.y = tonumber(self._lowBoatPosVal)
   end
   self._sweetBoatContainerRt.anchoredPosition = sweetBoatPos
   self._saltyBoatContainerRt.anchoredPosition = saltyBoatPos
 
   local isVoteFinish = self.m_viewModel:IsVoteFinish()
   local isSaltyWin = socialState == CheckinVsDefine.TasteChoice.SALTY
+  SetGameObjectActive(self._sweetBoatBaseLineGo, needShowBaseLine and not isVoteFinish)
+  SetGameObjectActive(self._saltyBoatBaseLineGo, needShowBaseLine and not isVoteFinish)
+  SetGameObjectActive(self._dotLineLeftGo, not isVoteFinish)
+  SetGameObjectActive(self._dotLineRightGo, not isVoteFinish)
+  SetGameObjectActive(self._sweetAheadGo, isSweetAhead and not isVoteFinish)
+  SetGameObjectActive(self._saltyAheadGo, isSaltyAhead and not isVoteFinish)
   SetGameObjectActive(self._sweetWinnerBgGo, isVoteFinish and not isSaltyWin)
   SetGameObjectActive(self._sweetWinnerBannerGo, isVoteFinish and not isSaltyWin)
   SetGameObjectActive(self._saltyWinnerBgGo, isVoteFinish and isSaltyWin)

zh_CN/gamedata/[uc]lua/feature/activity/switchonly/SwitchOnlyItemView.lua

@@ -17,6 +17,8 @@ local luaUtils = CS.Torappu.Lua.Util;
 
 
 
+
+
 
 
 local SwitchOnlyItemView = Class("SwitchOnlyItemView", UIWidget)
@@ -77,7 +79,11 @@ function SwitchOnlyItemView:_RenderGot(got, unlocked)
   luaUtils.SetActiveIfNecessary(self._btnLock.gameObject, not got);
   luaUtils.SetActiveIfNecessary(self._availablePanel, unlocked and not got);
   if got then
-    self._reward_canvas.alpha = SwitchOnlyConst.REWARD_GOT_ALPHA;
+    if self._receivedAlpha == nil then
+      self._reward_canvas.alpha = SwitchOnlyConst.REWARD_GOT_ALPHA;
+    else
+      self._reward_canvas.alpha = self._receivedAlpha;
+    end
   else 
     self._reward_canvas.alpha = 1;
   end

zh_CN/gamedata/[uc]lua/feature/wardrobe/WardrobeSortBySkinGroupState.lua

@@ -17,8 +17,24 @@ function WardrobeSortBySkinGroupState:JumpToDetail(skinGroup)
   self.parent:ToState(WardrobePageHolder.StateEnum.SkinGroupDetailStateIndex)
 end
 
+function WardrobeSortBySkinGroupState:PlayAnim()
+
+  self.selfTween = self._animWrapper:PlayWithTween(WardrobeSortBySkinGroupState.ANIM_PARAM )  
+end
+
 function WardrobeSortBySkinGroupState:CheckData(data)
-  self._animWrapper:PlayWithTween(WardrobeSortBySkinGroupState.ANIM_PARAM )
+  if (self.sequence~= nil) then
+    self.sequence:Kill()
+  end
+  if (self.selfTween~=nil) then
+    self.selfTween:Kill()
+  end
+  self._animWrapper:SampleClipAtBegin(WardrobeSortBySkinGroupState.ANIM_PARAM)
+  self.sequence =  CS.DG.Tweening.DOTween.Sequence();
+  self.sequence:AppendInterval(0.05)
+  self.sequence:AppendCallback(function()
+      self:PlayAnim()
+  end)
   self:Delay(0.8,self.OnEffect)
 
   if (self.initFlag) then

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

@@ -3,15 +3,9 @@ local list =
 {
 
   "HotFixes/TestStubHotfixer",
-  "HotFixes/BattleControllerHotfixer",
-  "HotFixes/BattlePhaseHotfixer",
-  "HotFixes/EnemyHotfixer",
-  "HotFixes/Act2VMultiBattleFinishNormalViewHotfixer",
-  "HotFixes/CooperateGameModeHotfixer",
-  "HotFixes/CooperateHintPanelHotfixer",
-  "HotFixes/AuraAbilityHotfixer",
   "HotFixes/HandbookInfoAvgHotfixer",
-  "HotFixes/EntityHotfixer"
+  "HotFixes/EnemyHotfixer",
+  "HotFixes/V051Hotfixer",
 };
 
-return list;
+return list;

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

@@ -18,6 +18,33 @@ function _ResetPhysicsStatusFix(self)
     self.stateMachine.blackboard:ResetUnbalanceProtectTime();
 end
 
+function EndPullFix(self, source)
+    pullList = self.m_pullSources:GetInternalList()
+    for i = 0, pullList.Count - 1 do
+        src = pullList[i]
+        if src:Lock() == source then
+            self.m_pullSources:Remove(src)
+            break
+        end
+    end
+
+    disablePullSrc = self.m_disabledPullSources:GetInternalList()
+    for i = 0, disablePullSrc.Count - 1 do
+        src = disablePullSrc[i]
+        if src:Lock() == source then
+            self.m_disabledPullSources:Remove(src)
+            break
+        end
+    end
+
+    if self.m_pullSources.isEmpty and self.isUnbalanced then
+        self.stateMachine:Tick(0)
+    end
+    if source:GetType() ~= typeof(CS.Torappu.Battle.Projectile) and source.source ~= nil then
+        source.source.buffContainer:OnEndPulling(self);
+    end      
+end
+
 function EnemyHotfixer:OnInit()
     xlua.private_accessible(CS.Torappu.Battle.Enemy)
     self:Fix_ex(CS.Torappu.Battle.Enemy, "_ResetPhysicsStatus", function(self) 
@@ -26,6 +53,12 @@ function EnemyHotfixer:OnInit()
           eutil.LogError("[EnemyHotfixer] _ResetPhysicsStatus fix" .. errorInfo)
         end
     end)
+    self:Fix_ex(CS.Torappu.Battle.Enemy, "EndPull", function(self, source) 
+        local ok, errorInfo = xpcall(EndPullFix, debug.traceback, self, source)
+        if not ok then
+          eutil.LogError("[EnemyHotfixer] EndPull fix" .. errorInfo)
+        end
+    end)
 end
 
 function EnemyHotfixer:OnDispose()

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

@@ -0,0 +1,43 @@
+
+
+local xutil = require('xlua.util')
+local CSSender = CS.Torappu.UI.UISender
+
+
+
+
+local V051Hotfixer = Class("V051Hotfixer", HotfixBase)
+
+local function _FixSendBattleService(self, isRetry)
+  local routine = self:_SendBattleService(isRetry)
+  return xutil.cs_generator(function()
+    while CSSender.IsBusy() do
+      coroutine.yield()
+    end
+    coroutine.yield(routine)
+  end)
+end
+
+local function _FixExecuteHideCgItem(self, command)
+  local param = self:_GenSlotParam(command)
+  local clearAll = false
+  if (param.key == nil or param.key == '') then
+    clearAll = true
+  end
+
+  if (clearAll) then
+    for k,v in pairs(self.m_slotsInUseDict) do
+      v:Dispose()
+    end
+    self.m_slotsInUseDict:Clear()
+    return false
+  end
+  self:_ExecuteHideCgItem(command)
+end
+
+function V051Hotfixer:OnInit()
+  self:Fix_ex(CS.Torappu.Battle.UI.UIBattleFinishServiceState, "_SendBattleService", _FixSendBattleService);
+  self:Fix_ex(CS.Torappu.AVG.AVGCgItemPanel, "_ExecuteHideCgItem", _FixExecuteHideCgItem);
+end
+
+return V051Hotfixer