Update - 1.9.0.103

EN: 1.9.0.103
CN: 1.9.0.104
JP: 1.9.0.106
KR: 1.9.0.108

lua/game/ui/play_breakout_30101/breakoutlevelcellctrl.lua

@@ -1,10 +1,4 @@
-local BreakOutLevelCellCtrl = class("TowerDefenseLevelCellCtrl", BaseCtrl)
-local DifficultyState = {
-	"Entry",
-	"Newbie",
-	"Advanced",
-	"Expert"
-}
+local BreakOutLevelCellCtrl = class("BreakOutLevelCellCtrl", BaseCtrl)
 BreakOutLevelCellCtrl._mapNodeConfig = {
 	txt_Name = {sComponentName = "TMP_Text"},
 	img_FinishIcon = {

lua/game/ui/play_breakout_30101/breakoutleveldetailctr.lua

@@ -167,9 +167,6 @@ function BreakOutLevelDetailCtr:OnEnable()
 	self.bOpenTransition = false
 end
 function BreakOutLevelDetailCtr:OnDisable()
-	if self._panel.bList then
-		self._mapNode.CharList:SyncFormation()
-	end
 	local sSceneName = ConfigTable.GetData("BreakOutControl", self.nActId).SceneName
 	local callback1 = function()
 		EventManager.Hit(EventId.SetTransition)
@@ -310,7 +307,7 @@ function BreakOutLevelDetailCtr:LoadCharacter(nCharId, nCharNid, bOpen)
 		return
 	end
 	local CharacterSkinOverlapData = ConfigTable.GetData("CharacterSkinOverlap", mapSkin.CharId)
-	if not mapSkin then
+	if not CharacterSkinOverlapData then
 		printLog("CharacterSkinOverlap" .. nCharId)
 		return
 	end

lua/game/ui/play_breakout_30101/breakoutplayctrl.lua

@@ -226,20 +226,7 @@ function BreakOutPlayCtrl:OnEvent_FinishGame(nResult)
 		end
 		self:OpenBreakOutResultPanel(bResult, cb, mapChangeInfo)
 	end
-	local UseTime = self.FloorData.Time - self.nEndTime
-	local arrayData = {
-		ActivityId = self.nActId,
-		LevelId = self.nLevelId,
-		Seconds = UseTime,
-		MonsterDefeatCount = self.nKillMonster,
-		Win = bResult,
-		CharId = self.nCharacterNid,
-		Count = self.nBreakBricks,
-		RemainHP = self.nRemainHp,
-		Score = self.nCurrentScore,
-		DropCollect = self.tbDropCollect
-	}
-	self.BreakOutData:RequestFinishLevel(arrayData, requestCb)
+	self.BreakOutData:RequestFinishLevel(self:BuildFinishData(bResult), requestCb)
 	EventManager.Hit("Close_BattlePause")
 end
 function BreakOutPlayCtrl:OnEvent_Exit()
@@ -259,20 +246,7 @@ function BreakOutPlayCtrl:OnEvent_Exit()
 			end
 			self:OpenBreakOutResultPanel(false, cb, mapChangeInfo)
 		end
-		local UseTime = self.FloorData.Time - self.nEndTime
-		local arrayData = {
-			ActivityId = self.nActId,
-			LevelId = self.nLevelId,
-			Seconds = UseTime,
-			MonsterDefeatCount = self.nKillMonster,
-			Win = false,
-			CharId = self.nCharacterNid,
-			Count = self.nBreakBricks,
-			RemainHP = self.nRemainHp,
-			Score = self.nCurrentScore,
-			DropCollect = self.tbDropCollect
-		}
-		self.BreakOutData:RequestFinishLevel(arrayData, requestCb)
+		self.BreakOutData:RequestFinishLevel(self:BuildFinishData(false), requestCb)
 	end
 	local sTip = ConfigTable.GetUIText("TowerDef_Exit_Confirm")
 	local msg = {
@@ -348,4 +322,18 @@ function BreakOutPlayCtrl:OnBtnClick_OpenDic()
 	self:PauseLogic()
 	EventManager.Hit(EventId.OpenPanel, PanelId.DictionaryEntry, self.nDicId, true)
 end
+function BreakOutPlayCtrl:BuildFinishData(bWin)
+	return {
+		ActivityId = self.nActId,
+		LevelId = self.nLevelId,
+		Seconds = self.FloorData.Time - self.nEndTime,
+		MonsterDefeatCount = self.nKillMonster,
+		Win = bWin,
+		CharId = self.nCharacterNid,
+		Count = self.nBreakBricks,
+		RemainHP = self.nRemainHp,
+		Score = self.nCurrentScore,
+		DropCollect = self.tbDropCollect
+	}
+end
 return BreakOutPlayCtrl

lua/game/ui/play_breakout_30101/breakoutplaypanel.lua

@@ -1,4 +1,4 @@
-local BreakOutPlayPanel = class("TowerDefensePanel", BasePanel)
+local BreakOutPlayPanel = class("BreakOutPlayPanel", BasePanel)
 BreakOutPlayPanel._bIsMainPanel = true
 BreakOutPlayPanel._sSortingLayerName = AllEnum.SortingLayerName.UI
 local GamepadUIManager = require("GameCore.Module.GamepadUIManager")

lua/game/ui/play_breakout_30101/breakoutplayskillctrl.lua

@@ -33,7 +33,7 @@ local SKILL_SHOOT = 1
 local SKILL_ULTRA = 4
 BreakOutPlaySkillCtrl._mapEventConfig = {
 	LoadLevelRefresh = "OnEvent_LoadLevelRefresh",
-	PlayerAdventureActorCastSkill = "OnEvent_UseSkillSucc",
+	PlayerAdventureActorCastSkill = "OnEvent_UseSkillSuc",
 	ButtonStateChange = "OnEvent_BtnStateChange",
 	SetVariableJoystickMode = "OnEvent_SetVariableJoystickMode",
 	BrickActorEnergy = "OnEvent_RefreshSkillState",
@@ -63,7 +63,12 @@ function BreakOutPlaySkillCtrl:Awake()
 			nHoldThreshold = 0.1
 		}
 	}
-	if self.bIsRegister == nil or not self.bIsRegister and NovaAPI.IsMobilePlatform() or NovaAPI.IsEditorPlatform() then
+	self.nCurPlayerId = nil
+	self.skillTipTime = 0
+	self.dodgeTipTime = 0
+end
+function BreakOutPlaySkillCtrl:OnEnable()
+	if NovaAPI.IsMobilePlatform() or NovaAPI.IsEditorPlatform() then
 		self._mapNode.goJoystick:SetActive(true)
 		NovaAPI.RegisterVirtualJoystick("Horizontal", "Vertical", self._mapNode.goJoystick)
 	else
@@ -72,35 +77,23 @@ function BreakOutPlaySkillCtrl:Awake()
 	local nW = math.floor(Settings.CURRENT_CANVAS_FULL_RECT_WIDTH)
 	local nH = math.floor(Settings.CURRENT_CANVAS_FULL_RECT_HEIGHT)
 	self._mapNode.rtJoystick.sizeDelta = Vector2(nW / 2, nH * 2 / 3)
-	if self.bIsRegister == nil or not self.bIsRegister then
-		for nIndex, v in ipairs(self.tbDefine_BreakOutPlayBtn) do
-			NovaAPI.RegisterRealButton(v.sName, v.nHoldThreshold)
-			local go = v.BreakOutSkillBtnCtrl ~= nil and v.BreakOutSkillBtnCtrl.gameObject or v.goBtn
-			NovaAPI.RegisterVirtualButton(v.sName, go)
-			NovaAPI.SetButtonExHoldThreshold(go, v.nHoldThreshold)
-		end
+	for _, v in ipairs(self.tbDefine_BreakOutPlayBtn) do
+		NovaAPI.RegisterRealButton(v.sName, v.nHoldThreshold)
+		local go = v.BreakOutSkillBtnCtrl ~= nil and v.BreakOutSkillBtnCtrl.gameObject or v.goBtn
+		NovaAPI.RegisterVirtualButton(v.sName, go)
+		NovaAPI.SetButtonExHoldThreshold(go, v.nHoldThreshold)
 	end
-	self.nCurPlayerId = nil
-	if self.bIsRegister == nil or not self.bIsRegister then
-		self:SetKeyLayout()
-		self:SetActionBind()
-	end
-	self.skillTipTime = 0
-	self.dodgeTipTime = 0
-	self.bIsRegister = true
-end
-function BreakOutPlaySkillCtrl:OnEnable()
+	self:SetKeyLayout()
+	self:SetActionBind()
 	self:Refresh()
 	self:OnEvent_BreakOutPlaySkillVisible(false)
 end
 function BreakOutPlaySkillCtrl:OnDisable()
 	NovaAPI.UnRegisterVirtualJoystick("Horizontal", "Vertical")
-	for nIndex, v in ipairs(self.tbDefine_BreakOutPlayBtn) do
+	for _, v in ipairs(self.tbDefine_BreakOutPlayBtn) do
 		NovaAPI.UnRegisterRealButton(v.sName)
 		NovaAPI.UnRegisterVirtualButton(v.sName)
 	end
-	self.tbDefine_BreakOutPlayBtn = nil
-	self.bIsRegister = false
 end
 function BreakOutPlaySkillCtrl:SetKeyLayout()
 	self:SetKeyPos(self._mapNode.break_Skill.gameObject:GetComponent("RectTransform"), self._mapNode.Skill_Pos)
@@ -121,8 +114,8 @@ function BreakOutPlaySkillCtrl:OnEvent_LoadLevelRefresh()
 	end
 	cs_coroutine.start(wait)
 end
-function BreakOutPlaySkillCtrl:OnEvent_UseSkillSucc(nCharId, nSkillId)
-	for i, v in ipairs(self.tbDefine_SkillBtn) do
+function BreakOutPlaySkillCtrl:OnEvent_UseSkillSuc(nCharId, nSkillId)
+	for i, v in ipairs(self.tbDefine_BreakOutPlayBtn) do
 		if v.nCharId == nCharId and v.nSkillId == nSkillId and v.BreakOutSkillBtnCtrl ~= nil then
 			v.BreakOutSkillBtnCtrl:SetMainAlpha(false)
 		end
@@ -180,16 +173,6 @@ function BreakOutPlaySkillCtrl:OnEvent_ClearState()
 		breakOutSkillBtnCtrl:RefreshSkillBtn(0.0, nMaxSkillEnergy, 0.0, nTotalCDTime)
 	end
 end
-function BreakOutPlaySkillCtrl:OnEvent_BtnStateChandge(sBtnName, nBtnState)
-	local func_CheckBtnState = function(tb)
-		for i, v in ipairs(tb) do
-			if v.sName == sBtnName and v.BreakOutSkillBtnCtrl ~= nil then
-				v.BreakOutSkillBtnCtrl:BtnStateChange(nBtnState)
-			end
-		end
-	end
-	func_CheckBtnState(self.tbDefine_SkillBtn)
-end
 function BreakOutPlaySkillCtrl:SetActionBind()
 	local set = function(config)
 		local bHas, tbControl = InputManagerIns:GetInputActionConfig(config.sName)
@@ -221,24 +204,6 @@ function BreakOutPlaySkillCtrl:EnableBtnControl()
 		NovaAPI.SetRealButtonActive(v.sName, true)
 	end
 end
-function BreakOutPlaySkillCtrl:OnEvent_ExecuteRealButton(key)
-	if key == "A" then
-		local bEnable = NovaAPI.IsInputEnabled()
-		if bEnable == false then
-			return
-		end
-		if self.tbDefine_SkillBtn and self.tbDefine_SkillBtn[1].BreakOutSkillBtnCtrl.bInCD == false then
-			local nUIType = GamepadUIManager.GetCurUIType()
-			if nUIType == AllEnum.GamepadUIType.Keyboard then
-				EventManager.Hit("Upload_Dodge_Event", "Keyboard")
-			elseif nUIType == AllEnum.GamepadUIType.Mouse then
-				EventManager.Hit("Upload_Dodge_Event", "Mouse")
-			else
-				EventManager.Hit("Upload_Dodge_Event", "Other")
-			end
-		end
-	end
-end
 function BreakOutPlaySkillCtrl:OnEvent_SetVariableJoystickMode()
 	if not NovaAPI.IsMobilePlatform() then
 		return

lua/game/ui/play_breakout_30101/breakoutresultctrl.lua

@@ -88,7 +88,6 @@ function BreakOutResultCtrl:BreakOut_Button_Restart()
 	EventManager.Hit("Close_BattlePause")
 	self:Close()
 	EventManager.Hit("SetPlayFinishState", false)
-	EventManager.Hit("SetBreakOutPlaySkill_Visible", true)
 	EventManager.Hit("SetBreakOutPlaySkill_Visible", false)
 	NovaAPI.DispatchEventWithData("BreakOut_InRestart", nil, {true})
 	EventManager.Hit("BreakOut_Complete", false)

lua/game/ui/play_breakout_30101/breakoutskillbtnctrl.lua

@@ -146,7 +146,6 @@ function BreakOutSkillBtnCtrl:RefreshSkillBtn(nCurSkillEnergy, nMaxSkillEnergy,
 	local ChargePercent = nCurSkillEnergy / nMaxSkillEnergy
 	local bCanUse = false
 	bCanUse = nMaxSkillEnergy <= nCurSkillEnergy and nCurCDTime <= 0
-	self._mapNode.TMP_Charge.gameObject:SetActive(false)
 	self._mapNode.TMP_Charge.gameObject:SetActive(self.bShowSection)
 	local sAnimName, sFxSoundName
 	if self.bCanUse == true then