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

Hotfix - 1.13.0.126

Browse Source 
EN: 1.13.0.126
CN: 1.13.0.126
JP: 1.13.0.130
KR: 1.13.0.132
This commit is contained in:
SL1900
2026-07-23 17:00:00 +09:00
parent 8c4bd41668
commit fb98bcdc16
27 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/spine/spinemanager.lua
+8 -14
View File
@@ -3,17 +3,12 @@ local GameResourceLoader = require("Game.Common.Resource.GameResourceLoader")
local ResTypeAny = GameResourceLoader.ResType.Any
local typeof = typeof
local mapInstance = {}
local mapPrefab = {}
local nNextId = 1
local LoadPrefab = function(sPath)
local prefab = mapPrefab[sPath]
prefab = GameResourceLoader.LoadAsset(ResTypeAny, Settings.AB_ROOT_PATH .. sPath, typeof(Object))
if prefab == nil then
prefab = GameResourceLoader.LoadAsset(ResTypeAny, Settings.AB_ROOT_PATH .. sPath, typeof(Object))
if prefab == nil then
printError("[SpineManager] 加载预制体失败, path = " .. tostring(sPath))
return nil
end
mapPrefab[sPath] = prefab
printError("[SpineManager] 加载预制体失败, path = " .. tostring(sPath))
return nil
end
return prefab
end
@@ -59,7 +54,8 @@ function SpineManager.Create(nId, trParent)
skel = skeleton,
sPath = sPath,
bPaused = false,
fLastTimeScale = 1
fLastTimeScale = 1,
bBound = false
}
return id
end
@@ -80,7 +76,8 @@ function SpineManager.Bind(go)
skel = skeleton,
sPath = nil,
bPaused = false,
fLastTimeScale = 1
fLastTimeScale = 1,
bBound = true
}
return id
end
@@ -102,15 +99,12 @@ function SpineManager.Unbind(id)
end
function SpineManager.ClearAll()
for _, tb in pairs(mapInstance) do
if tb.go ~= nil and tb.go:IsNull() == false then
if tb.bBound ~= true and tb.go ~= nil and tb.go:IsNull() == false then
destroyImmediate(tb.go)
end
end
mapInstance = {}
end
function SpineManager.ReleasePrefabCache()
mapPrefab = {}
end
function SpineManager.PlayAnim(id, sAnimName, bLoop, nTrackIndex)
local tb = GetInstance(id)
if tb == nil or tb.skel == nil then
lua/game/ui/avg/_kr/config/stev_10_02.lua
+1 -1
View File
@@ -13207,7 +13207,7 @@ return {
"",
false,
"",
"코하쿠, 나개 가르쳐 줄게~",
"코하쿠, 내가 가르쳐 줄게~",
""
}
},
lua/game/ui/play_icecreamtruck/icecreamlevelgroupctrl.lua
+1 -1
View File
@@ -197,7 +197,7 @@ function IceCreamLevelGroupCtrl:RegisterNewRedNode(nActId, nIndex)
RedDotManager.RegisterNode(RedDotDefine.Activity_IceCreamTruck_NewType, {nActId, nIndex}, self._mapNode.redH)
end
function IceCreamLevelGroupCtrl:UnRegisterNewRedNode()
RedDotManager.UnRegisterNode(RedDotDefine.Activity_IceCreamTruck_NewLevel, {
RedDotManager.UnRegisterNode(RedDotDefine.Activity_IceCreamTruck_NewType, {
nActId,
nIndex
}, self._mapNode.redH)
lua/game/ui/play_icecreamtruck/icecreamlevelsselectctrl.lua
+5 -2
View File
@@ -1,5 +1,6 @@
local TimerManager = require("GameCore.Timer.TimerManager")
local IceCreamLevelsSelectCtrl = class("IceCreamLevelsSelectCtrl", BaseCtrl)
local SpineManager = require("Game.Spine.SpineManager")
IceCreamLevelsSelectCtrl._mapNodeConfig = {
TopBar = {
sNodeName = "TopBarPanel",
@@ -44,6 +45,10 @@ function IceCreamLevelsSelectCtrl:OnDisable()
TimerManager.Remove(self._tmrSwitchDetail, false)
self._tmrSwitchDetail = nil
end
SpineManager.ClearAll()
end
function IceCreamLevelsSelectCtrl:OnDestroy()
SpineManager.ClearAll()
end
function IceCreamLevelsSelectCtrl:InitLevel(nActId)
self.IceCreamActData = PlayerData.Activity:GetActivityDataById(nActId)
@@ -73,8 +78,6 @@ end
function IceCreamLevelsSelectCtrl:OnRefreshLevelGroup(gridIndex, tbLevels)
self._mapNode.LevelGroup[gridIndex]:InitData(self.nActId, gridIndex, tbLevels, self)
end
function IceCreamLevelsSelectCtrl:OnDestroy()
end
function IceCreamLevelsSelectCtrl:OpenLevelDetail_Animator(nTypeIndex)
if nTypeIndex < 1 or 4 < nTypeIndex then
return
lua/game/ui/play_icecreamtruck/play/icecreamresultctrl.lua
+2 -4
View File
@@ -44,14 +44,12 @@ IceCreamResultCtrl._mapNodeConfig = {
btn_InRestart = {
sComponentName = "NaviButton",
callback = "OnBtn_InRestart",
sAction = "Giveup",
sActionIconType = "Dark"
sAction = "Giveup"
},
btn_InNext = {
sComponentName = "NaviButton",
callback = "OnBtn_InNext",
sAction = "Giveup",
sActionIconType = "Dark"
sAction = "Giveup"
},
txtBtnClose = {
nCount = 4,
lua/game/ui/play_icecreamtruck/play/icecreamtruckgamectrl.lua
+2
View File
@@ -257,6 +257,7 @@ function IceCreamTruckGameCtrl:OnDisable()
self.timerFeverCutinDeactivate = nil
end
self._nRestartGen = (self._nRestartGen or 0) + 1
SpineManager.ClearAll()
end
function IceCreamTruckGameCtrl:ReInitData()
self:InitData()
@@ -1786,6 +1787,7 @@ function IceCreamTruckGameCtrl:_TeardownForRestart()
self:_GuideClearGarbage()
self._goGarbageGuide = nil
self:UnregisterCondimentSpines()
self:_UnregisterFeverCatSpine()
self:_DestroyAllSauceInstances()
end
function IceCreamTruckGameCtrl:_ClearSafeHitQueue()
lua/game/ui/play_icecreamtruck/play/icecreamtruckpausectrl.lua
+4 -8
View File
@@ -24,20 +24,17 @@ IceCreamTruckPauseCtrl._mapNodeConfig = {
btn_exit = {
sComponentName = "NaviButton",
callback = "OnBtnClick_Exit",
sAction = "Giveup",
sActionIconType = "Dark"
sAction = "Giveup"
},
btn_restart = {
sComponentName = "NaviButton",
callback = "OnBtnClick_Restart",
sAction = "Retry",
sActionIconType = "Dark"
sAction = "Retry"
},
btn_continue = {
sComponentName = "NaviButton",
callback = "OnBtnClick_Continue",
sAction = "Back",
sActionIconType = "Dark"
sAction = "Back"
},
txt_SettleScoreTitle = {
sComponentName = "TMP_Text",
@@ -63,8 +60,7 @@ IceCreamTruckPauseCtrl._mapNodeConfig = {
btn_dic = {
sComponentName = "NaviButton",
callback = "OnBtnClick_OpenDic",
sAction = "Depot",
sActionIconType = "Dark"
sAction = "Depot"
},
txt_dic = {
nCount = 2,
lua/game/ui/play_penguincard/penguincarditemctrl.lua
+43 -25
View File
@@ -32,7 +32,6 @@ PenguinCardItemCtrl._mapEventConfig = {
PenguinCardGrowth = "OnEvent_Growth"
}
function PenguinCardItemCtrl:Refresh_Select(mapCard, nSelectIndex, bRoll)
self.mapCard = mapCard
self.nSelectIndex = nSelectIndex
self._mapNode.txtLevel.gameObject:SetActive(false)
self._mapNode.txtName.gameObject:SetActive(true)
@@ -51,10 +50,10 @@ function PenguinCardItemCtrl:Refresh_Select(mapCard, nSelectIndex, bRoll)
self._mapNode.AnimRoot:Play("PengUinCard_Bd_Shopin", 0, 0)
end
function PenguinCardItemCtrl:Refresh_Slot(mapCard)
self.mapCard = mapCard
self.nSlotIndex = mapCard.nSlotIndex
self.nEffectCount = 0
self.bWaitPlay = false
local bAble = self.mapCard:GetActiveState()
local bAble = mapCard:GetActiveState()
self._mapNode.txtLevel.gameObject:SetActive(bAble)
self._mapNode.txtName.gameObject:SetActive(false)
self._mapNode.imgBg:SetActive(false)
@@ -76,7 +75,11 @@ function PenguinCardItemCtrl:Refresh_Slot(mapCard)
end
end
function PenguinCardItemCtrl:RefreshUpgrade(nGroupId)
if self.mapCard.nGroupId == nGroupId then
if self.nSelectIndex == nil then
return
end
local mapCard = self._panel.mapLevel.tbSelectablePenguinCard[self.nSelectIndex]
if mapCard.nGroupId == nGroupId then
self._mapNode.imgUp:SetActive(false)
end
end
@@ -145,40 +148,44 @@ function PenguinCardItemCtrl:PlayTriggerAni()
self:PlayEffectAni()
end
function PenguinCardItemCtrl:PlayEffectAni()
if self.nSlotIndex == nil then
return
end
local mapCard = self._panel.mapLevel.tbPenguinCard[self.nSlotIndex]
if self.nEffectCount == nil then
self.nEffectCount = 0
end
local sDesc = ""
if self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseBasicChips then
local nValue = self.mapCard.tbEffectParam[1]
if self.mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + self.mapCard.nGrowthLayer * self.mapCard.tbGrowthEffectParam[1]
if mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseBasicChips then
local nValue = mapCard.tbEffectParam[1]
if mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + mapCard.nGrowthLayer * mapCard.tbGrowthEffectParam[1]
end
self.nEffectCount = self.nEffectCount + nValue
sDesc = orderedFormat(ConfigTable.GetUIText("PenguinCard_Trigger_AddScore"), self.nEffectCount)
elseif self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseMultiplier then
local nValue = self.mapCard.tbEffectParam[1]
if self.mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + self.mapCard.nGrowthLayer * self.mapCard.tbGrowthEffectParam[1]
elseif mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseMultiplier then
local nValue = mapCard.tbEffectParam[1]
if mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + mapCard.nGrowthLayer * mapCard.tbGrowthEffectParam[1]
end
self.nEffectCount = self.nEffectCount + nValue
sDesc = orderedFormat(ConfigTable.GetUIText("PenguinCard_Trigger_AddRatio"), self.nEffectCount)
elseif self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.MultiMultiplier then
local nValue = self.mapCard.tbEffectParam[1]
if self.mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + self.mapCard.nGrowthLayer * self.mapCard.tbGrowthEffectParam[1]
elseif mapCard.nEffectType == GameEnum.PenguinCardEffectType.MultiMultiplier then
local nValue = mapCard.tbEffectParam[1]
if mapCard.nGrowthType ~= GameEnum.PenguinCardGrowthType.None then
nValue = nValue + mapCard.nGrowthLayer * mapCard.tbGrowthEffectParam[1]
end
self.nEffectCount = self.nEffectCount + nValue
sDesc = orderedFormat(ConfigTable.GetUIText("PenguinCard_Trigger_MultiRatio"), self.nEffectCount)
end
self._mapNode.goTrigger:SetActive(sDesc ~= "")
if self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseBasicChips then
if mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseBasicChips then
self._mapNode.txtTrigger[1].gameObject:SetActive(false)
self._mapNode.txtTrigger[2].gameObject:SetActive(true)
NovaAPI.SetTMPText(self._mapNode.txtTrigger[2], sDesc)
self._mapNode.aniTrigger[2]:Play("PengUinCard_Bd_Trigger_in", 0, 0)
self._mapNode.aniTrigger[2].speed = self._panel.mapLevel.nSpeed
elseif self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseMultiplier or self.mapCard.nEffectType == GameEnum.PenguinCardEffectType.MultiMultiplier then
elseif mapCard.nEffectType == GameEnum.PenguinCardEffectType.IncreaseMultiplier or mapCard.nEffectType == GameEnum.PenguinCardEffectType.MultiMultiplier then
self._mapNode.txtTrigger[1].gameObject:SetActive(true)
self._mapNode.txtTrigger[2].gameObject:SetActive(false)
NovaAPI.SetTMPText(self._mapNode.txtTrigger[1], sDesc)
@@ -193,26 +200,37 @@ end
function PenguinCardItemCtrl:OnDisable()
end
function PenguinCardItemCtrl:OnBtnClick_OpenInfo()
if self.nSelectIndex and self._panel.mapLevel.bSelectedPenguinCard then
return
if self.nSelectIndex and not self._panel.mapLevel.bSelectedPenguinCard then
local mapCard = self._panel.mapLevel.tbSelectablePenguinCard[self.nSelectIndex]
EventManager.Hit("PenguinCard_OpenInfo", mapCard, self.nSelectIndex)
elseif self.nSlotIndex then
local mapCard = self._panel.mapLevel.tbPenguinCard[self.nSlotIndex]
EventManager.Hit("PenguinCard_OpenInfo", mapCard)
end
EventManager.Hit("PenguinCard_OpenInfo", self.mapCard, self.nSelectIndex)
end
function PenguinCardItemCtrl:OnEvent_Triggered(nSlotIndex)
if not (self.mapCard and self.mapCard ~= 0 and self.mapCard.nSlotIndex) or nSlotIndex ~= self.mapCard.nSlotIndex then
if self.nSlotIndex == nil then
return
end
if self.mapCard.nTriggerPhase == GameEnum.PenguinCardTriggerPhase.Settlement then
local mapCard = self._panel.mapLevel.tbPenguinCard[self.nSlotIndex]
if mapCard == 0 or nSlotIndex ~= mapCard.nSlotIndex then
return
end
if mapCard.nTriggerPhase == GameEnum.PenguinCardTriggerPhase.Settlement then
self.bWaitPlay = true
return
end
self:PlayTriggerAni()
end
function PenguinCardItemCtrl:OnEvent_Growth(nSlotIndex)
if not (self.mapCard and self.mapCard ~= 0 and self.mapCard.nSlotIndex) or nSlotIndex ~= self.mapCard.nSlotIndex then
if self.nSlotIndex == nil then
return
end
local bAble = self.mapCard:GetActiveState()
local mapCard = self._panel.mapLevel.tbPenguinCard[self.nSlotIndex]
if mapCard == 0 or nSlotIndex ~= mapCard.nSlotIndex then
return
end
local bAble = mapCard:GetActiveState()
self._mapNode.goDisable:SetActive(not bAble)
self._mapNode.txtLevel.gameObject:SetActive(bAble)
end
lua/game/ui/soldier/battle/soldierroominfoctrl.lua
+1
View File
@@ -529,6 +529,7 @@ function SoldierRoomInfoCtrl:OnEvent_ClearSoldier()
inst.imgDamage.sizeDelta = Vector2(0, 16)
end
end
self.tbDamage = {}
end
function SoldierRoomInfoCtrl:CacheSoldierEnergyData(dataId, nEnergy, nMaxEnergy, nRecoverRate, nDeath)
self.tbCacheSoldierEnergy[dataId] = {
lua/game/ui/soldier/sandtable/soldiersandtablectrl.lua
+1 -2
View File
@@ -1290,8 +1290,7 @@ function SoldierSandtableCtrl:OnEvent_SoldierExpUpdate()
expAnimator:Play("ExperienceContainer")
CS.WwiseAudioManager.Instance:PostEvent("mode_900001_chess_ingame_ExperienceReward")
self._mapNode.MiddleContainer:Play("LevelUpGrade")
end
if 0 < nOldExp and nOldExp ~= self.nCacheExp then
elseif nOldExp ~= self.nCacheExp then
expAnimator:Play("ExperienceContainer")
CS.WwiseAudioManager.Instance:PostEvent("mode_900001_chess_ingame_ExperienceReward")
end
lua/game/ui/tracehunt/tracehuntctrl.lua
+2 -4
View File
@@ -645,8 +645,7 @@ function TraceHuntCtrl:UpdateTraceLogCount()
return nNewLogStart
end
function TraceHuntCtrl:RefreshTraceLogEmpty()
local nProgress = PlayerData.TraceHunt:GetTraceProgress()
self._mapNode.goTraceLogEmpty:SetActive(self.nTraceLogCount == 0 and nProgress == 0)
self._mapNode.goTraceLogEmpty:SetActive(self.nTraceLogCount == 0)
self._mapNode.goHuntLogEmpty:SetActive(false)
end
function TraceHuntCtrl:RefreshHunt()
@@ -718,9 +717,8 @@ function TraceHuntCtrl:RefreshHuntLog()
self:RefreshHuntLogEmpty()
end
function TraceHuntCtrl:RefreshHuntLogEmpty()
local nProgress = PlayerData.TraceHunt:GetHuntProgress()
self._mapNode.goTraceLogEmpty:SetActive(false)
self._mapNode.goHuntLogEmpty:SetActive(self.nHuntLogCount == 0 and nProgress == 0)
self._mapNode.goHuntLogEmpty:SetActive(self.nHuntLogCount == 0)
end
function TraceHuntCtrl:RefreshHuntAddLog()
local tbLog = PlayerData.TraceHunt:GetHuntLog()
lua/gamecore/data/dataclass/soldier/playersoldierrecommenddata.lua
+3
View File
@@ -116,6 +116,9 @@ function PlayerSoldierRecommendData:GetRecommendData(bInSoldier)
end
end
function PlayerSoldierRecommendData:SaveData()
self.nRecommendId = self:GetRecommendId()
self.nInSoldierRecommendId = self:GetInSoldierRecommendId()
self.bInSoldierChanged = self:GetInSoldierChanged()
LocalData.SetPlayerLocalData("SoldierRecommend_Id", tostring(self.nRecommendId))
LocalData.SetPlayerLocalData("SoldierInSoldierRecommend_Id", tostring(self.nInSoldierRecommendId))
LocalData.SetPlayerLocalData("SoldierInSoldierChanged", self.bInSoldierChanged)