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

Update - 1.4.0.73

Browse Source 
EN: 1.4.0.73
CN: 1.4.0.74
JP: 1.4.0.77
KR: 1.4.0.80
This commit is contained in:
SL1900
2025-12-25 19:00:00 +09:00
parent 5f417fbe9d
commit 35c8d87e86
1183 changed files with 893278 additions and 92778 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/ui/battle/battledashboardctrl.lua
+42 -7
View File
@@ -248,7 +248,7 @@ function BattleDashboardCtrl:OnPreExit()
end
for i, v in ipairs(self.tbDefine_SupportSkillBtn) do
if v.nPlayerId ~= nil then
self:Remove_Skill_EntityEvent(v.nPlayerId)
self:Remove_SupportSkill_EntityEvent(v.nPlayerId, i)
v.nPlayerId = nil
end
end
@@ -531,7 +531,7 @@ function BattleDashboardCtrl:Refresh(nCurPlayerId)
bSuccess, nSupportCharId, nSupportPlayerId = AdventureModuleHelper.GetSecondSlotPlayer()
end
if self.tbDefine_SupportSkillBtn[i].nPlayerId ~= nil then
self:Remove_Skill_EntityEvent(self.tbDefine_SupportSkillBtn[i].nPlayerId)
self:Remove_SupportSkill_EntityEvent(self.tbDefine_SupportSkillBtn[i].nPlayerId, i)
end
if nSupportCharId ~= 0 and nSupportPlayerId ~= 0 then
self.tbDefine_SupportSkillBtn[i].nPlayerId = nSupportPlayerId
@@ -558,17 +558,16 @@ function BattleDashboardCtrl:Refresh(nCurPlayerId)
end
local nSkinId = PlayerCharData:GetCharSkinId(nSupportCharId)
local mapCfgData_Skin = ConfigTable.GetData_CharacterSkin(nSkinId)
local spHead = mapCfgData_Skin ~= nil and self:GetPngSprite(mapCfgData_Skin.Icon .. AllEnum.CharHeadIconSurfix.L) or nil
local img
if i == 1 then
img = self._mapNode.imgSupRole1
elseif i == 2 then
img = self._mapNode.imgSupRole2
end
local spHead = mapCfgData_Skin ~= nil and self:GetPngSprite(mapCfgData_Skin.Icon, AllEnum.CharHeadIconSurfix.L, img) or nil
NovaAPI.SetImageSpriteAsset(img, spHead)
NovaAPI.SetImageNativeSize(img)
NovaAPI.SetImageColor(img, Color(1, 1, 1, 1))
self:Add_Skill_EntityEvent(nSupportPlayerId)
self:Add_SupportSkill_EntityEvent(nSupportPlayerId, i)
AdventureModuleHelper.ForceSyncSkillBtnToLua(nSupportPlayerId)
else
self.tbDefine_SupportSkillBtn[i].skillBtnCtrl:SetEmptySkillBtn()
@@ -581,12 +580,30 @@ end
function BattleDashboardCtrl:Add_Skill_EntityEvent(nPlayerId)
EventManager.AddEntityEvent("SkillBind", nPlayerId, self, self.OnEvent_SkillBind)
EventManager.AddEntityEvent("SyncSkillBtnToLua", nPlayerId, self, self.OnEvent_SyncSkillBtnToLua)
EventManager.AddEntityEvent("SkillEnableByActionKey", nPlayerId, self, self.OnEvent_SkillEnableByActionKey)
EventManager.AddEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_SkillEnableByActionKey)
end
function BattleDashboardCtrl:Remove_Skill_EntityEvent(nPlayerId)
EventManager.RemoveEntityEvent("SkillBind", nPlayerId, self, self.OnEvent_SkillBind)
EventManager.RemoveEntityEvent("SyncSkillBtnToLua", nPlayerId, self, self.OnEvent_SyncSkillBtnToLua)
EventManager.RemoveEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_SkillUseableByActionKey)
EventManager.RemoveEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_SkillEnableByActionKey)
end
function BattleDashboardCtrl:Add_SupportSkill_EntityEvent(nPlayerId, nIdx)
EventManager.AddEntityEvent("SkillBind", nPlayerId, self, self.OnEvent_SkillBind)
EventManager.AddEntityEvent("SyncSkillBtnToLua", nPlayerId, self, self.OnEvent_SyncSkillBtnToLua)
if nIdx == 1 then
EventManager.AddEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_Support1SkillEnableByActionKey)
else
EventManager.AddEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_Support2SkillEnableByActionKey)
end
end
function BattleDashboardCtrl:Remove_SupportSkill_EntityEvent(nPlayerId, nIdx)
EventManager.RemoveEntityEvent("SkillBind", nPlayerId, self, self.OnEvent_SkillBind)
EventManager.RemoveEntityEvent("SyncSkillBtnToLua", nPlayerId, self, self.OnEvent_SyncSkillBtnToLua)
if nIdx == 1 then
EventManager.AddEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_Support1SkillEnableByActionKey)
else
EventManager.AddEntityEvent("SkillUseableByActionKey", nPlayerId, self, self.OnEvent_Support2SkillEnableByActionKey)
end
end
function BattleDashboardCtrl:OnEvent_SkillBind(nActionId, nSkillId, nCharId)
local data
@@ -678,6 +695,24 @@ function BattleDashboardCtrl:OnEvent_SkillEnableByActionKey(nActionId, bEnable)
local data = self.tbDefine_SkillBtn[nActionId]
data.skillBtnCtrl:SetBtnEnable(bEnable)
end
function BattleDashboardCtrl:OnEvent_Support1SkillEnableByActionKey(nActionId, bEnable)
if nActionId == 2 then
local data = self.tbDefine_SupportSkillBtn[1]
data.skillBtnCtrl:SetBtnEnable(bEnable)
elseif nActionId == 4 then
local data = self.tbDefine_SupportUltraBtn[1]
data.skillBtnCtrl:SetBtnEnable(bEnable)
end
end
function BattleDashboardCtrl:OnEvent_Support2SkillEnableByActionKey(nActionId, bEnable)
if nActionId == 2 then
local data = self.tbDefine_SupportSkillBtn[2]
data.skillBtnCtrl:SetBtnEnable(bEnable)
elseif nActionId == 4 then
local data = self.tbDefine_SupportUltraBtn[2]
data.skillBtnCtrl:SetBtnEnable(bEnable)
end
end
function BattleDashboardCtrl:OnBtn_ClickHand(btn)
if self.bInteractiveInCD == true then
return
lua/game/ui/battle/jointdrillbattlepanel.lua
+3 -3
View File
@@ -8,7 +8,7 @@ JointDrillBattlePanel._tbDefine = {
sCtrlName = "Game.UI.Battle.BattleDashboardCtrl"
},
{
sPrefabPath = "Play_JointDrill/JointDrillMenu.prefab",
sPrefabPath = "JointDrillBattle/JointDrillMenu.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrillMenuCtrl"
},
{
@@ -32,11 +32,11 @@ JointDrillBattlePanel._tbDefine = {
sCtrlName = "Game.UI.Battle.CommonMonsterWarningCtrl"
},
{
sPrefabPath = "Play_JointDrill/JointDrillBossTime.prefab",
sPrefabPath = "JointDrillBattle/JointDrillBossTime.prefab",
sCtrlName = "Game.UI.JointDrill.JintDrillTimeCtrl"
},
{
sPrefabPath = "Play_JointDrill/JointDrillPausePanel.prefab",
sPrefabPath = "JointDrillBattle/JointDrillPausePanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrillPauseCtrl"
}
}
lua/game/ui/battle/subskilldisplay/skilldisplayctrl.lua
+1 -1
View File
@@ -48,7 +48,7 @@ function SkillDisplayCtrl:ShowSkillTips(nSkillId, nCharId, callback)
end
local nSkinId = PlayerData.Char:GetCharSkinId(nCharId)
local mapSkin = ConfigTable.GetData_CharacterSkin(nSkinId)
self:SetPngSprite(self._mapNode.imgSubSkillIcon, mapSkin.Icon .. AllEnum.CharHeadIconSurfix.XXL)
self:SetPngSprite(self._mapNode.imgSubSkillIcon, mapSkin.Icon, AllEnum.CharHeadIconSurfix.XXL)
self.ShowEndCallback = callback
self.gameObject:SetActive(true)
self.timer = self:AddTimer(1, 1.5, "ShowEnd", true, true, true, true)
lua/game/ui/battle/tdbattlepanel.lua
+1 -1
View File
@@ -48,7 +48,7 @@ end
function TDBattlePanel:OnEnable()
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
local mapLevel = ConfigTable.GetData("TravelerDuelBossLevel", PlayerData.TravelerDuel.entryLevelId)
local mapLevel = ConfigTable.GetData("TravelerDuelBossLevel", self._tbParam[2])
if mapLevel then
local FloorId = mapLevel.FloorId
local floorData = ConfigTable.GetData("TravelerDuelFloor", FloorId)