SL1900/StellaSora_DataLua
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update - 1.14.0.129

Browse Source 
EN: 1.14.0.129
CN: 1.14.0.129
JP: 1.14.0.133
KR: 1.14.0.135
This commit is contained in:
SL1900
2026-08-18 12:00:00 +09:00
parent fd7efe05c2
commit a5251d8080
644 changed files with 763314 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/gamecore/data/dataclass/activity/breakoutdata.lua
+2 -2
View File
@@ -323,7 +323,7 @@ function BreakOutData:RequestFinishLevel(arrayData, cb)
cb()
end
end
EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS2)
EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS3)
HttpNetHandler.SendMsg(NetMsgId.Id.milkout_settle_req, mapMsg, nil, failCallback)
return
end
@@ -336,7 +336,7 @@ function BreakOutData:RequestFinishLevel(arrayData, cb)
FirstComplete = arrayData.Win
})
end
EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS2)
EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS3)
HttpNetHandler.SendMsg(NetMsgId.Id.milkout_settle_req, mapMsg, nil, successCallback)
end
function BreakOutData:CreateTempData(nLevelId, bResult)
lua/gamecore/data/dataclass/activity/breakoutleveldata.lua
+1 -1
View File
@@ -106,7 +106,7 @@ function BreakOutLevelData:GetIsFinishGame()
return self.bIsFinishGame
end
function BreakOutLevelData:OnEvent_AdventureModuleEnter()
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutPlayPanelS2, self.nActId, self.nLevelId, self.nCharacterNid)
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutPlayPanelS3, self.nActId, self.nLevelId, self.nCharacterNid)
end
function BreakOutLevelData:GetFloorHasDic(nFloorId)
local bResult = true
lua/gamecore/data/dataclass/activity/playeractivitydata.lua
+1 -1
View File
@@ -356,7 +356,7 @@ function PlayerActivityData:CreateActivityGroupIns(actData)
actIns = OurRegiment_10101Data.new(actData)
elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.Dream_10102 then
actIns = Dream_10102Data.new(actData)
elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30101 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30102 then
elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30101 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30102 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30103 then
actIns = BreakOut_30101Data.new(actData)
elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.Christmas_20101 then
actIns = Christmas_20101Data.new(actData)
lua/gamecore/data/dataclass/activity/throwgiftdata.lua
+1 -1
View File
@@ -78,7 +78,7 @@ function ThrowGiftData:GetLevelNewStateInternal(nLevelId)
return false
end
local nOpenTime = self:GetActOpenTime()
if mapLevelCfgData.DayOpen ~= 0 and mapLevelCfgData.DayOpen ~= nil and nOpenTime ~= 0 then
if nOpenTime ~= 0 then
local nServerTimeStamp = CS.ClientManager.Instance.serverTimeStamp
local nUnlockTime = mapLevelCfgData.DayOpen * 86400 + nOpenTime
if nUnlockTime - nServerTimeStamp <= 0 then
lua/gamecore/data/dataclass/playerbasedata.lua
+23 -30
View File
@@ -361,23 +361,26 @@ function PlayerBaseData:GetPlayerAvgId()
return sName
end
function PlayerBaseData:HandleEnergyTimer()
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel(nil)
end
if self._nCurEnergy < ConfigTable.GetConfigNumber("EnergyMaxLimit") then
self._nCurEnergy = self._nCurEnergy + 1
local nEnergyGain = ConfigTable.GetConfigNumber("EnergyGain") * 60
self._nEnergyTime = nEnergyGain + CS.ClientManager.Instance.serverTimeStamp
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel(nil)
if self._mapEnergyBatteryTimer ~= nil then
self._mapEnergyBatteryTimer:Cancel(nil)
end
if self._nCurEnergy < ConfigTable.GetConfigNumber("EnergyMaxLimit") then
local nEnergyGain = ConfigTable.GetConfigNumber("EnergyGain") * 60
self._nEnergyTime = nEnergyGain + CS.ClientManager.Instance.serverTimeStamp
self._mapEnergyTimer = TimerManager.Add(1, nEnergyGain, self, self.HandleEnergyTimer, true, true, false)
elseif self._nCurEnergyBattery < ConfigTable.GetConfigNumber("EnergyBatteryMax") then
local nEnergyBatteryGain = ConfigTable.GetConfigNumber("EnergyBatteryGain") * 60
self._nEnergyBatteryTime = nEnergyBatteryGain + CS.ClientManager.Instance.serverTimeStamp
self._mapEnergyBatteryTimer = TimerManager.Add(1, nEnergyBatteryGain, self, self.HandleEnergyBatteryTimer, true, true, false)
end
self._mapEnergyTimer = TimerManager.Add(1, nEnergyGain, self, self.HandleEnergyTimer, true, true, false)
EventManager.Hit(EventId.UpdateEnergy)
if self._nCurEnergy >= ConfigTable.GetConfigNumber("EnergyMaxLimit") then
self:HandleEnergyBatteryTimer()
end
else
self._nEnergyTime = 0
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel(nil)
end
end
end
function PlayerBaseData:HandleEnergyBatteryTimer()
@@ -1071,27 +1074,17 @@ function PlayerBaseData:SendEnergyInfoReq()
local nServerTime = CS.ClientManager.Instance.serverTimeStamp
self._nEnergyTime = msgData.IsPrimary == true and msgData.NextDuration + nServerTime or 0
self._nEnergyBatteryTime = msgData.IsPrimary == true and 0 or msgData.NextDuration + nServerTime
if msgData.NextDuration == 0 then
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel()
self._mapEnergyTimer = nil
end
if self._mapEnergyBatteryTimer ~= nil then
self._mapEnergyBatteryTimer:Cancel()
self._mapEnergyBatteryTimer = nil
end
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel()
self._mapEnergyTimer = nil
end
if msgData.IsPrimary == false then
if self._mapEnergyBatteryTimer ~= nil then
self._mapEnergyBatteryTimer:Cancel()
self._mapEnergyBatteryTimer = nil
end
if self._mapEnergyBatteryTimer ~= nil then
self._mapEnergyBatteryTimer:Cancel()
self._mapEnergyBatteryTimer = nil
end
if msgData.IsPrimary == false and msgData.NextDuration > 0 then
self._mapEnergyBatteryTimer = TimerManager.Add(1, msgData.NextDuration, self, self.HandleEnergyBatteryTimer, true, true, false)
else
if self._mapEnergyTimer ~= nil then
self._mapEnergyTimer:Cancel()
self._mapEnergyTimer = nil
end
elseif msgData.NextDuration > 0 then
self._mapEnergyTimer = TimerManager.Add(1, msgData.NextDuration, self, self.HandleEnergyTimer, true, true, false)
end
EventManager.Hit(EventId.UpdateEnergyBattery)
lua/gamecore/data/dataclass/playerequipmentdataex.lua
+1 -1
View File
@@ -407,7 +407,7 @@ function PlayerEquipmentData:SendCharGemGenerateReq(nCharId, nSlotId, nGemIndex,
local successCallback = function(_, mapMainData)
local nGemId = self:GetGemIdBySlot(nCharId, nSlotId)
local equipmentData = EquipmentData.new(mapMainData.CharGem, nCharId, nGemId)
self.tbCharEquipment[nCharId][nSlotId][nGemIndex] = equipmentData
table.insert(self.tbCharEquipment[nCharId][nSlotId], equipmentData)
if callback then
callback()
end
lua/gamecore/data/dataclass/playertracehuntdata.lua
+6 -2
View File
@@ -193,7 +193,9 @@ function PlayerTraceHuntData:CacheTraceHuntInfo(mapTraceHuntInfo)
self:UpdateControlData()
self:UpdateLevel(mapTraceHuntInfo.Level, mapTraceHuntInfo.Exp)
self:SetSelBuildId(mapTraceHuntInfo.BuildID)
self:UpdateBossRewardRedDot(self.nHuntProgress >= self.nMaxHuntProgress)
local bComplete = self:CheckHuntComplete()
local bInterrupt = self:CheckHuntInterrupt()
self:UpdateBossRewardRedDot(bComplete or bInterrupt)
if NovaAPI.IsEditorPlatform() then
printLog("TraceHunt 赛季id：" .. " " .. mapTraceHuntInfo.ControlID)
printLog("TraceHunt Boss id：" .. " " .. mapTraceHuntInfo.BossID)
@@ -630,7 +632,9 @@ function PlayerTraceHuntData:SendTraceHuntSettleReq(nBossId, callback)
self.nBossCreateTime = mapMainData.BossCreateTime
self:SetHuntTimer()
end
self:UpdateBossRewardRedDot(self.nHuntProgress >= self.nMaxHuntProgress)
local bComplete = self:CheckHuntComplete()
local bInterrupt = self:CheckHuntInterrupt()
self:UpdateBossRewardRedDot(bComplete or bInterrupt)
else
self:UpdateBossCollection(nBossId, 0, 1)
self.bRefreshHelpCD = false
lua/gamecore/network/httpnethandler.lua
+1
View File
@@ -1209,6 +1209,7 @@ local BindProcessFunction = function()
[NetMsgId.Id.activity_mining_energy_convert_notify] = activity_mining_energy_convert_notify,
[NetMsgId.Id.activity_mining_enter_layer_notify] = HttpNetHandlerPlus.activity_mining_enter_layer_notify,
[NetMsgId.Id.score_boss_star_reward_receive_succeed_ack] = score_boss_star_reward_receive_succeed_ack,
[NetMsgId.Id.score_boss_reset_score_notify] = HttpNetHandlerPlus.score_boss_reset_score_notify,
[NetMsgId.Id.activity_cookie_settle_succeed_ack] = HttpNetHandlerPlus.activity_cookie_settle_succeed_ack,
[NetMsgId.Id.redeem_code_succeed_ack] = redeem_code_succeed_ack,
[NetMsgId.Id.redeem_code_failed_ack] = NOTHING_NEED_TO_BE_DONE,
lua/gamecore/network/httpnethandlerplus.lua
+4
View File
@@ -353,4 +353,8 @@ end
function HttpNetHandlerPlus.sd_buff_card_add_notify(mapMsgData)
PlayerData.SoldierData:OnBuffCardAddNotify(mapMsgData)
end
function HttpNetHandlerPlus.score_boss_reset_score_notify()
PlayerData.ScoreBoss.isGetScInfo = false
PlayerData.ScoreBoss:GetScoreBossInstanceData(nil)
end
return HttpNetHandlerPlus
lua/gamecore/network/netmsgid.lua
+2
View File
@@ -937,6 +937,7 @@ NetMsgId.Id = {
trace_hunt_new_control_notify = 10057,
trace_hunt_state_notify = 10058,
trace_hunt_item_change_notify = 10060,
score_boss_reset_score_notify = 10061,
activity_mining_apply_req = 11001,
activity_mining_apply_succeed_ack = 11002,
activity_mining_apply_failed_ack = 11003,
@@ -1912,6 +1913,7 @@ NetMsgId.MsgName = {
[10057] = "proto.Nil",
[10058] = "proto.TraceHuntState",
[10060] = "proto.TraceHuntItem",
[10061] = "proto.Nil",
[11001] = "proto.ActivityMiningApplyReq",
[11002] = "proto.ActivityMiningApplyResp",
[11003] = "proto.Error",
lua/gamecore/ui/paneldefine.lua
+2
View File
@@ -288,6 +288,8 @@ local PanelDefine = {
[PanelId.ThrowGiftLevelPanel] = "Game.UI.Activity.ThrowGifts.ThrowGiftPanel",
[PanelId.ThrowGiftPanel_400009] = "Game.UI.Activity.ThrowGifts.ThrowGiftLevelSelectPanel_400009",
[PanelId.ThrowGiftLevelPanel_400009] = "Game.UI.Activity.ThrowGifts.ThrowGiftPanel_400009",
[PanelId.ThrowGiftPanel_400015] = "Game.UI.Activity.ThrowGifts.ThrowGiftLevelSelectPanel_400015",
[PanelId.ThrowGiftLevelPanel_400015] = "Game.UI.Activity.ThrowGifts.ThrowGiftPanel_400015",
[PanelId.JointDrillLevelSelect_Mode2] = "Game.UI.JointDrill.JointDrill_2.JointDrillLevelSelectPanel",
[PanelId.JointDrillBuildList_Mode2] = "Game.UI.JointDrill.JointDrill_2.JointDrillBuildListPanel",
[PanelId.JointDrillResult_Mode2] = "Game.UI.JointDrill.JointDrill_2.JointDrillResultPanel",
lua/gamecore/ui/panelid.lua
+2 -1
View File
@@ -1,4 +1,3 @@
local SoldierBuffTipsPanel = require("Game.UI.Soldier.Sandtable.Components.SoldierBuffTipsPanel")
local PanelId = {
AvgEditorMultiLanTool = -6,
ExeEditor = -4,
@@ -438,6 +437,8 @@ local PanelId = {
BreakOutLevelDetailPanelS3 = 515,
BreakOutResultPanelS3 = 516,
BreakOutPlayPanelS3 = 517,
ThrowGiftPanel_400015 = 525,
ThrowGiftLevelPanel_400015 = 526,
SoldierTestEnter = 99998,
GmTools = 99999
}