Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
cd204ac061
@ -998,6 +998,8 @@ const (
|
|||||||
Rtype247 TaskType = 247 //完成X品质的武馆派遣Y个
|
Rtype247 TaskType = 247 //完成X品质的武馆派遣Y个
|
||||||
Rtype248 TaskType = 248 //在维京表内指定类型的boss副本内,消耗X点体力
|
Rtype248 TaskType = 248 //在维京表内指定类型的boss副本内,消耗X点体力
|
||||||
Rtype249 TaskType = 249 //赢得X把快速接龙
|
Rtype249 TaskType = 249 //赢得X把快速接龙
|
||||||
|
Rtype250 TaskType = 250 //在{0}回合内完成维京{1}key值
|
||||||
|
Rtype251 TaskType = 251 //在{0}回合内完成狩猎内{1}key值
|
||||||
)
|
)
|
||||||
const (
|
const (
|
||||||
MailLineEasy int32 = 1 // 简单
|
MailLineEasy int32 = 1 // 简单
|
||||||
|
@ -228,6 +228,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
|||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype83, 1, req.BossType, req.Difficulty))
|
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.Rtype202, consumPs))
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1))
|
||||||
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype251, cfgHunting.Id, req.Report.Round))
|
||||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||||
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HuntingChallengeOverReq", szAtno)
|
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HuntingChallengeOverReq", szAtno)
|
||||||
|
@ -81,7 +81,7 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if pagoda.Battlecount > 10 {
|
if pagoda.Battlecount > 9999 { // 暂时不做限制
|
||||||
errdata = &pb.ErrorData{ // 今日挑战达到上限
|
errdata = &pb.ErrorData{ // 今日挑战达到上限
|
||||||
Code: pb.ErrorCode_PagodaMaxCount,
|
Code: pb.ErrorCode_PagodaMaxCount,
|
||||||
Title: pb.ErrorCode_PagodaMaxCount.ToString(),
|
Title: pb.ErrorCode_PagodaMaxCount.ToString(),
|
||||||
|
@ -249,6 +249,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
|
|||||||
// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype237, consumPs))
|
// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype237, consumPs))
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype201, consumPs))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype201, consumPs))
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype76, 1, req.BossId))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype76, 1, req.BossId))
|
||||||
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype250, vikingCfg.Id, req.Report.Round)) // 回合数
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype77, 1, req.BossId, req.Difficulty))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype77, 1, req.BossId, req.Difficulty))
|
||||||
if bHelp {
|
if bHelp {
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype180, req.BossId, 1))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype180, req.BossId, 1))
|
||||||
|
Loading…
Reference in New Issue
Block a user