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/gamecore/common/allenum.lua

@@ -1391,8 +1391,8 @@ AllEnum.ShopCondSource = {
 	MallPackage = 4
 }
 AllEnum.AnnType = {
-	SystemAnn = 1,
-	ActivityAnn = 2,
+	ActivityAnn = 1,
+	SystemAnn = 2,
 	Other1 = 3,
 	Other2 = 4
 }

lua/gamecore/data/dataclass/activity/mininggamedata.lua

@@ -245,6 +245,7 @@ function MiningGameData:ResponseLevelData(msgData, callback)
 end
 function MiningGameData:DoEnterResult()
 	self:DoResult(self.tbCurlevelEnterChange)
+	self.tbCurlevelEnterChange = nil
 end
 function MiningGameData:DoResult(changeInfo)
 	if changeInfo == nil then

lua/gamecore/data/dataclass/avgdata.lua

@@ -692,7 +692,7 @@ function AvgData:SendMsg_STORY_ENTER(nStoryId, nBuildId, bNewestStory)
 				end
 			end
 			printLog("进AVG演出了 " .. mapCfgData_Story.AvgLuaName)
-			EventManager.Add("StoryDialog_DialogEnd", self, self.OnEvent_AvgSTEnd)
+			EventManager.Add("AvgSTEnd", self, self.OnEvent_AvgSTEnd)
 			EventManager.Hit("StoryDialog_DialogStart", mapCfgData_Story.AvgLuaName, nil, nil, nil, nil, mapCfgData_Story.AvgMotion)
 		end
 	end
@@ -911,8 +911,8 @@ function AvgData:OnEvent_AvgSTEnd()
 		self.mapTempPersonalityFactor = {}
 		return
 	end
+	EventManager.Remove("AvgSTEnd", self, self.OnEvent_AvgSTEnd)
 	self:SendMsg_STORY_DONE()
-	EventManager.Remove("StoryDialog_DialogEnd", self, self.OnEvent_AvgSTEnd)
 end
 function AvgData:LevelEnd()
 	PlayerData.Build:DeleteTrialBuild()

lua/gamecore/data/dataclass/gameannouncementdata.lua

@@ -1,37 +1,5 @@
 local GameAnnouncementData = class("GameAnnouncementData")
 local LocalData = require("GameCore.Data.LocalData")
-local AnnServerChannel_CN = {
-	[1] = "cn_android_official",
-	[2] = "cn_ios_official",
-	[4] = "cn_android_bilibili",
-	[8] = "cn_harmony_official",
-	[16] = "cn_pc_official",
-	[32] = "cn_pc_bilibili"
-}
-local AnnServerChannel_JP = {
-	[1] = "jp_android_official",
-	[2] = "jp_ios_official",
-	[4] = "jp_android_onestore",
-	[8] = "jp_pc_official"
-}
-local AnnServerChannel_US = {
-	[1] = "us_android_official",
-	[2] = "us_ios_official",
-	[4] = "us_android_onestore",
-	[8] = "us_pc_official"
-}
-local AnnServerChannel_KR = {
-	[1] = "kr_android_official",
-	[2] = "kr_ios_official",
-	[4] = "kr_android_onestore",
-	[8] = "kr_pc_official"
-}
-local AnnServerChannel_TW = {
-	[1] = "tw_android_official",
-	[2] = "tw_ios_official",
-	[4] = "tw_android_onestore",
-	[8] = "tw_pc_official"
-}
 local htmlConfigId = 1
 function GameAnnouncementData:ctor()
 end
@@ -153,33 +121,6 @@ function GameAnnouncementData:AllAnnResponse(listData)
 	self.tbTypeList = {}
 	self.tbAnnContentCache = {}
 	self.tbCurAnnList = {}
