Update - 1.14.0.129

EN: 1.14.0.129
CN: 1.14.0.129
JP: 1.14.0.133
KR: 1.14.0.135

lua/gamecore/data/dataclass/activity/breakoutdata.lua

@@ -323,7 +323,7 @@ function BreakOutData:RequestFinishLevel(arrayData, cb)
 				cb()
 			end
 		end
-		EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS2)
+		EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS3)
 		HttpNetHandler.SendMsg(NetMsgId.Id.milkout_settle_req, mapMsg, nil, failCallback)
 		return
 	end
@@ -336,7 +336,7 @@ function BreakOutData:RequestFinishLevel(arrayData, cb)
 			FirstComplete = arrayData.Win
 		})
 	end
-	EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS2)
+	EventManager.Hit(EventId.ClosePanel, PanelId.BreakOutLevelDetailPanelS3)
 	HttpNetHandler.SendMsg(NetMsgId.Id.milkout_settle_req, mapMsg, nil, successCallback)
 end
 function BreakOutData:CreateTempData(nLevelId, bResult)

lua/gamecore/data/dataclass/activity/breakoutleveldata.lua

@@ -106,7 +106,7 @@ function BreakOutLevelData:GetIsFinishGame()
 	return self.bIsFinishGame
 end
 function BreakOutLevelData:OnEvent_AdventureModuleEnter()
-	EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutPlayPanelS2, self.nActId, self.nLevelId, self.nCharacterNid)
+	EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutPlayPanelS3, self.nActId, self.nLevelId, self.nCharacterNid)
 end
 function BreakOutLevelData:GetFloorHasDic(nFloorId)
 	local bResult = true

lua/gamecore/data/dataclass/activity/playeractivitydata.lua

@@ -356,7 +356,7 @@ function PlayerActivityData:CreateActivityGroupIns(actData)
 			actIns = OurRegiment_10101Data.new(actData)
 		elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.Dream_10102 then
 			actIns = Dream_10102Data.new(actData)
-		elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30101 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30102 then
+		elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30101 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30102 or actCfg.ActivityThemeType == GameEnum.activityThemeType.BreakOut_30103 then
 			actIns = BreakOut_30101Data.new(actData)
 		elseif actCfg.ActivityThemeType == GameEnum.activityThemeType.Christmas_20101 then
 			actIns = Christmas_20101Data.new(actData)

lua/gamecore/data/dataclass/activity/throwgiftdata.lua

@@ -78,7 +78,7 @@ function ThrowGiftData:GetLevelNewStateInternal(nLevelId)
 		return false
 	end
 	local nOpenTime = self:GetActOpenTime()
-	if mapLevelCfgData.DayOpen ~= 0 and mapLevelCfgData.DayOpen ~= nil and nOpenTime ~= 0 then
+	if nOpenTime ~= 0 then
 		local nServerTimeStamp = CS.ClientManager.Instance.serverTimeStamp
 		local nUnlockTime = mapLevelCfgData.DayOpen * 86400 + nOpenTime
 		if nUnlockTime - nServerTimeStamp <= 0 then

lua/gamecore/data/dataclass/playerbasedata.lua

@@ -361,23 +361,26 @@ function PlayerBaseData:GetPlayerAvgId()
 	return sName
 end
 function PlayerBaseData:HandleEnergyTimer()
+	if self._mapEnergyTimer ~= nil then
+		self._mapEnergyTimer:Cancel(nil)
+	end
 	if self._nCurEnergy < ConfigTable.GetConfigNumber("EnergyMaxLimit") then
 		self._nCurEnergy = self._nCurEnergy + 1
-		local nEnergyGain = ConfigTable.GetConfigNumber("EnergyGain") * 60
-		self._nEnergyTime = nEnergyGain + CS.ClientManager.Instance.serverTimeStamp
-		if self._mapEnergyTimer ~= nil then
-			self._mapEnergyTimer:Cancel(nil)
+		if self._mapEnergyBatteryTimer ~= nil then
+			self._mapEnergyBatteryTimer:Cancel(nil)
+		end
+		if self._nCurEnergy < ConfigTable.GetConfigNumber("EnergyMaxLimit") then
+			local nEnergyGain = ConfigTable.GetConfigNumber("EnergyGain") * 60
+			self._nEnergyTime = nEnergyGain + CS.ClientManager.Instance.serverTimeStamp
+			self._mapEnergyTimer = TimerManager.Add(1, nEnergyGain, self, self.HandleEnergyTimer, true, true, false)
+		elseif self._nCurEnergyBattery < ConfigTable.GetConfigNumber("EnergyBatteryMax") then
+			local nEnergyBatteryGain = ConfigTable.GetConfigNumber("EnergyBatteryGain") * 60
+			self._nEnergyBatteryTime = nEnergyBatteryGain + CS.ClientManager.Instance.serverTimeStamp
+			self._mapEnergyBatteryTimer = TimerManager.Add(1, nEnergyBatteryGain, self, self.HandleEnergyBatteryTimer, true, true, false)
 		end
