Hotfix - 1.7.0.93

EN: 1.7.0.93
CN: 1.7.0.95
JP: 1.7.0.96
KR: 1.7.0.99
This commit is contained in:
SL1900
2026-03-12 23:30:00 +09:00
parent 4e310712a3
commit 2cb7557af9
9 changed files with 33 additions and 23 deletions
Binary file not shown.
+5 -5
View File
@@ -18678,15 +18678,15 @@
"JointDrillQuest.12006.1": "当期活动累计获得 39,252,000 分", "JointDrillQuest.12006.1": "当期活动累计获得 39,252,000 分",
"JointDrillQuest.12007.1": "当期活动累计获得 41,380,000 分", "JointDrillQuest.12007.1": "当期活动累计获得 41,380,000 分",
"JointDrill_2_Level.1.1": "雷霆行动", "JointDrill_2_Level.1.1": "雷霆行动",
"JointDrill_2_Level.1.2": "尔西亚·雷霆行动/普通", "JointDrill_2_Level.1.2": "尔西亚·雷霆行动/普通",
"JointDrill_2_Level.2.1": "雷霆行动", "JointDrill_2_Level.2.1": "雷霆行动",
"JointDrill_2_Level.2.2": "尔西亚·雷霆行动/困难", "JointDrill_2_Level.2.2": "尔西亚·雷霆行动/困难",
"JointDrill_2_Level.3.1": "雷霆行动", "JointDrill_2_Level.3.1": "雷霆行动",
"JointDrill_2_Level.3.2": "尔西亚·雷霆行动/超难", "JointDrill_2_Level.3.2": "尔西亚·雷霆行动/超难",
"JointDrill_2_Level.4.1": "雷霆行动", "JointDrill_2_Level.4.1": "雷霆行动",
"JointDrill_2_Level.4.2": "尔西亚·雷霆行动/终焉", "JointDrill_2_Level.4.2": "尔西亚·雷霆行动/终焉",
"JointDrill_2_Level.5.1": "雷霆行动", "JointDrill_2_Level.5.1": "雷霆行动",
"JointDrill_2_Level.5.2": "尔西亚·雷霆行动/超越", "JointDrill_2_Level.5.2": "尔西亚·雷霆行动/超越",
"JumpTo.1.1": "1-1", "JumpTo.1.1": "1-1",
"JumpTo.10.1": "暂无来源", "JumpTo.10.1": "暂无来源",
"JumpTo.11201.1": "旅人养成", "JumpTo.11201.1": "旅人养成",
+5 -5
View File
@@ -1,12 +1,12 @@
{ {
"JointDrill_2_Level.1.1": "雷霆行动", "JointDrill_2_Level.1.1": "雷霆行动",
"JointDrill_2_Level.1.2": "尔西亚·雷霆行动/普通", "JointDrill_2_Level.1.2": "尔西亚·雷霆行动/普通",
"JointDrill_2_Level.2.1": "雷霆行动", "JointDrill_2_Level.2.1": "雷霆行动",
"JointDrill_2_Level.2.2": "尔西亚·雷霆行动/困难", "JointDrill_2_Level.2.2": "尔西亚·雷霆行动/困难",
"JointDrill_2_Level.3.1": "雷霆行动", "JointDrill_2_Level.3.1": "雷霆行动",
"JointDrill_2_Level.3.2": "尔西亚·雷霆行动/超难", "JointDrill_2_Level.3.2": "尔西亚·雷霆行动/超难",
"JointDrill_2_Level.4.1": "雷霆行动", "JointDrill_2_Level.4.1": "雷霆行动",
"JointDrill_2_Level.4.2": "尔西亚·雷霆行动/终焉", "JointDrill_2_Level.4.2": "尔西亚·雷霆行动/终焉",
"JointDrill_2_Level.5.1": "雷霆行动", "JointDrill_2_Level.5.1": "雷霆行动",
"JointDrill_2_Level.5.2": "尔西亚·雷霆行动/超越" "JointDrill_2_Level.5.2": "尔西亚·雷霆行动/超越"
} }
@@ -323,7 +323,7 @@ function JointDrillLevelData_2:OnEvent_MonsterSpawn(nBossId, nCfgId, nIndex, nHp
self.initRecord = sRecord self.initRecord = sRecord
end end
NovaAPI.DispatchEventWithData("JointDrill_CacheTempData_Start", nil, { NovaAPI.DispatchEventWithData("JointDrill_CacheTempData_Start", nil, {
true, false,
true, true,
true, true,
false, false,
+3 -1
View File
@@ -460,7 +460,9 @@ function EquipmentRollCtrl:OnBtnClick_Roll(btn)
end end
if not bEnough then if not bEnough then
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Equipment_MatNotEnough_Roll")) EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Equipment_MatNotEnough_Roll"))
self._mapNode.TopBar:OnBtnClick_CoinFirstTips(self._mapNode.goCoinOther) if nHasRefresh < self.mapSlotCfg.RefreshCostQty then
self._mapNode.TopBar:OnBtnClick_CoinFirstTips(self._mapNode.goCoinOther)
end
return return
end end
local callback = function() local callback = function()
@@ -15,7 +15,8 @@ JointDrillBattleMenuCtrl._mapEventConfig = {
InputEnable = "OnEvent_InputEnable", InputEnable = "OnEvent_InputEnable",
LoadLevelRefresh = "OnEvent_LoadLevelRefresh", LoadLevelRefresh = "OnEvent_LoadLevelRefresh",
JointDrill_StopTime = "OnEvent_JointDrill_StopTime", JointDrill_StopTime = "OnEvent_JointDrill_StopTime",
JointDrill_ShowPauseBnt_Editor = "OnEvent_ShowPauseBntEditor" JointDrill_ShowPauseBnt_Editor = "OnEvent_ShowPauseBntEditor",
JointDrill_Level_TimeOut = "OnEvent_LevelTimeOut"
} }
function JointDrillBattleMenuCtrl:OnEnable() function JointDrillBattleMenuCtrl:OnEnable()
self._mapNode.BtnBg.gameObject:SetActive(false) self._mapNode.BtnBg.gameObject:SetActive(false)
@@ -38,6 +39,9 @@ end
function JointDrillBattleMenuCtrl:OnEvent_JointDrill_StopTime() function JointDrillBattleMenuCtrl:OnEvent_JointDrill_StopTime()
self._mapNode.BtnBg.gameObject:SetActive(false) self._mapNode.BtnBg.gameObject:SetActive(false)
end end
function JointDrillBattleMenuCtrl:OnEvent_LevelTimeOut()
self._mapNode.BtnBg.gameObject:SetActive(false)
end
function JointDrillBattleMenuCtrl:OnEvent_ShowPauseBntEditor() function JointDrillBattleMenuCtrl:OnEvent_ShowPauseBntEditor()
self._mapNode.BtnBg.gameObject:SetActive(true) self._mapNode.BtnBg.gameObject:SetActive(true)
self._mapNode.btnPause.gameObject:GetComponent("NaviButton").enabled = true self._mapNode.btnPause.gameObject:GetComponent("NaviButton").enabled = true
@@ -114,11 +114,11 @@ function JointDrillPauseCtrl:RefreshChallengeTime()
NovaAPI.SetTMPText(self._mapNode.txtChallengeTime, string.format("%02d:%02d", nMin, nSec)) NovaAPI.SetTMPText(self._mapNode.txtChallengeTime, string.format("%02d:%02d", nMin, nSec))
return nTime return nTime
end end
local nTime = refreshTime() self.nRemainTime = refreshTime()
if 0 < nTime then if self.nRemainTime > 0 then
self.challengeTimer = self:AddTimer(0, 1, function() self.challengeTimer = self:AddTimer(0, 1, function()
local nTime = refreshTime() self.nRemainTime = refreshTime()
if nTime <= 0 then if self.nRemainTime <= 0 then
self.challengeTimer:Cancel() self.challengeTimer:Cancel()
self.challengeTimer = nil self.challengeTimer = nil
end end
@@ -144,6 +144,9 @@ function JointDrillPauseCtrl:Refresh(nTime)
NovaAPI.SetTMPText(self._mapNode.txtBattleTime, string.format("%02d:%02d:%03d", nMin, nSec, nMs)) NovaAPI.SetTMPText(self._mapNode.txtBattleTime, string.format("%02d:%02d:%03d", nMin, nSec, nMs))
end end
function JointDrillPauseCtrl:PlayCloseAni(callback) function JointDrillPauseCtrl:PlayCloseAni(callback)
if self._mapNode == nil then
return
end
self._mapNode.aniWindow:Play("t_window_04_t_out") self._mapNode.aniWindow:Play("t_window_04_t_out")
self._mapNode.aniBlur:SetTrigger("tOut") self._mapNode.aniBlur:SetTrigger("tOut")
EventManager.Hit(EventId.TemporaryBlockInput, 0.2) EventManager.Hit(EventId.TemporaryBlockInput, 0.2)
@@ -179,6 +182,7 @@ function JointDrillPauseCtrl:Awake()
end end
function JointDrillPauseCtrl:OnEnable() function JointDrillPauseCtrl:OnEnable()
self.nOpenTime = 0 self.nOpenTime = 0
self.nRemainTime = 0
if self._panel.nType ~= nil then if self._panel.nType ~= nil then
if self._panel.nType == GameEnum.JointDrillMode.JointDrill_Mode_1 then if self._panel.nType == GameEnum.JointDrillMode.JointDrill_Mode_1 then
self.nOpenTime = PlayerData.JointDrill_1:GetJointDrillStartTime() self.nOpenTime = PlayerData.JointDrill_1:GetJointDrillStartTime()
+2 -2
View File
@@ -47,11 +47,11 @@ SettingsGamepadCtrl._mapNodeConfig = {
sComponentName = "TMP_Text", sComponentName = "TMP_Text",
sLanguageId = "Action_Move" sLanguageId = "Action_Move"
}, },
txtPS_Share = {sComponentName = "TMP_Text", sLanguageId = "Action_Map"}, txtPS_Share = {
txtPS_Options = {
sComponentName = "TMP_Text", sComponentName = "TMP_Text",
sLanguageId = "Action_Depot" sLanguageId = "Action_Depot"
}, },
txtPS_Options = {sComponentName = "TMP_Text", sLanguageId = "Action_Map"},
txtPS_AutoBattle = { txtPS_AutoBattle = {
sComponentName = "TMP_Text", sComponentName = "TMP_Text",
sLanguageId = "Action_AutoBattle" sLanguageId = "Action_AutoBattle"
+4 -4
View File
@@ -1,4 +1,4 @@
EN: 1.7.0.92 EN: 1.7.0.93
CN: 1.7.0.94 CN: 1.7.0.95
JP: 1.7.0.95 JP: 1.7.0.96
KR: 1.7.0.98 KR: 1.7.0.99