-	for i = 0, listData.System.Length - 1 do
-		local v = listData.System[i]
-		if UTILS.CheckChannelList(v.Channel) and v.ContentUrl ~= "" then
-			self.tbAnnBaseInfo[v.Id] = {
-				info = v,
-				nType = AllEnum.AnnType.SystemAnn
-			}
-			if self.tbTypeList[AllEnum.AnnType.SystemAnn] == nil then
-				local list = {}
-				table.insert(list, v)
-				self.tbTypeList[AllEnum.AnnType.SystemAnn] = list
-			else
-				table.insert(self.tbTypeList[AllEnum.AnnType.SystemAnn], v)
-			end
-			local bIsRead = false
-			if LocalData.GetLocalData("AnnouncementIsRead", tostring(v.Id)) == nil then
-				bIsRead = false
-			else
-				bIsRead = LocalData.GetLocalData("AnnouncementIsRead", tostring(v.Id))
-			end
-			RedDotManager.SetValid(RedDotDefine.Announcement_Content, {
-				AllEnum.AnnType.SystemAnn,
-				v.Id
-			}, not bIsRead)
-			table.insert(self.tbCurAnnList, v.Id)
-		end
-	end
 	for i = 0, listData.Activity.Length - 1 do
 		local v = listData.Activity[i]
 		if UTILS.CheckChannelList(v.Channel) and v.ContentUrl ~= "" then
@@ -207,6 +148,33 @@ function GameAnnouncementData:AllAnnResponse(listData)
 		end
 		table.insert(self.tbCurAnnList, v.Id)
 	end
+	for i = 0, listData.System.Length - 1 do
+		local v = listData.System[i]
+		if UTILS.CheckChannelList(v.Channel) and v.ContentUrl ~= "" then
+			self.tbAnnBaseInfo[v.Id] = {
+				info = v,
+				nType = AllEnum.AnnType.SystemAnn
+			}
+			if self.tbTypeList[AllEnum.AnnType.SystemAnn] == nil then
+				local list = {}
+				table.insert(list, v)
+				self.tbTypeList[AllEnum.AnnType.SystemAnn] = list
+			else
+				table.insert(self.tbTypeList[AllEnum.AnnType.SystemAnn], v)
+			end
+			local bIsRead = false
+			if LocalData.GetLocalData("AnnouncementIsRead", tostring(v.Id)) == nil then
+				bIsRead = false
+			else
+				bIsRead = LocalData.GetLocalData("AnnouncementIsRead", tostring(v.Id))
+			end
+			RedDotManager.SetValid(RedDotDefine.Announcement_Content, {
+				AllEnum.AnnType.SystemAnn,
+				v.Id
+			}, not bIsRead)
+			table.insert(self.tbCurAnnList, v.Id)
+		end
+	end
 	for i = 0, listData.Other1.Length - 1 do
 		local v = listData.Other1[i]
 		if UTILS.CheckChannelList(v.Channel) and v.ContentUrl ~= "" then

lua/gamecore/data/dataclass/playerbasedata.lua

@@ -50,6 +50,7 @@ function PlayerBaseData:Init()
 	self._tbHonorTitleList = nil
 	self._nSendGiftCnt = 0
 	self._nRenameTime = 0
+	self._sDestoryUrl = ""
 	self._bWorldClassChange = false
 	self.bNewDay = false
 	self.bNeedHotfix = false
@@ -930,6 +931,20 @@ function PlayerBaseData:SendPlayerHonorTitleEditReq(tbhonorTitle, callback)
 	end
 	HttpNetHandler.SendMsg(NetMsgId.Id.player_honor_edit_req, msgData, nil, successCallback)
 end
+function PlayerBaseData:GetDestoryUrl()
+	return self._sDestoryUrl
+end
+function PlayerBaseData:SetDestoryUrl(sUrl)
+	self._sDestoryUrl = sUrl
+end
+function PlayerBaseData:RequestDestoryUrl(cb)
+	local callback = function(_, msgData)
+		if cb ~= nil then
+			cb(self._sDestoryUrl)
+		end
+	end
+	HttpNetHandler.SendMsg(NetMsgId.Id.player_destroy_req, {}, nil, callback)
+end
 function PlayerBaseData:OnNewDay()
 	self._nBuyEnergyCount = 0
 	self._nSendGiftCnt = 0

lua/gamecore/data/dataclass/playergachadata.lua

@@ -316,6 +316,7 @@ function PlayerGachaData:GetPoolProbData(nPoolId)
 	else
 		local probUpItem, probItem = self:GetPoolProbDetail(nPoolId)
 		self._mapPoolProbCache[nPoolId] = {tbProbUpItem = probUpItem, tbProbItem = probItem}
+		return self._mapPoolProbCache[nPoolId]
 	end
 end
 function PlayerGachaData:GetPoolProbDetail(nPoolID)

