Update - 1.3.0.69

EN: 1.3.0.69
CN: 1.3.0.70
JP: 1.3.0.72
KR: 1.3.0.76

lua/game/ui/startowerfastbattle/startowerfastbattlectrl.lua

@@ -123,7 +123,8 @@ StarTowerFastBattleCtrl._mapEventConfig = {
 	[EventId.StarTowerDepot] = "OnEvent_OpenStarTowerDepot",
 	RefreshNoteCount = "OnEvent_RefreshNoteCount",
 	TryCloseStarTowerLastShop = "OnEvent_TryCloseStarTowerLastShop",
-	ShowNPCAffinity = "OnEvent_AffinityTips"
+	ShowNPCAffinity = "OnEvent_AffinityTips",
+	LeaveStarTowerFastBattle = "OnEvent_Leave"
 }
 StarTowerFastBattleCtrl._mapRedDotConfig = {}
 local theme_sprite_path = "UI/big_sprites/"
@@ -388,33 +389,16 @@ function StarTowerFastBattleCtrl:GetTeamNeedExpByLevel(nGroupId, nLevel)
 	end
 	return nNeedExp, bMaxLevel
 end
-function StarTowerFastBattleCtrl:OnHandleCasesOver()
-	local CurHandleCasesOver = function()
-		self.bOpenOption = false
-		self.Animator:Play("StarTowerFastBattlePanel_idle")
-		if self.bAuto and not self.bPause then
-			self:EnterRoom()
-		end
-	end
-	local bShop, bMachine, nMachineCount, nDiscount, bFirstFree = self._panel.LevelData:GetShopAndMachine()
-	if bShop or bMachine then
-		self.bOpenOption = true
-		local bLastShopRoom = self._panel.LevelData:CheckLastShopRoom()
-		EventManager.Hit(EventId.OpenPanel, PanelId.StarTowerFastBattleOption, bShop, bMachine, nMachineCount, self._panel.LevelData._mapItem[AllEnum.CoinItemId.FixedRogCurrency], CurHandleCasesOver, nDiscount, bFirstFree, bLastShopRoom)
-	else
-		CurHandleCasesOver()
-	end
-end
-function StarTowerFastBattleCtrl:OnBackButtonClick()
-	if not self.bHandleOver then
-		return
-	end
+function StarTowerFastBattleCtrl:LeaveStarTower(callback)
 	local msg = {
 		nType = AllEnum.MessageBox.Confirm,
 		sContent = ConfigTable.GetUIText("StarTower_Sweep_BackTips_Content"),
 		sConfirm = ConfigTable.GetUIText("StarTower_Sweep_Leave_Btn"),
 		sCancel = ConfigTable.GetUIText("StarTower_Sweep_GiveUp_Btn"),
 		callbackConfirm = function()
+			if callback ~= nil then
+				callback()
+			end
 			self._panel.LevelData:StarTowerLeave()
 			PanelManager.Home()
 		end,
@@ -424,6 +408,9 @@ function StarTowerFastBattleCtrl:OnBackButtonClick()
 				PlayerData.StarTower:GiveUpReconnect(mapStarTowerState.Id, mapStarTowerState.CharIds, false, function()
 					local wait = function()
 						coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
+						if callback ~= nil then
+							callback()
+						end
 						EventManager.Hit(EventId.ClosePanel, PanelId.StarTowerFastBattle)
 					end
 					cs_coroutine.start(wait)
@@ -442,6 +429,30 @@ function StarTowerFastBattleCtrl:OnBackButtonClick()
 	}
 	EventManager.Hit(EventId.OpenMessageBox, msg)
 end
+function StarTowerFastBattleCtrl:OnHandleCasesOver()
+	local CurHandleCasesOver = function()
+		self.bOpenOption = false
+		self.Animator:Play("StarTowerFastBattlePanel_idle")
+		if self.bAuto and not self.bPause then
+			self:EnterRoom()
+		end
+	end
+	local bShop, bMachine, nMachineCount, nDiscount, bFirstFree = self._panel.LevelData:GetShopAndMachine()
+	if bShop or bMachine then
+		self.bOpenOption = true
+		local bLastShopRoom = self._panel.LevelData:CheckLastShopRoom()
+		local nItemCount = self._panel.LevelData._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
+		EventManager.Hit(EventId.OpenPanel, PanelId.StarTowerFastBattleOption, bShop, bMachine, nMachineCount, nItemCount, CurHandleCasesOver, nDiscount, bFirstFree, bLastShopRoom)
+	else
+		CurHandleCasesOver()
+	end
+end
+function StarTowerFastBattleCtrl:OnBackButtonClick()
+	if not self.bHandleOver then
+		return
+	end
+	self:LeaveStarTower()
+end
 function StarTowerFastBattleCtrl:OnLogButtonClick()
 	if not self.bHandleOver then
 		return
@@ -631,4 +642,7 @@ function StarTowerFastBattleCtrl:OnEvent_AffinityTips(nNpcId, nAffinity)
 	})
 	self._mapNode.Tips:StartShowTips(tbTips)
 end
