From 2cb7557af9ed93a85717e8f897f611efeafadaa3 Mon Sep 17 00:00:00 2001 From: SL1900 <43700351+SL1900@users.noreply.github.com> Date: Thu, 12 Mar 2026 23:30:00 +0900 Subject: [PATCH] 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 --- data/bin/penguincard.bytes | Bin 16207 -> 16213 bytes data/gave_up/LanguageCommon.zh_cn.json | 10 +++++----- data/language/zh_cn/jointdrill_2_level.json | 10 +++++----- .../jointdrill/jointdrillleveldata_2.lua | 2 +- lua/game/ui/equipment/equipmentrollctrl.lua | 4 +++- .../jointdrill/battle/jointdrillmenuctrl.lua | 6 +++++- .../jointdrill/battle/jointdrillpausectrl.lua | 12 ++++++++---- lua/game/ui/settings/settingsgamepadctrl.lua | 4 ++-- versions.txt | 8 ++++---- 9 files changed, 33 insertions(+), 23 deletions(-) diff --git a/data/bin/penguincard.bytes b/data/bin/penguincard.bytes index 72f2f24dc3aefe6175d22bcdac56595e823cc233..d02819fa89aff7b2595069cddbabf0ff0439351f 100644 GIT binary patch delta 191 zcmX?KceQSVr~;$u-TqDT+*9r=SfK 0 then self.challengeTimer = self:AddTimer(0, 1, function() - local nTime = refreshTime() - if nTime <= 0 then + self.nRemainTime = refreshTime() + if self.nRemainTime <= 0 then self.challengeTimer:Cancel() self.challengeTimer = nil end @@ -144,6 +144,9 @@ function JointDrillPauseCtrl:Refresh(nTime) NovaAPI.SetTMPText(self._mapNode.txtBattleTime, string.format("%02d:%02d:%03d", nMin, nSec, nMs)) end function JointDrillPauseCtrl:PlayCloseAni(callback) + if self._mapNode == nil then + return + end self._mapNode.aniWindow:Play("t_window_04_t_out") self._mapNode.aniBlur:SetTrigger("tOut") EventManager.Hit(EventId.TemporaryBlockInput, 0.2) @@ -179,6 +182,7 @@ function JointDrillPauseCtrl:Awake() end function JointDrillPauseCtrl:OnEnable() self.nOpenTime = 0 + self.nRemainTime = 0 if self._panel.nType ~= nil then if self._panel.nType == GameEnum.JointDrillMode.JointDrill_Mode_1 then self.nOpenTime = PlayerData.JointDrill_1:GetJointDrillStartTime() diff --git a/lua/game/ui/settings/settingsgamepadctrl.lua b/lua/game/ui/settings/settingsgamepadctrl.lua index c4f78405..d1404af7 100644 --- a/lua/game/ui/settings/settingsgamepadctrl.lua +++ b/lua/game/ui/settings/settingsgamepadctrl.lua @@ -47,11 +47,11 @@ SettingsGamepadCtrl._mapNodeConfig = { sComponentName = "TMP_Text", sLanguageId = "Action_Move" }, - txtPS_Share = {sComponentName = "TMP_Text", sLanguageId = "Action_Map"}, - txtPS_Options = { + txtPS_Share = { sComponentName = "TMP_Text", sLanguageId = "Action_Depot" }, + txtPS_Options = {sComponentName = "TMP_Text", sLanguageId = "Action_Map"}, txtPS_AutoBattle = { sComponentName = "TMP_Text", sLanguageId = "Action_AutoBattle" diff --git a/versions.txt b/versions.txt index 3ec40b68..45325e4b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ -EN: 1.7.0.92 -CN: 1.7.0.94 -JP: 1.7.0.95 -KR: 1.7.0.98 +EN: 1.7.0.93 +CN: 1.7.0.95 +JP: 1.7.0.96 +KR: 1.7.0.99