lua/gamecore/data/dataclass/playerstartowerdata.lua

@@ -19,6 +19,7 @@ function PlayerStarTowerData:Init()
 	self:InitConfig()
 	self.tbPassedId = {}
 	self.bPotentialDescSimple = nil
+	self.mapGroupFormation = {}
 	self.mapNpcAffinityGroupMaxLevel = {}
 	local forEachAffinityLevel = function(mapData)
 		if self.mapNpcAffinityGroupMaxLevel[mapData.AffinityGroupId] == nil then
@@ -52,6 +53,10 @@ function PlayerStarTowerData:EnterTower(nTowerId, nTeamIdx, tbDisc)
 	local stRoomMeta = CS.Lua2CSharpInfo_FixedRoguelike(nTowerId, nStageId, {}, tbTeam, tbCharSkinId, 0, "", 0, -1, false, 0)
 	local curMapId, nFloorId, sExdata, scenePrefabId = safe_call_cs_func2(CS.AdventureModuleHelper.RandomStarTowerMap, stRoomMeta)
 	local applyCallback = function(_, mapMsgData)
+		local mapStartowerCfg = ConfigTable.GetData("StarTower", nTowerId)
+		if mapStartowerCfg ~= nil then
+			self.mapGroupFormation[mapStartowerCfg.GroupId] = nTeamIdx
+		end
 		local mapStateInfo = {
 			Id = nTowerId,
 			ReConnection = 0,
@@ -397,6 +402,17 @@ function PlayerStarTowerData:CacheOnePassedId(passedId)
 		table.insert(self.tbPassedId, passedId)
 	end
 end
+function PlayerStarTowerData:CacheFormationInfo(tbData)
+	for _, mapFormation in ipairs(tbData) do
+		self.mapGroupFormation[mapFormation.GroupId] = mapFormation.Number
+	end
+end
+function PlayerStarTowerData:GetGroupFormation(nGroupId)
+	if self.mapGroupFormation[nGroupId] ~= nil then
+		return self.mapGroupFormation[nGroupId]
+	end
+	return 0
+end
 function PlayerStarTowerData:GetFirstPassReward(nLevelId)
 	local mapLevelCfgData = ConfigTable.GetData("StarTower", nLevelId)
 	if mapLevelCfgData == nil then

lua/gamecore/data/dataclass/playerteamdata.lua

@@ -53,6 +53,9 @@ function PlayerTeamData:CacheFormationInfo(mapData)
 			end
 		end
 	end
+	if mapData.Record ~= nil then
+		PlayerData.StarTower:CacheFormationInfo(mapData.Record)
+	end
 end
 function PlayerTeamData:UpdateFormationInfo(nTeamId, tbCharIds, tbDiscIds, callback)
 	local PlayerFormationReq = {}

lua/gamecore/data/dataclass/tutorial/tutorialleveldata.lua

@@ -59,6 +59,7 @@ function TutorialLevelData:FinishLevel(result)
 	local tbCharId = self:GetCharList() or {}
 	if not result then
 		EventManager.Hit(EventId.OpenPanel, PanelId.TutorialResult, 2, self.nlevelId, {}, nCurQuestCount, nMaxQuestCount, tbCharId, {}, false)
+		PlayerData.Build:DeleteTrialBuild()
 	else
 		local tbSkin = {}
 		for _, nCharId in ipairs(self.tbCharId) do

lua/gamecore/module/avgmanager.lua

@@ -58,6 +58,9 @@ local OnEvent_AvgSTStart = function(_, sAvgId, sLanguage, sVoLan, sGroupId, nSta
 		})
 		objAvgPanel:_PreEnter()
 		objAvgPanel:_Enter()
+		if nTransitionType == 12 then
+			nTransitionType = 0
+		end
 	end
 	local func_OnEvent_TransAnimInClear = function()
 		EventManager.Hit(EventId.SetTransition)
@@ -80,6 +83,9 @@ local OnEvent_AvgSTStart = function(_, sAvgId, sLanguage, sVoLan, sGroupId, nSta
 	end
 end
 local OnEvent_AvgSTEnd = function(_)
+	local func_AvgSTEnd = function()
+		EventManager.Hit("AvgSTEnd")
+	end
 	local func_DoEnd = function()
 		NovaAPI.DispatchEventWithData("StoryDialog_DialogEnd")
 		if objAvgPanel ~= nil then
@@ -99,16 +105,14 @@ local OnEvent_AvgSTEnd = function(_)
 	local func_OnEvent_TransAnimInClear = function()
 		EventManager.Hit(EventId.SetTransition)
 		func_DoEnd()
+		func_AvgSTEnd()
 	end
 	if nTransitionType ~= 0 then
-		if nTransitionType == 12 then
-			func_DoEnd()
-		else
-			EventManager.Hit(EventId.SetTransition, nTransitionType, func_OnEvent_TransAnimInClear)
-		end
+		EventManager.Hit(EventId.SetTransition, nTransitionType, func_OnEvent_TransAnimInClear)
 		nTransitionType = 0
 	else
 		func_DoEnd()
+		func_AvgSTEnd()
 	end
 end
 local function Uninit(_)

lua/gamecore/network/httpnethandler.lua

@@ -869,6 +869,8 @@ local BindProcessFunction = function()
 		[NetMsgId.Id.player_world_class_advance_failed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.player_music_set_succeed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.player_music_set_failed_ack] = NOTHING_NEED_TO_BE_DONE,
+		[NetMsgId.Id.player_destroy_succeed_ack] = HttpNetHandlerPlus.player_destroy_succeed_ack,
+		[NetMsgId.Id.player_destroy_failed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.story_apply_succeed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.story_apply_failed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.story_settle_succeed_ack] = story_settle_succeed_ack,
@@ -1202,10 +1204,10 @@ local BindProcessFunction = function()
 		[NetMsgId.Id.activity_mining_move_to_next_layer_failed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.activity_mining_move_to_next_layer_succeed_ack] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.activity_mining_dig_succeed_ack] = activity_mining_dig_succeed_ack,
-		[NetMsgId.Id.activity_mining_dig_failed_ack] = NOTHING_NEED_TO_BE_DONE,
+		[NetMsgId.Id.activity_mining_dig_failed_ack] = HttpNetHandlerPlus.activity_mining_dig_failed_ack,
 		[NetMsgId.Id.activity_mining_energy_convert_notify] = activity_mining_energy_convert_notify,
 		[NetMsgId.Id.activity_mining_enter_layer_notify] = HttpNetHandlerPlus.activity_mining_enter_layer_notify,
-		[NetMsgId.Id.activity_mining_grids_error_notify] = HttpNetHandlerPlus.activity_mining_grids_error_notify,
+		[NetMsgId.Id.activity_mining_grids_error_notify] = NOTHING_NEED_TO_BE_DONE,
 		[NetMsgId.Id.score_boss_star_reward_receive_succeed_ack] = score_boss_star_reward_receive_succeed_ack,
 		[NetMsgId.Id.activity_cookie_settle_succeed_ack] = HttpNetHandlerPlus.activity_cookie_settle_succeed_ack,
 		[NetMsgId.Id.redeem_code_succeed_ack] = redeem_code_succeed_ack,

lua/gamecore/network/httpnethandlerplus.lua

@@ -88,8 +88,10 @@ end
 function HttpNetHandlerPlus.activity_mining_enter_layer_notify(mapMsgData)
 	EventManager.Hit("Mining_UpdateLevelData", mapMsgData)
 end
-function HttpNetHandlerPlus.activity_mining_grids_error_notify(mapMsgData)
-	EventManager.Hit("Mining_Error")
+function HttpNetHandlerPlus.activity_mining_dig_failed_ack(mapMsgData)
+	if mapMsgData.Code == 110111 then
+		EventManager.Hit("Mining_Error", mapMsgData)
+	end
 end
 function HttpNetHandlerPlus.activity_cookie_settle_succeed_ack(mapMsgData)
 	local mapDecodedChangeInfo = UTILS.DecodeChangeInfo(mapMsgData)
@@ -144,4 +146,9 @@ end
 function HttpNetHandlerPlus.item_expired_change_notify(mapMsgData)
 	EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Item_Change_Expired_Tips"))
 end
+function HttpNetHandlerPlus.player_destroy_succeed_ack(mapMsgData)
+	if mapMsgData.NotifyUrl ~= nil then
+		PlayerData.Base:SetDestoryUrl(mapMsgData.NotifyUrl)
+	end
+end
 return HttpNetHandlerPlus