diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 27f090a1a..dc97a32bd 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -102,11 +102,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c } else { 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 - //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.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID))) 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)) cfg, err := this.module.configure.GetHeroConfig(_hero.HeroID) if err == nil { - var sz []*pb.BuriedParam + // 校验共鸣满级 var _l int32 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 { bManAwaken = true - } 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) if err != nil { // 达到满级觉醒 if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) && bManAwaken { - 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...) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color)) } } diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index 677a03dd1..d6683b2d6 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -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...) session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{ IsSucc: true, diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 760e51c48..488ad1085 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -132,8 +132,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt } } if maxLv { - 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.GetBuriedParam2(comm.Rtype54, _hero.HeroID)) //szTask = append(szTask, comm.GetBuriedParam(comm.Rtype57, 1)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype174, 1, _hero.Star)) } diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index dd6bb0ec1..f1d05126f 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -92,8 +92,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr // 推送 世界任务消息 var szTask []*pb.BuriedParam 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 { szTask = append(szTask, comm.GetBuriedParam(comm.Rtype26, 1)) diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index 97d8a2ad9..a720d4d6e 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -136,13 +136,12 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe Telnet: talent, TalentID: req.TalentID, // 返回刚学习过的天赋ID }) - var szTask []*pb.BuriedParam + // 查询英雄相关信息 if heroObj := this.module.QueryHeroByConfId(session.GetUserId(), talent.HeroId); heroObj != nil { - var sz []*pb.BuriedParam - - sz = append(sz, comm.GetBuriedParam2(comm.Rtype123, heroObj.HeroID, heroObj.Star)) - sz = append(sz, comm.GetBuriedParam2(comm.Rtype124, heroObj.HeroID)) + var szTask []*pb.BuriedParam + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype123, heroObj.HeroID, heroObj.Star)) + szTask = append(szTask, 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.Rtype124, 1)) 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 this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) { - - sz = append(sz, comm.GetBuriedParam2(comm.Rtype37, heroObj.HeroID, cfg.Color)) - sz = append(sz, comm.GetBuriedParam2(comm.Rtype38, heroObj.HeroID)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, heroObj.HeroID, cfg.Color)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, heroObj.HeroID)) } } } go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), sz...) } return diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index e1d679ed5..0cca58876 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -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.GetBuriedParam(comm.Rtype24, 1)) // szTask = append(szTask, comm.GetBuriedParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID))) - - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv)) if cfg, _ := this.module.configure.GetHeroConfig(hero.HeroID); cfg != nil { - //szTask = append(szTask, comm.GetBuriedParam(comm.Rtype32, 1, cfg.Color, hero.Lv)) - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype32, hero.HeroID, cfg.Color, hero.Lv)) - + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype32, hero.HeroID, cfg.Color, hero.Lv)) //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken, _ := this.module.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1) 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 { - //szTask = append(szTask, comm.GetBuriedParam(comm.Rtype37, 1, cfg.Color)) - var sz []*pb.BuriedParam - 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...) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype37, hero.HeroID, cfg.Color)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype38, hero.HeroID)) } } } } - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam2(comm.Rtype111, hero.HeroID, hero.Lv)) - //szTask = append(szTask, comm.GetBuriedParam(comm.Rtype111, 1, hero.Lv)) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype111, hero.HeroID, 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.Rtype33, 1, 1, hero.Lv)) szTask = append(szTask, comm.GetBuriedParam(comm.Rtype118, hero.Lv, hero.JuexingLv)) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) - //this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype33, 1, 1, hero.Lv) } } return diff --git a/modules/hero/module.go b/modules/hero/module.go index 044eb870b..bc728b3d9 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -98,8 +98,7 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, if cfg != nil { var szTask []*pb.BuriedParam 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)) go this.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...) } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index b9e7ccd9a..a00237f8e 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -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.Rtype133, _heroObj.Favorlv, utils.ToInt32(_heroObj.Heroid))) 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(), comm.GetBuriedParam2(comm.Rtype132, _heroObj.Heroid, _heroObj.Favorlv)) } return diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 05f5a098a..5037aa08e 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -250,8 +250,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq Value: 0, } // 解锁了新的图纸 - this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype177, 1)) - this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype179, 1, nextProficiency.Value1)) + var szTask []*pb.BuriedParam + 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 {