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

任务 整合

Browse Source
This commit is contained in:
meixiongfeng 2023-05-30 14:38:55 +08:00
parent c99a0dfd4a
commit 57115d4d74
9 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/hero/api_awaken.go
View File

@ -102,11 +102,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
} else { } else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId()) this.module.Errorf("no found userdata uid:%s", session.GetUserId())
} }
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype34, _hero.HeroID, _hero.JuexingLv))
var szTask []*pb.BuriedParam var szTask []*pb.BuriedParam
//szTask = append(szTask, comm.GetBuriedParam(comm.Rtype34, 1, _hero.JuexingLv))
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype34, _hero.HeroID, _hero.JuexingLv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype119, 1, utils.ToInt32(_hero.HeroID))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype119, 1, utils.ToInt32(_hero.HeroID)))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID)))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype118, _hero.Lv, _hero.JuexingLv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype118, _hero.Lv, _hero.JuexingLv))
@ -114,7 +113,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype122, _hero.JuexingLv, _hero.Star)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype122, _hero.JuexingLv, _hero.Star))
cfg, err := this.module.configure.GetHeroConfig(_hero.HeroID) cfg, err := this.module.configure.GetHeroConfig(_hero.HeroID)
if err == nil { if err == nil {
var sz []*pb.BuriedParam
// 校验共鸣满级 // 校验共鸣满级
var _l int32 var _l int32
talent, err := this.module.modelTalent.GetHerotalent(session.GetUserId()) talent, err := this.module.modelTalent.GetHerotalent(session.GetUserId())
@ -128,17 +127,14 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
} }
if this.module.configure.GetHeroTalentMaxLv(_hero.HeroID) == _l { if this.module.configure.GetHeroTalentMaxLv(_hero.HeroID) == _l {
bManAwaken = true bManAwaken = true
} }
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype121, 1, cfg.Race)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype121, 1, cfg.Race))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv))
_, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) _, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
if err != nil { // 达到满级觉醒 if err != nil { // 达到满级觉醒
if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) && bManAwaken { if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) && bManAwaken {
sz = append(sz, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), sz...)
} }
} }

6
modules/hero/api_buy.go
View File

@ -116,12 +116,6 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb
} }
} }
// for _, v := range need {
// if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) {
// // this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype67, v.N, utils.ToInt32(v.T)))
// }
// }
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{ session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{
IsSucc: true, IsSucc: true,

3
modules/hero/api_strengthenUpSkill.go
View File

@ -132,8 +132,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)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype54, _hero.HeroID))
// 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))
} }

3
modules/hero/api_strengthenUpStar.go
View File

@ -92,8 +92,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
// 推送 世界任务消息 // 推送 世界任务消息
var szTask []*pb.BuriedParam var szTask []*pb.BuriedParam
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype6, _hero.Star, utils.ToInt32(_hero.HeroID))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype6, _hero.Star, utils.ToInt32(_hero.HeroID)))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype25, _hero.HeroID, _hero.Star)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype25, _hero.HeroID, _hero.Star))
if _hero.Star == 4 { if _hero.Star == 4 {
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype26, 1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype26, 1))

15
modules/hero/api_talentlearn.go
View File

@ -136,13 +136,12 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
Telnet: talent, Telnet: talent,
TalentID: req.TalentID, // 返回刚学习过的天赋ID TalentID: req.TalentID, // 返回刚学习过的天赋ID
}) })
var szTask []*pb.BuriedParam
// 查询英雄相关信息 // 查询英雄相关信息
if heroObj := this.module.QueryHeroByConfId(session.GetUserId(), talent.HeroId); heroObj != nil { if heroObj := this.module.QueryHeroByConfId(session.GetUserId(), talent.HeroId); heroObj != nil {
var sz []*pb.BuriedParam var szTask []*pb.BuriedParam
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype123, heroObj.HeroID, heroObj.Star))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype123, heroObj.HeroID, heroObj.Star)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype124, heroObj.HeroID))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype124, heroObj.HeroID))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype123, 1, int32(len(talent.Talent)), heroObj.Star)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype123, 1, int32(len(talent.Talent)), heroObj.Star))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype124, 1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype124, 1))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype125, 1, utils.ToInt32(heroObj.HeroID))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype125, 1, utils.ToInt32(heroObj.HeroID)))
@ -157,15 +156,13 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
if heroObj.Lv == this.module.configure.GetHeroMaxLv(heroObj.Star) { if heroObj.Lv == this.module.configure.GetHeroMaxLv(heroObj.Star) {
if this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) { if this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) {
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, heroObj.HeroID, cfg.Color))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype37, heroObj.HeroID, cfg.Color)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, heroObj.HeroID))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype38, heroObj.HeroID))
} }
} }
} }
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), sz...)
} }
return return

