liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-05-30 11:57:50 +08:00
commit 7fb6fd8432
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comm/const.go
View File

@ -542,7 +542,7 @@ const (
Rtype54 TaskType = 54 //x名卡牌角色技能全满级 Rtype54 TaskType = 54 //x名卡牌角色技能全满级
Rtype55 TaskType = 55 //xx品质英雄提升xx次技能等级 Rtype55 TaskType = 55 //xx品质英雄提升xx次技能等级
Rtype56 TaskType = 56 //拥有xx名技能升级xx次的xx职业英雄 Rtype56 TaskType = 56 //拥有xx名技能升级xx次的xx职业英雄
Rtype57 TaskType = 57 //xx名英雄技能满级 Rtype57 TaskType = 57 //xx名英雄技能满级 // 修改时间 20230530 同54
Rtype58 TaskType = 58 //通关任意普通爬塔层数 Rtype58 TaskType = 58 //通关任意普通爬塔层数
Rtype59 TaskType = 59 //通关普通爬塔xx层 Rtype59 TaskType = 59 //通关普通爬塔xx层
Rtype60 TaskType = 60 //任意主线副本通关1次 Rtype60 TaskType = 60 //任意主线副本通关1次

2
modules/hero/api_strengthenUpSkill.go
View File

@ -134,7 +134,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
if maxLv { if maxLv {
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype54, _hero.HeroID)) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype54, _hero.HeroID))
// szTask = append(szTask, comm.GetBuriedParam(comm.Rtype54, 1)) // szTask = append(szTask, comm.GetBuriedParam(comm.Rtype54, 1))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype57, 1)) //szTask = append(szTask, comm.GetBuriedParam(comm.Rtype57, 1))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype174, 1, _hero.Star)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype174, 1, _hero.Star))
} }

2
modules/mline/api_challengeover.go
View File

@ -220,7 +220,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
} }
} }
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype160, allStar) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype160, allStar)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype160, allStar)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype160, allStar, stageConf.Chapterid))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
return return
} }

5
modules/smithy/api_atlasactivate.go
View File

@ -60,7 +60,7 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla
code = pb.ErrorCode_SmithyNoFoundAtlas code = pb.ErrorCode_SmithyNoFoundAtlas
return return
} }
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype166, 1))
} else if conf.TypeId == 2 { } else if conf.TypeId == 2 {
if v, ok := atlas.Collect[req.Id]; ok { if v, ok := atlas.Collect[req.Id]; ok {
if !v.Activate { // 激活 if !v.Activate { // 激活
@ -76,8 +76,9 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla
code = pb.ErrorCode_SmithyNoFoundAtlas code = pb.ErrorCode_SmithyNoFoundAtlas
return return
} }
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype165, 1))
} }
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype165, 1))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype166, int32(len(atlas.Collect))))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype167, atlas.Score)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype167, atlas.Score))
this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
session.SendMsg(string(this.module.GetType()), "atlasactivate", &pb.SmithyAtlasActivateResp{Data: atlas}) session.SendMsg(string(this.module.GetType()), "atlasactivate", &pb.SmithyAtlasActivateResp{Data: atlas})