diff --git a/data/bin/penguincard.bytes b/data/bin/penguincard.bytes index 72f2f24d..d02819fa 100644 Binary files a/data/bin/penguincard.bytes and b/data/bin/penguincard.bytes differ diff --git a/data/gave_up/LanguageCommon.zh_cn.json b/data/gave_up/LanguageCommon.zh_cn.json index ab12e563..8322e456 100644 --- a/data/gave_up/LanguageCommon.zh_cn.json +++ b/data/gave_up/LanguageCommon.zh_cn.json @@ -18678,15 +18678,15 @@ "JointDrillQuest.12006.1": "当期活动累计获得 39,252,000 分", "JointDrillQuest.12007.1": "当期活动累计获得 41,380,000 分", "JointDrill_2_Level.1.1": "雷霆行动", - "JointDrill_2_Level.1.2": "塞尔西亚·雷霆行动/普通", + "JointDrill_2_Level.1.2": "赛尔西亚·雷霆行动/普通", "JointDrill_2_Level.2.1": "雷霆行动", - "JointDrill_2_Level.2.2": "塞尔西亚·雷霆行动/困难", + "JointDrill_2_Level.2.2": "赛尔西亚·雷霆行动/困难", "JointDrill_2_Level.3.1": "雷霆行动", - "JointDrill_2_Level.3.2": "塞尔西亚·雷霆行动/超难", + "JointDrill_2_Level.3.2": "赛尔西亚·雷霆行动/超难", "JointDrill_2_Level.4.1": "雷霆行动", - "JointDrill_2_Level.4.2": "塞尔西亚·雷霆行动/终焉", + "JointDrill_2_Level.4.2": "赛尔西亚·雷霆行动/终焉", "JointDrill_2_Level.5.1": "雷霆行动", - "JointDrill_2_Level.5.2": "塞尔西亚·雷霆行动/超越", + "JointDrill_2_Level.5.2": "赛尔西亚·雷霆行动/超越", "JumpTo.1.1": "1-1", "JumpTo.10.1": "暂无来源", "JumpTo.11201.1": "旅人养成", diff --git a/data/language/zh_cn/jointdrill_2_level.json b/data/language/zh_cn/jointdrill_2_level.json index 4a5fc128..31a02693 100644 --- a/data/language/zh_cn/jointdrill_2_level.json +++ b/data/language/zh_cn/jointdrill_2_level.json @@ -1,12 +1,12 @@ { "JointDrill_2_Level.1.1": "雷霆行动", - "JointDrill_2_Level.1.2": "塞尔西亚·雷霆行动/普通", + "JointDrill_2_Level.1.2": "赛尔西亚·雷霆行动/普通", "JointDrill_2_Level.2.1": "雷霆行动", - "JointDrill_2_Level.2.2": "塞尔西亚·雷霆行动/困难", + "JointDrill_2_Level.2.2": "赛尔西亚·雷霆行动/困难", "JointDrill_2_Level.3.1": "雷霆行动", - "JointDrill_2_Level.3.2": "塞尔西亚·雷霆行动/超难", + "JointDrill_2_Level.3.2": "赛尔西亚·雷霆行动/超难", "JointDrill_2_Level.4.1": "雷霆行动", - "JointDrill_2_Level.4.2": "塞尔西亚·雷霆行动/终焉", + "JointDrill_2_Level.4.2": "赛尔西亚·雷霆行动/终焉", "JointDrill_2_Level.5.1": "雷霆行动", - "JointDrill_2_Level.5.2": "塞尔西亚·雷霆行动/超越" + "JointDrill_2_Level.5.2": "赛尔西亚·雷霆行动/超越" } \ No newline at end of file diff --git a/lua/game/adventure/jointdrill/jointdrillleveldata_2.lua b/lua/game/adventure/jointdrill/jointdrillleveldata_2.lua index f7681d23..9913b668 100644 --- a/lua/game/adventure/jointdrill/jointdrillleveldata_2.lua +++ b/lua/game/adventure/jointdrill/jointdrillleveldata_2.lua @@ -323,7 +323,7 @@ function JointDrillLevelData_2:OnEvent_MonsterSpawn(nBossId, nCfgId, nIndex, nHp self.initRecord = sRecord end NovaAPI.DispatchEventWithData("JointDrill_CacheTempData_Start", nil, { - true, + false, true, true, false, diff --git a/lua/game/ui/equipment/equipmentrollctrl.lua b/lua/game/ui/equipment/equipmentrollctrl.lua index 33d3f3df..d129e7fc 100644 --- a/lua/game/ui/equipment/equipmentrollctrl.lua +++ b/lua/game/ui/equipment/equipmentrollctrl.lua @@ -460,7 +460,9 @@ function EquipmentRollCtrl:OnBtnClick_Roll(btn) end if not bEnough then 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 end local callback = function() diff --git a/lua/game/ui/jointdrill/battle/jointdrillmenuctrl.lua b/lua/game/ui/jointdrill/battle/jointdrillmenuctrl.lua index c5dff528..bfbbcc95 100644 --- a/lua/game/ui/jointdrill/battle/jointdrillmenuctrl.lua +++ b/lua/game/ui/jointdrill/battle/jointdrillmenuctrl.lua @@ -15,7 +15,8 @@ JointDrillBattleMenuCtrl._mapEventConfig = { InputEnable = "OnEvent_InputEnable", LoadLevelRefresh = "OnEvent_LoadLevelRefresh", JointDrill_StopTime = "OnEvent_JointDrill_StopTime", - JointDrill_ShowPauseBnt_Editor = "OnEvent_ShowPauseBntEditor" + JointDrill_ShowPauseBnt_Editor = "OnEvent_ShowPauseBntEditor", + JointDrill_Level_TimeOut = "OnEvent_LevelTimeOut" } function JointDrillBattleMenuCtrl:OnEnable() self._mapNode.BtnBg.gameObject:SetActive(false) @@ -38,6 +39,9 @@ end function JointDrillBattleMenuCtrl:OnEvent_JointDrill_StopTime() self._mapNode.BtnBg.gameObject:SetActive(false) end +function JointDrillBattleMenuCtrl:OnEvent_LevelTimeOut() + self._mapNode.BtnBg.gameObject:SetActive(false) +end function JointDrillBattleMenuCtrl:OnEvent_ShowPauseBntEditor() self._mapNode.BtnBg.gameObject:SetActive(true) self._mapNode.btnPause.gameObject:GetComponent("NaviButton").enabled = true diff --git a/lua/game/ui/jointdrill/battle/jointdrillpausectrl.lua b/lua/game/ui/jointdrill/battle/jointdrillpausectrl.lua index 31dd3de5..7542cbbf 100644 --- a/lua/game/ui/jointdrill/battle/jointdrillpausectrl.lua +++ b/lua/game/ui/jointdrill/battle/jointdrillpausectrl.lua @@ -114,11 +114,11 @@ function JointDrillPauseCtrl:RefreshChallengeTime() NovaAPI.SetTMPText(self._mapNode.txtChallengeTime, string.format("%02d:%02d", nMin, nSec)) return nTime end - local nTime = refreshTime() - if 0 < nTime then + self.nRemainTime = refreshTime() + if self.nRemainTime > 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