Hotfix - 1.6.0.85

EN: 1.6.0.85
CN: 1.6.0.88
JP: 1.6.0.89
KR: 1.6.0.92
This commit is contained in:
SL1900
2026-02-09 18:00:00 +09:00
parent 46f967a584
commit 952e8cb875
57 changed files with 8098 additions and 283 deletions
@@ -220,7 +220,7 @@ function CookieActData:SetNMHighScoreDay()
local nDayCount = nYear * 366 + nMonth * 31 + nDay
LocalData.SetPlayerLocalData("Cookie_Nightmare_HighScoreDay", nDayCount)
end
function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
local callbackFunc = function(_, msgData)
self:SetLevelData(nLevelId, nScore)
self:SetLevelReward(msgData)
@@ -229,6 +229,7 @@ function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCo
end
end
if self.nActId == 0 then
self.nActId = nActId
printError("RequestCookieLevelResult: ActivityId is 0!!! - ActivityId = " .. self.nActId .. ", nLevelId = " .. nLevelId .. ", nScore = " .. nScore)
end
HttpNetHandler.SendMsg(NetMsgId.Id.activity_cookie_settle_req, {
@@ -243,8 +244,8 @@ function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCo
Good = nGoodCount
}, nil, callbackFunc)
end
function CookieActData:OnEvent_GameComplete(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
self:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
function CookieActData:OnEvent_GameComplete(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
self:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
end
function CookieActData:OnEvent_QuestClaim(nQuestId)
self:SendQuestReceive(nQuestId)
@@ -234,8 +234,12 @@ end
function PlayerEquipmentData:SetRollWarning(bAble)
self.bRollWarning = bAble
end
function PlayerEquipmentData:CacheEquipmentSelect(nSlotId, nGemIndex)
self.mapSelect = {nSlotId = nSlotId, nGemIndex = nGemIndex}
function PlayerEquipmentData:CacheEquipmentSelect(nSlotId, nGemIndex, nCharId)
self.mapSelect = {
nSlotId = nSlotId,
nGemIndex = nGemIndex,
nCharId = nCharId
}
end
function PlayerEquipmentData:GetEquipmentSelect()
if self.mapSelect == nil then
@@ -2,6 +2,7 @@ local PlayerMallData = class("PlayerMallData")
local TimerManager = require("GameCore.Timer.TimerManager")
local MessageBoxManager = require("GameCore.Module.MessageBoxManager")
local LocalData = require("GameCore.Data.LocalData")
local ModuleManager = require("GameCore.Module.ModuleManager")
local ClientManager = CS.ClientManager.Instance
local WwiseAudioMgr = CS.WwiseAudioManager.Instance
local SDKManager = CS.SDKManager.Instance
@@ -671,7 +672,8 @@ function PlayerMallData:CollectEnd(bError)
if not bError then
self:CloseOrderWait()
end
if PanelManager.CheckPanelOpen(PanelId.ReceiveAutoTrans) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsTips) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsNPC) == true or PanelManager.CheckPanelOpen(PanelId.ReceiveSpecialReward) == true or PanelManager.CheckNextPanelOpening() then
local bInAdventure = ModuleManager.GetIsAdventure()
if PanelManager.CheckPanelOpen(PanelId.ReceiveAutoTrans) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsTips) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsNPC) == true or PanelManager.CheckPanelOpen(PanelId.ReceiveSpecialReward) == true or PanelManager.CheckNextPanelOpening() or bInAdventure == true then
funcClear()
else
local sTip
@@ -1318,6 +1318,7 @@ function PlayerStarTowerData:ChangeNpcAffinity(mapInfo)
self:UpdateNpcAffinityRedDot()
end
function PlayerStarTowerData:UpdateNpcAffinityRedDot()
RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, "server", false)
local forEachNpc = function(mapData)
RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, mapData.Id, false)
end
@@ -22,7 +22,7 @@ function PlayerStateData:CacheStateData(mapMsgData)
RedDotManager.SetValid(RedDotDefine.Mall_Free, nil, mapMsgData.MallPackage.New)
RedDotManager.SetValid(RedDotDefine.Friend_Apply, nil, mapMsgData.Friend)
RedDotManager.SetValid(RedDotDefine.Friend_Energy, nil, mapMsgData.FriendEnergy.State)
RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity, nil, mapMsgData.NpcAffinityReward)
RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, "server", mapMsgData.NpcAffinityReward)
PlayerData.Quest:UpdateServerQuestRedDot(mapMsgData.TravelerDuelQuest)
PlayerData.Quest:UpdateServerQuestRedDot(mapMsgData.TravelerDuelChallengeQuest)
PlayerData.InfinityTower:UpdateBountyRewardState(mapMsgData.InfinityTower)