diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 41a7f2ec4..903afd892 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -1,6 +1,7 @@ package robot import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/modules/hero" "go_dreamfactory/pb" @@ -17,13 +18,13 @@ var ( subType: hero.HeroSubTypeList, req: &pb.HeroListReq{}, rsp: &pb.HeroListResp{}, - // print: func(rsp proto.Message) { - // out := rsp.(*pb.HeroListResp) - // for i, v := range out.List { - // fmt.Printf("%d- %v\n", (i + 1), v) - // } - // }, - // enabled: true, + print: func(rsp proto.Message) { + out := rsp.(*pb.HeroListResp) + for i, v := range out.List { + fmt.Printf("%d- %v\n", (i + 1), v) + } + }, + enabled: true, next: func(robot *Robot, rsp proto.Message) { tcs := []*TestCase{} if r, ok := rsp.(*pb.HeroListResp); ok { @@ -36,8 +37,8 @@ var ( req: &pb.HeroInfoReq{ HeroId: heroId, }, - rsp: &pb.HeroInfoResp{}, - enabled: true, + rsp: &pb.HeroInfoResp{}, + // enabled: true, // print: func(rsp proto.Message) { // r := rsp.(*pb.HeroInfoResp) // fmt.Printf("%v\n", r) diff --git a/cmd/robot/task.go b/cmd/robot/task.go index 088ce88b9..82fec5e7f 100644 --- a/cmd/robot/task.go +++ b/cmd/robot/task.go @@ -63,7 +63,7 @@ var ( fmt.Printf("%v 活跃值:%v\n", v, out.Active) } }, - enabled: true, + // enabled: true, }, { desc: "活跃度领取", mainType: string(comm.ModuleTask), diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 92a012123..01ca2ecdf 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -129,7 +129,9 @@ func (this *ModelHero) createMultiHero(uid string, bPush bool, heroCfgIds ...int if len(heroes) == 0 { for _, v := range heroCfgIds { - return this.createOneHero(uid, v, bPush) + if err := this.createOneHero(uid, v, bPush); err != nil { + return err + } } } else { findHero := func(heroId int32) (*pb.DBHero, bool) { @@ -148,13 +150,19 @@ func (this *ModelHero) createMultiHero(uid string, bPush bool, heroCfgIds ...int data := map[string]interface{}{ "sameCount": h.SameCount, //叠加数 } - return this.modifyHeroData(uid, h.Id, data) + if err := this.modifyHeroData(uid, h.Id, data); err != nil { + return err + } } else { - return this.createOneHero(uid, v, bPush) + if err := this.createOneHero(uid, v, bPush); err != nil { + return err + } } } else { - return this.createOneHero(uid, v, bPush) + if err := this.createOneHero(uid, v, bPush); err != nil { + return err + } } } }