18
modules/hero/model_hero.go
View File

@ -593,12 +593,9 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype24, 1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype24, 1))
// szTask = append(szTask, comm.GetBuriedParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID))) // szTask = append(szTask, comm.GetBuriedParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID)))
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv))
if cfg, _ := this.module.configure.GetHeroConfig(hero.HeroID); cfg != nil { if cfg, _ := this.module.configure.GetHeroConfig(hero.HeroID); cfg != nil {
//szTask = append(szTask, comm.GetBuriedParam(comm.Rtype32, 1, cfg.Color, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype32, hero.HeroID, cfg.Color, hero.Lv))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype32, hero.HeroID, cfg.Color, hero.Lv))
//xx英雄满级、共鸣、觉醒至最高状态 //xx英雄满级、共鸣、觉醒至最高状态
nextAwaken, _ := this.module.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1) nextAwaken, _ := this.module.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1)
if nextAwaken == nil { // 达到满级觉醒 if nextAwaken == nil { // 达到满级觉醒
@ -614,24 +611,19 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
} }
} }
if this.module.configure.GetHeroTalentMaxLv(hero.HeroID) == _l { if this.module.configure.GetHeroTalentMaxLv(hero.HeroID) == _l {
//szTask = append(szTask, comm.GetBuriedParam(comm.Rtype37, 1, cfg.Color)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, hero.HeroID, cfg.Color))
var sz []*pb.BuriedParam szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, hero.HeroID))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype37, hero.HeroID, cfg.Color))
sz = append(sz, comm.GetBuriedParam2(comm.Rtype38, hero.HeroID))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), sz...)
} }
} }
} }
} }
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype111, hero.HeroID, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype111, hero.HeroID, hero.Lv))
//szTask = append(szTask, comm.GetBuriedParam(comm.Rtype111, 1, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype112, 1, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype112, 1, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype113, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype113, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype33, 1, 1, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype33, 1, 1, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype118, hero.Lv, hero.JuexingLv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype118, hero.Lv, hero.JuexingLv))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
//this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype33, 1, 1, hero.Lv)
} }
} }
return return

3
modules/hero/module.go
View File

@ -98,8 +98,7 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string,
if cfg != nil { if cfg != nil {
var szTask []*pb.BuriedParam var szTask []*pb.BuriedParam
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype1, 1, utils.ToInt32(heroCfgId))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype1, 1, utils.ToInt32(heroCfgId)))
go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype30, heroCfgId, cfg.Color)) szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype30, heroCfgId, cfg.Color))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype31, 1, cfg.Color)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype31, 1, cfg.Color))
go this.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) go this.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
} }

3
modules/library/api_usegift.go
View File

@ -165,9 +165,8 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype132, 1, _heroObj.Favorlv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype132, 1, _heroObj.Favorlv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype133, _heroObj.Favorlv, utils.ToInt32(_heroObj.Heroid))) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype133, _heroObj.Favorlv, utils.ToInt32(_heroObj.Heroid)))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype134, upLv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype134, upLv))
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype132, _heroObj.Heroid, _heroObj.Favorlv))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype132, _heroObj.Heroid, _heroObj.Favorlv))
} }
return return

7
modules/smithy/api_forgeequip.go
View File

@ -250,8 +250,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
Value: 0, Value: 0,
} }
// 解锁了新的图纸 // 解锁了新的图纸
this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype177, 1)) var szTask []*pb.BuriedParam
this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype179, 1, nextProficiency.Value1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype177, 1))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype179, 1, nextProficiency.Value1))
this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
} }
// 是否解锁新套装 // 是否解锁新套装
if nextProficiency.Type == comm.SmithyReelType4 { if nextProficiency.Type == comm.SmithyReelType4 {