+function StarTowerFastBattleCtrl:OnEvent_Leave(callback)
+	self:LeaveStarTower(callback)
+end
 return StarTowerFastBattleCtrl

lua/game/ui/startowerfastbattle/startowerfastbattleoptionctrl.lua

@@ -4,6 +4,10 @@ StarTowerFastBattleOptionCtrl._mapNodeConfig = {
 	goBlur = {
 		sNodeName = "t_fullscreen_blur_blue"
 	},
+	trRoot = {
+		sNodeName = "----SafeAreaRoot----",
+		sComponentName = "Transform"
+	},
 	rtSelectOption = {},
 	TMP_Title = {sComponentName = "TMP_Text"},
 	rtChoose = {nCount = 5},
@@ -18,7 +22,15 @@ StarTowerFastBattleOptionCtrl._mapNodeConfig = {
 	Select = {nCount = 5},
 	goCoin = {sNodeName = "imgBg_Coin"},
 	imgCoin = {sComponentName = "Image"},
-	textCoinCount = {sComponentName = "TMP_Text"}
+	textCoinCount = {sComponentName = "TMP_Text"},
+	btnBack = {
+		sComponentName = "UIButton",
+		callback = "OnBtnClick_Back"
+	},
+	btnDepot = {
+		sComponentName = "UIButton",
+		callback = "OnBtnClick_Depot"
+	}
 }
 StarTowerFastBattleOptionCtrl._mapEventConfig = {
 	RefreshStrengthMachineCost = "OnEvent_RefreshStrengthMachineCost",
@@ -163,6 +175,18 @@ function StarTowerFastBattleOptionCtrl:OnBtnSelect_Select(btn, nIndex)
 	end
 	self.nSelectIdx = nIndex
 end
+function StarTowerFastBattleOptionCtrl:OnBtnClick_Back()
+	EventManager.Hit("LeaveStarTowerFastBattle", function()
+		self.closeCallBack = nil
+		EventManager.Hit(EventId.ClosePanel, PanelId.StarTowerFastBattleOption)
+	end)
+end
+function StarTowerFastBattleOptionCtrl:OnBtnClick_Depot()
+	EventManager.Hit("StarTowerSetButtonEnable", false, false)
+	self._mapNode.trRoot.gameObject:SetActive(false)
+	self._mapNode.goBlur.gameObject:SetActive(false)
+	EventManager.Hit(EventId.StarTowerDepot, AllEnum.StarTowerDepotTog.Potential)
+end
 function StarTowerFastBattleOptionCtrl:OnEvent_GamepadUIChange(sName, nBeforeType, nAfterType)
 	if sName ~= "StarTowerFastBattleOptionCtrl" then
 		return
@@ -185,6 +209,8 @@ function StarTowerFastBattleOptionCtrl:OnEvent_Reopen(sName)
 	if sName ~= "StarTowerFastBattleOptionCtrl" then
 		return
 	end
+	self._mapNode.goBlur.gameObject:SetActive(true)
+	self._mapNode.trRoot.gameObject:SetActive(true)
 	local nSelect = self.nSelectIdx ~= 0 and self.nSelectIdx or 3
 	GamepadUIManager.SetSelectedUI(self._mapNode.btnChoose[nSelect].gameObject)
 	self:SelectChoose()

lua/game/ui/startowerfastbattle/startowerfastbattleoptionpanel.lua

@@ -7,14 +7,17 @@ StarTowerFastBattleOptionPanel._tbDefine = {
 	}
 }
 function StarTowerFastBattleOptionPanel:Awake()
-	self.bShop = self:GetPanelParam()[1]
-	self.bMachine = self:GetPanelParam()[2]
-	self.nMachineCount = self:GetPanelParam()[3]
-	self.nCoinCount = self:GetPanelParam()[4]
-	self.closeCallback = self:GetPanelParam()[5]
-	self.nDiscount = self:GetPanelParam()[6]
-	self.bFirstFree = self:GetPanelParam()[7]
-	self.bLastFloor = self:GetPanelParam()[8]
+	local tbParams = self:GetPanelParam()
+	if type(tbParams) == "table" then
+		self.bShop = tbParams[1]
+		self.bMachine = tbParams[2]
+		self.nMachineCount = tbParams[3]
+		self.nCoinCount = tbParams[4]
+		self.closeCallback = tbParams[5]
+		self.nDiscount = tbParams[6]
+		self.bFirstFree = tbParams[7]
+		self.bLastFloor = tbParams[8]
+	end
 end
 function StarTowerFastBattleOptionPanel:OnEnable()
 end