diff --git a/comm/const.go b/comm/const.go index 3be37488c..5b3b6c90e 100644 --- a/comm/const.go +++ b/comm/const.go @@ -720,6 +720,8 @@ const ( Rtype189 TaskType = 189 //铁匠铺进行一次定制 Rtype199 TaskType = 199 //回想多少次 Rtype200 TaskType = 200 //在狩猎内战斗X次 + Rtype201 TaskType = 201 //在维京体系的副本内消耗X体力 + Rtype202 TaskType = 202 //在狩猎体系的副本内消耗X体力 ) const ( diff --git a/modules/caravan/api_getstory.go b/modules/caravan/api_getstory.go index 3a52383df..77831126c 100644 --- a/modules/caravan/api_getstory.go +++ b/modules/caravan/api_getstory.go @@ -50,10 +50,10 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory list.Taskid = wt.GetWorldTaskBy(session, conf.Worldtask) if list.Taskid != 0 { // 任务接取成功 bAccept = true - list.Eventid = req.Citystory + list.Taskid = conf.Worldtask list.Tasktime = configure.Now().Unix() - update["eventid"] = list.Eventid + //update["eventid"] = list.Eventid update["task"] = list.Taskid update["tasktime"] = list.Tasktime } diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 3aca3eee7..c90cceb36 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -180,6 +180,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha tasks = append(tasks, comm.GetBuriedParam(comm.Rtype172, 1)) } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype83, 1, req.BossType, req.Difficulty)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype202, consumPs)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1)) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) return diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 1d450fcf6..08dba6be8 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -192,6 +192,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal szTask = append(szTask, comm.GetBuriedParam(comm.Rtype172, 1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype181, 1, req.BossId, req.Difficulty)) } + szTask = append(szTask, comm.GetBuriedParam(comm.Rtype201, consumPs)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype76, 1, req.BossId)) if bHelp { szTask = append(szTask, comm.GetBuriedParam(comm.Rtype180, req.BossId, 1))