From bf9fbd150e73989820e3aeee914e82e3b2b65f17 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 16 Nov 2022 18:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_monsterformat.json | 11 +++++++++++ modules/battle/modelBattle.go | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index e50f0d2f6..c34ed099c 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -73863,5 +73863,16 @@ "atkpro": 1, "defpro": 0.8, "modelsize": 1 + }, + { + "Id": 710003, + "pos": 5, + "captainId": 0, + "monster": 140071, + "lv": 10, + "hppro": 0.6, + "atkpro": 1, + "defpro": 0.8, + "modelsize": 1 } ] \ No newline at end of file diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index ba2a9027b..fd7f43f30 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -59,10 +59,14 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon captain int32 masters []*pb.BattleRole ) - + if req.Format != nil { model := db.NewDBModel(comm.TableHero, time.Hour, conn) record.Redflist = make([]*pb.DBBattleFormt, 1) + record.Redflist[0] = &pb.DBBattleFormt{ + Leadpos: req.Format.Leadpos, + Team: make([]*pb.BattleRole, len(req.Format.Format)), + } //自己的英雄阵营 for i, v := range req.Format.Format { if v != "" { @@ -365,7 +369,7 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt } else { hero := &pb.DBHero{} if hero = this.module.ModuleHero.CreateMonster(monst.HeroId, monst.Star, v.Lv); hero == nil { - this.module.Error("on found battle req data", log.Fields{ "HeroId": monst.HeroId}) + this.module.Error("on found battle req data", log.Fields{"HeroId": monst.HeroId}) code = pb.ErrorCode_ReqParameterError return } else {