跳转修改提交

dev_chengFeng
jiaoyangna 2020-08-26 14:51:10 +08:00
parent a52ea7f6b7
commit 7f9c8122c4
3 changed files with 37 additions and 14 deletions

View File

@ -876,6 +876,7 @@ JumpType = {
DailyCarbon_SoulPrint=71, --每日魂印副本
DeathPos=72, --十绝阵
GuildCarDelay=73 , --车迟斗法
XuanYuanMirror=74 , --车迟斗法
CompoundHero = 78,--神将合成、置换
BuyVigor = 10000, --体力购买

View File

@ -46,16 +46,19 @@ function this.InitializeData()
this.rewardData[v.ActivityId][v.Level].Reward = temp
end
for i, v in ConfigPairs(TreasureSunLongTaskConfig) do
if not taskData[v.Type] then
taskData[v.Type] = {}
if not taskData[v.ActivityId] then
taskData[v.ActivityId] = {}
end
taskData[v.Type][v.Id] = {}
taskData[v.Type][v.Id].id = v.Id
taskData[v.Type][v.Id].show = v.Show
taskData[v.Type][v.Id].taskValue = v.TaskValue
taskData[v.Type][v.Id].integral = v.Integral
taskData[v.Type][v.Id].jump = v.Jump
taskData[v.Type][v.Id].ActivityId = v.ActivityId
if not taskData[v.ActivityId][v.Type] then
taskData[v.ActivityId][v.Type] = {}
end
taskData[v.ActivityId][v.Type][v.Id] = {}
taskData[v.ActivityId][v.Type][v.Id].id = v.Id
taskData[v.ActivityId][v.Type][v.Id].show = v.Show
taskData[v.ActivityId][v.Type][v.Id].taskValue = v.TaskValue
taskData[v.ActivityId][v.Type][v.Id].integral = v.Integral
taskData[v.ActivityId][v.Type][v.Id].jump = v.Jump
taskData[v.ActivityId][v.Type][v.Id].ActivityId = v.ActivityId
end
end
@ -164,10 +167,10 @@ function this.GetQinglongTaskData(_curtype)
local task = {}
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
for k,v in ipairs(temp) do
if taskData[curtype][v.missionId] and taskData[curtype][v.missionId].ActivityId == activityId then
taskData[curtype][v.missionId].progress = v.progress
taskData[curtype][v.missionId].state = v.state
table.insert(task, taskData[curtype][v.missionId])
if taskData[activityId][curtype][v.missionId] then
taskData[activityId][curtype][v.missionId].progress = v.progress
taskData[activityId][curtype][v.missionId].state = v.state
table.insert(task, taskData[activityId][curtype][v.missionId])
end
end
-- LogBlue("每周任务个数:"..#task)

View File

@ -262,7 +262,23 @@ local jumpDic = {
--end,
[JumpType.Trial] = function(data)--试炼
CarbonManager.difficulty = 2
UIManager.OpenPanel(UIName.TrialCarbonPanel)
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
if MapTrialManager.curTowerLevel > 10000 then
MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId()
else
MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
end
MapManager.curCarbonType =CarBonTypeId.TRIAL
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
MapManager.trialHeroInfo=msg.infos
SwitchPanel.OpenPanel(UIName.MapPanel)
end)
LogBlue(Language[11163])
end,
[JumpType.BuyVigor] = function(data)--体力购买
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.Energy })
@ -506,6 +522,9 @@ local jumpDic = {
[JumpType.CompoundHero] = function()--神将合成、置换
UIManager.OpenPanel(UIName.CompoundHeroPanel)
end,
[JumpType.XuanYuanMirror] = function()--轩辕
UIManager.OpenPanel(UIName.XuanYuanMirrorPanel)
end,
--Compound=66, --锻造炉
--DailyCarbon_Gold=67, --每日金币副本
--DailyCarbon_Exp=68, --每日经验副本