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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = {}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user