diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index 41253dae7..69cb96214 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -88,18 +88,34 @@ func (this *modelArena) queryArenaPlayer(uId string) (result *pb.ArenaPlayer, er // 查询用户英雄数据 func (this *modelArena) queryUserHeros(uid string, heroids []string) (results []*pb.DBHero, err error) { var ( - model *db.DBModel + model *db.DBModel + ids []string + resultstemp []*pb.DBHero ) + if model, err = this.module.GetDBModelByUid(uid, comm.TableHero); err != nil { this.module.Errorln(err) return } + for _, v := range heroids { + if v == "" { + ids = append(ids, v) + } + } - results = make([]*pb.DBHero, 0) - if err = model.GetListObjs(uid, heroids, &results); err != nil { + resultstemp = make([]*pb.DBHero, 0) + if err = model.GetListObjs(uid, ids, &resultstemp); err != nil { this.module.Errorln(err) return } + results = make([]*pb.DBHero, len(heroids)) + for i1, v1 := range resultstemp { + for i2, _ := range results { + if i1 == i2 { + results[i2] = v1 + } + } + } return } diff --git a/modules/catchbugs/api_ready.go b/modules/catchbugs/api_ready.go index d060f2629..defe4112f 100644 --- a/modules/catchbugs/api_ready.go +++ b/modules/catchbugs/api_ready.go @@ -43,6 +43,6 @@ func (this *apiComp) Ready(session comm.IUserSession, req *pb.CatchbugsReadyReq) } return } - session.SendMsg(string(this.module.GetType()), "loadcomplete", &pb.CanineRabbitLoadCompleteResp{Roomid: req.Roomid, Issucc: true}) + session.SendMsg(string(this.module.GetType()), "ready", &pb.CatchbugsReadyResp{Roomid: req.Roomid, Issucc: true}) return } diff --git a/services/worker/main.go b/services/worker/main.go index c2fde1c24..eff4c2c42 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -15,6 +15,7 @@ import ( "go_dreamfactory/modules/caninerabbit" "go_dreamfactory/modules/capturesheep" "go_dreamfactory/modules/caravan" + "go_dreamfactory/modules/catchbugs" "go_dreamfactory/modules/chat" "go_dreamfactory/modules/combat" "go_dreamfactory/modules/dailytask" @@ -184,6 +185,7 @@ func main() { caninerabbit.NewModule(), island.NewModule(), egghunt.NewModule(), + catchbugs.NewModule(), ) }