-		self._mapEnergyTimer = TimerManager.Add(1, nEnergyGain, self, self.HandleEnergyTimer, true, true, false)
 		EventManager.Hit(EventId.UpdateEnergy)
-		if self._nCurEnergy >= ConfigTable.GetConfigNumber("EnergyMaxLimit") then
-			self:HandleEnergyBatteryTimer()
-		end
 	else
 		self._nEnergyTime = 0
-		if self._mapEnergyTimer ~= nil then
-			self._mapEnergyTimer:Cancel(nil)
-		end
 	end
 end
 function PlayerBaseData:HandleEnergyBatteryTimer()
@@ -1071,27 +1074,17 @@ function PlayerBaseData:SendEnergyInfoReq()
 			local nServerTime = CS.ClientManager.Instance.serverTimeStamp
 			self._nEnergyTime = msgData.IsPrimary == true and msgData.NextDuration + nServerTime or 0
 			self._nEnergyBatteryTime = msgData.IsPrimary == true and 0 or msgData.NextDuration + nServerTime
-			if msgData.NextDuration == 0 then
-				if self._mapEnergyTimer ~= nil then
-					self._mapEnergyTimer:Cancel()
-					self._mapEnergyTimer = nil
-				end
-				if self._mapEnergyBatteryTimer ~= nil then
-					self._mapEnergyBatteryTimer:Cancel()
-					self._mapEnergyBatteryTimer = nil
-				end
+			if self._mapEnergyTimer ~= nil then
+				self._mapEnergyTimer:Cancel()
+				self._mapEnergyTimer = nil
 			end
-			if msgData.IsPrimary == false then
-				if self._mapEnergyBatteryTimer ~= nil then
-					self._mapEnergyBatteryTimer:Cancel()
-					self._mapEnergyBatteryTimer = nil
-				end
+			if self._mapEnergyBatteryTimer ~= nil then
+				self._mapEnergyBatteryTimer:Cancel()
+				self._mapEnergyBatteryTimer = nil
+			end
+			if msgData.IsPrimary == false and msgData.NextDuration > 0 then
 				self._mapEnergyBatteryTimer = TimerManager.Add(1, msgData.NextDuration, self, self.HandleEnergyBatteryTimer, true, true, false)
-			else
-				if self._mapEnergyTimer ~= nil then
-					self._mapEnergyTimer:Cancel()
-					self._mapEnergyTimer = nil
-				end
+			elseif msgData.NextDuration > 0 then
 				self._mapEnergyTimer = TimerManager.Add(1, msgData.NextDuration, self, self.HandleEnergyTimer, true, true, false)
 			end
 			EventManager.Hit(EventId.UpdateEnergyBattery)

lua/gamecore/data/dataclass/playerequipmentdataex.lua

@@ -407,7 +407,7 @@ function PlayerEquipmentData:SendCharGemGenerateReq(nCharId, nSlotId, nGemIndex,
 	local successCallback = function(_, mapMainData)
 		local nGemId = self:GetGemIdBySlot(nCharId, nSlotId)
 		local equipmentData = EquipmentData.new(mapMainData.CharGem, nCharId, nGemId)
-		self.tbCharEquipment[nCharId][nSlotId][nGemIndex] = equipmentData
+		table.insert(self.tbCharEquipment[nCharId][nSlotId], equipmentData)
 		if callback then
 			callback()
 		end

lua/gamecore/data/dataclass/playertracehuntdata.lua

@@ -193,7 +193,9 @@ function PlayerTraceHuntData:CacheTraceHuntInfo(mapTraceHuntInfo)
 	self:UpdateControlData()
 	self:UpdateLevel(mapTraceHuntInfo.Level, mapTraceHuntInfo.Exp)
 	self:SetSelBuildId(mapTraceHuntInfo.BuildID)
-	self:UpdateBossRewardRedDot(self.nHuntProgress >= self.nMaxHuntProgress)
+	local bComplete = self:CheckHuntComplete()
+	local bInterrupt = self:CheckHuntInterrupt()
+	self:UpdateBossRewardRedDot(bComplete or bInterrupt)
 	if NovaAPI.IsEditorPlatform() then
 		printLog("TraceHunt 赛季id：" .. "  " .. mapTraceHuntInfo.ControlID)
 		printLog("TraceHunt Boss id：" .. "  " .. mapTraceHuntInfo.BossID)
@@ -630,7 +632,9 @@ function PlayerTraceHuntData:SendTraceHuntSettleReq(nBossId, callback)
 					self.nBossCreateTime = mapMainData.BossCreateTime
 					self:SetHuntTimer()
 				end
-				self:UpdateBossRewardRedDot(self.nHuntProgress >= self.nMaxHuntProgress)
+				local bComplete = self:CheckHuntComplete()
+				local bInterrupt = self:CheckHuntInterrupt()
+				self:UpdateBossRewardRedDot(bComplete or bInterrupt)
 			else
 				self:UpdateBossCollection(nBossId, 0, 1)
 				self.bRefreshHelpCD = false