diff --git a/comm/const.go b/comm/const.go index 5199f37ce..a1a3f176c 100644 --- a/comm/const.go +++ b/comm/const.go @@ -555,7 +555,7 @@ const ( Rtype70 TaskType = 70 //通关世界任务XX关卡 Rtype72 TaskType = 72 //完成一次捏人 Rtype73 TaskType = 73 //通关难度A维京远征指定BOSSN次(从接到任务开始,只有通关A难度进度才+1) - Rtype74 TaskType = 74 //通关难度A维京远征指定BOSS(检查最高难度记录是否超过了此难度,超过则完成) + //Rtype74 TaskType = 74 //通关难度A维京远征指定BOSS(检查最高难度记录是否超过了此难度,超过则完成) Rtype75 TaskType = 75 //自动战斗通关难度A的维京远征指定BOSS(从接到任务开始,若全程无手动操作(不包含变速)且挑战难度大于等于A则判断任务完成) Rtype76 TaskType = 76 //通关维京远征指定BOSSN次(从创号开始记录,通关任意难度进度都+1) Rtype77 TaskType = 77 //通关难度A及以上维京远征指定BOSSN次(从接到任务开始,若通关难度大于等于设定难度,则进度+1) diff --git a/modules/rtask/module.go b/modules/rtask/module.go index f0d679637..41e212115 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -99,7 +99,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle handles = append(handles, handle) this.registerVerifyHandle(v.Id, handle) // 两个参数 第一个大于等于 第二个等于 - case comm.Rtype159, comm.Rtype160, comm.Rtype74, comm.Rtype75: + case comm.Rtype159, comm.Rtype160, comm.Rtype75: handle := &rtaskCondHandle{ condId: v.Id, verify: this.modelRtaskRecord.verifyMultiEqual, //两个参数 等于 diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index e4dd42af9..06c335d97 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -172,7 +172,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal // 随机任务统计 var szTask []*comm.TaskParam szTask = append(szTask, comm.GettaskParam(comm.Rtype73, 1, req.BossId, req.Difficulty)) - szTask = append(szTask, comm.GettaskParam(comm.Rtype74, req.BossId, req.Difficulty)) + //szTask = append(szTask, comm.GettaskParam(comm.Rtype74, req.BossId, req.Difficulty)) szTask = append(szTask, comm.GettaskParam(comm.Rtype78, req.BossId, req.Difficulty, req.Report.Costtime)) if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { @@ -185,9 +185,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal } if req.Auto { + szTask = append(szTask, comm.GettaskParam(comm.Rtype75, req.BossId, req.Difficulty)) szTask = append(szTask, comm.GettaskParam(comm.Rtype172, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype181, req.BossId, req.Difficulty, 1)) } + szTask = append(szTask, comm.GettaskParam(comm.Rtype76, 1, req.BossId)) if bHelp { szTask = append(szTask, comm.GettaskParam(comm.Rtype180, req.BossId, 1)) } diff --git a/modules/viking/module.go b/modules/viking/module.go index 910af7ce8..9e9a2c783 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -318,10 +318,8 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR } // 随机任务统计 // this.ModuleRtask.SendToRtask(session, comm.Rtype73, difficulty, bossId, 1) - // this.ModuleRtask.SendToRtask(session, comm.Rtype74, difficulty, bossId) // this.ModuleRtask.SendToRtask(session, comm.Rtype78, difficulty, bossId, Report.Costtime) tasks = append(tasks, comm.GettaskParam(comm.Rtype73, 1, bossId, difficulty)) - tasks = append(tasks, comm.GettaskParam(comm.Rtype74, difficulty, bossId)) tasks = append(tasks, comm.GettaskParam(comm.Rtype78, difficulty, bossId, Report.Costtime)) if Report != nil && Report.Info != nil && len(Report.Info.Redflist) > 0 { for _, v := range Report.Info.Redflist[0].Team {