【表删除】AccomplishmentConfig
parent
1dc2b05f04
commit
472829239e
|
@ -1,5 +1,5 @@
|
||||||
ConfigName = {
|
ConfigName = {
|
||||||
AccomplishmentConfig = "AccomplishmentConfig",
|
-- AccomplishmentConfig = "AccomplishmentConfig",
|
||||||
ActivityRewardConfig = "ActivityRewardConfig",
|
ActivityRewardConfig = "ActivityRewardConfig",
|
||||||
AdventureConfig = "AdventureConfig",
|
AdventureConfig = "AdventureConfig",
|
||||||
AreaConfig = "AreaConfig",
|
AreaConfig = "AreaConfig",
|
||||||
|
|
|
@ -779,13 +779,6 @@ end
|
||||||
function this.CheckEliteCarbonRedpot(carbonId)
|
function this.CheckEliteCarbonRedpot(carbonId)
|
||||||
-- 检测副本红点的方法
|
-- 检测副本红点的方法
|
||||||
local function checkSingleCarbon(id)
|
local function checkSingleCarbon(id)
|
||||||
local taskInfoList = ConfigManager.GetAllConfigsDataByKey(ConfigName.AccomplishmentConfig, "MapId", id)
|
|
||||||
for _, data in ipairs(taskInfoList) do
|
|
||||||
local taskData = TaskManager.GetTypeTaskInfo(TaskTypeDef.EliteCarbonTask, data.id)
|
|
||||||
if taskData and taskData.state == VipTaskStatusDef.CanReceive then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -116,25 +116,6 @@ end
|
||||||
|
|
||||||
-- 获得所有的功绩数据
|
-- 获得所有的功绩数据
|
||||||
function this.GetAchieveData(datalist)
|
function this.GetAchieveData(datalist)
|
||||||
local taskInfoList = ConfigManager.GetAllConfigsDataByKey(ConfigName.AccomplishmentConfig, "MapId", this.carbonId)
|
|
||||||
for _, data in ipairs(taskInfoList) do
|
|
||||||
local taskData = TaskManager.GetTypeTaskInfo(TaskTypeDef.EliteCarbonTask, data.id)
|
|
||||||
if taskData then
|
|
||||||
local info = {}
|
|
||||||
info.id = data.id
|
|
||||||
info.MapId = data.MapId
|
|
||||||
info.Sort = data.Sort
|
|
||||||
info.Logic = data.Logic
|
|
||||||
info.Values = data.Values
|
|
||||||
info.Info = GetLanguageStrById(data.Info)
|
|
||||||
info.Score = data.Score
|
|
||||||
info.Reward = data.Reward
|
|
||||||
info.ScheduleShow = data.ScheduleShow
|
|
||||||
info.progress = taskData.progress
|
|
||||||
info.state = taskData.state
|
|
||||||
table.insert(datalist, info)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- 排序
|
-- 排序
|
||||||
table.sort(datalist, function(a, b)
|
table.sort(datalist, function(a, b)
|
||||||
|
|
|
@ -6,7 +6,7 @@ local missionConfig = ConfigManager.GetConfig(ConfigName.MissionEventsConfig)
|
||||||
local ChallengeData = ConfigManager.GetConfig(ConfigName.ChallengeConfig)
|
local ChallengeData = ConfigManager.GetConfig(ConfigName.ChallengeConfig)
|
||||||
local MapConfig = ConfigManager.GetConfig(ConfigName.ChallengeMapConfig)
|
local MapConfig = ConfigManager.GetConfig(ConfigName.ChallengeMapConfig)
|
||||||
local MapPointConfig = ConfigManager.GetConfig(ConfigName.MapPointConfig)
|
local MapPointConfig = ConfigManager.GetConfig(ConfigName.MapPointConfig)
|
||||||
local accomplishmentConfig = ConfigManager.GetConfig(ConfigName.AccomplishmentConfig)
|
-- local accomplishmentConfig = ConfigManager.GetConfig(ConfigName.AccomplishmentConfig)
|
||||||
local exploreData = ConfigManager.GetConfig(ConfigName.ExploreFunctionConfig)
|
local exploreData = ConfigManager.GetConfig(ConfigName.ExploreFunctionConfig)
|
||||||
local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig)
|
local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig)
|
||||||
local optionConfig = ConfigManager.GetConfig(ConfigName.OptionConfig)
|
local optionConfig = ConfigManager.GetConfig(ConfigName.OptionConfig)
|
||||||
|
@ -297,25 +297,25 @@ function this.InitAllMapPgData()
|
||||||
for i=1, #MapConfigKeys do
|
for i=1, #MapConfigKeys do
|
||||||
local curMapData={}
|
local curMapData={}
|
||||||
|
|
||||||
if MapConfig[MapConfigKeys[i]].MapId ~= 10 then
|
-- if MapConfig[MapConfigKeys[i]].MapId ~= 10 then
|
||||||
curMapData.mapId=MapConfig[MapConfigKeys[i]].MapId
|
-- curMapData.mapId=MapConfig[MapConfigKeys[i]].MapId
|
||||||
curMapData.totalWeight=0
|
-- curMapData.totalWeight=0
|
||||||
curMapData.maxTotalWeight=0
|
-- curMapData.maxTotalWeight=0
|
||||||
curMapData.progressData={}
|
-- curMapData.progressData={}
|
||||||
local accomplishmentConfigKeys = GameDataBase.SheetBase.GetKeys(accomplishmentConfig)
|
-- local accomplishmentConfigKeys = GameDataBase.SheetBase.GetKeys(accomplishmentConfig)
|
||||||
for i = 1, #accomplishmentConfigKeys do
|
-- for i = 1, #accomplishmentConfigKeys do
|
||||||
if accomplishmentConfig[accomplishmentConfigKeys[i]].MapId == curMapData.mapId then
|
-- if accomplishmentConfig[accomplishmentConfigKeys[i]].MapId == curMapData.mapId then
|
||||||
local ExploreDetail={}
|
-- local ExploreDetail={}
|
||||||
ExploreDetail.id=accomplishmentConfig[accomplishmentConfigKeys[i]].id
|
-- ExploreDetail.id=accomplishmentConfig[accomplishmentConfigKeys[i]].id
|
||||||
ExploreDetail.proressNum=0
|
-- ExploreDetail.proressNum=0
|
||||||
ExploreDetail.configData=accomplishmentConfig[accomplishmentConfigKeys[i]]
|
-- ExploreDetail.configData=accomplishmentConfig[accomplishmentConfigKeys[i]]
|
||||||
curMapData.maxTotalWeight=curMapData.maxTotalWeight+accomplishmentConfig[accomplishmentConfigKeys[i]].Score
|
-- curMapData.maxTotalWeight=curMapData.maxTotalWeight+accomplishmentConfig[accomplishmentConfigKeys[i]].Score
|
||||||
table.insert(curMapData.progressData,ExploreDetail)
|
-- table.insert(curMapData.progressData,ExploreDetail)
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
this.allMapProgressList[curMapData.mapId]=curMapData
|
-- this.allMapProgressList[curMapData.mapId]=curMapData
|
||||||
--this.InitAllMapProgressData(curMapData)
|
-- --this.InitAllMapProgressData(curMapData)
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
table.sort(this.allMapProgressList, function(a,b) return a.mapId < b.mapId end)
|
table.sort(this.allMapProgressList, function(a,b) return a.mapId < b.mapId end)
|
||||||
end
|
end
|
||||||
|
@ -943,10 +943,10 @@ end
|
||||||
-- 精英副本成就完成会调事件
|
-- 精英副本成就完成会调事件
|
||||||
function this.OnEliteAchieveDone(taskId)
|
function this.OnEliteAchieveDone(taskId)
|
||||||
local curCarbonId = this.GetCurCarbonId()
|
local curCarbonId = this.GetCurCarbonId()
|
||||||
local achieve = accomplishmentConfig[taskId]
|
-- local achieve = accomplishmentConfig[taskId]
|
||||||
if achieve and achieve.MapId == curCarbonId then
|
-- if achieve and achieve.MapId == curCarbonId then
|
||||||
UIManager.OpenPanel(UIName.CurlingTipPanel, GetLanguageStrById(achieve.Info) .. " 已完成")
|
-- UIManager.OpenPanel(UIName.CurlingTipPanel, GetLanguageStrById(achieve.Info) .. " 已完成")
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 返回道具数量判断的东西
|
-- 返回道具数量判断的东西
|
||||||
|
|
|
@ -219,16 +219,16 @@ end
|
||||||
function this.GetAchiveNum(mapId)
|
function this.GetAchiveNum(mapId)
|
||||||
local totalNum = 0
|
local totalNum = 0
|
||||||
local doneNum = 0
|
local doneNum = 0
|
||||||
local taskInfoList = ConfigManager.GetAllConfigsDataByKey(ConfigName.AccomplishmentConfig, "MapId", mapId)
|
-- local taskInfoList = ConfigManager.GetAllConfigsDataByKey(ConfigName.AccomplishmentConfig, "MapId", mapId)
|
||||||
for _, data in ipairs(taskInfoList) do
|
-- for _, data in ipairs(taskInfoList) do
|
||||||
local taskData = TaskManager.GetTypeTaskInfo(TaskTypeDef.EliteCarbonTask, data.id)
|
-- local taskData = TaskManager.GetTypeTaskInfo(TaskTypeDef.EliteCarbonTask, data.id)
|
||||||
if taskData then
|
-- if taskData then
|
||||||
totalNum = totalNum + 1
|
-- totalNum = totalNum + 1
|
||||||
if taskData.state > 0 then
|
-- if taskData.state > 0 then
|
||||||
doneNum = doneNum + 1
|
-- doneNum = doneNum + 1
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
return doneNum, totalNum
|
return doneNum, totalNum
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue