From 1b9e2c4f1e9068eb34a97af8ccc5b376b2ab53c6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 18 Aug 2023 14:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E5=9F=8B?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/module.go | 28 +++++++++++++------------ modules/pagoda/api_racechallengeover.go | 8 ++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/modules/hero/module.go b/modules/hero/module.go index ac67d00f8..a3287bc4e 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -92,8 +92,17 @@ func (this *Hero) Start() (err error) { // 创建单个叠加英雄 func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, num int32) (hero *pb.DBHero, bFirst bool, atno []*pb.UserAtno, errdata *pb.ErrorData) { var ( - err error + err error + szTask []*pb.BuriedParam + cfg *cfg.GameHeroData ) + if cfg, err = this.configure.GetHeroConfig(heroCfgId); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + } hero, bFirst, atno, err = this.modelHero.createHero(session, heroCfgId, num) if err == nil && bFirst { //go func() { // 携程处理 图鉴数据 @@ -103,17 +112,7 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, this.moduleFetter.AddHeroFetterData(session.GetUserId(), heroCfgId) } //}() - - // 查品质 - cfg, _ := this.configure.GetHeroConfig(heroCfgId) - if cfg != nil { - var szTask []*pb.BuriedParam - szTask = append(szTask, comm.GetBuriedParam(comm.Rtype1, 1, utils.ToInt32(heroCfgId))) - 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.Clone(), szTask...) - } - + szTask = append(szTask, comm.GetBuriedParam(comm.Rtype228, cfg.Star)) return } if err != nil { @@ -123,7 +122,10 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, Message: err.Error(), } } - + szTask = append(szTask, comm.GetBuriedParam(comm.Rtype1, 1, utils.ToInt32(heroCfgId))) + szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype30, heroCfgId, cfg.Color)) + szTask = append(szTask, comm.GetBuriedParam(comm.Rtype31, num, cfg.Color)) + go this.ModuleBuried.TriggerBuried(session.Clone(), szTask...) return } diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go index 37f444282..e9ddf06fc 100644 --- a/modules/pagoda/api_racechallengeover.go +++ b/modules/pagoda/api_racechallengeover.go @@ -169,6 +169,12 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda this.module.SetRacePagodaRankList("race"+strconv.Itoa(int(conf.Restriction)), race.Race[conf.Restriction].Curfloor, session.GetUserId(), newData.Id) } // 任务相关 - //go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab)) + var sz []*pb.BuriedParam + sz = append(sz, comm.GetBuriedParam(comm.Rtype232, conf.Restriction, conf.Floors)) + + if conf.Restriction >= 10 { + sz = append(sz, comm.GetBuriedParam(comm.Rtype231, conf.Floors)) + } + go this.module.ModuleBuried.TriggerBuried(session.Clone(), sz...) return }