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

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,

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()

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

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()

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"