上传战斗协议

modules/academy/api_challenge.go

@@ -30,6 +30,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen
 		return
 	}
 	if errdata, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
+		Rulesid:      level.Battleready,
 		Ptype:        pb.PlayType_academy,
 		Format:       nil,
 		Sysformat:    level.UsFormatList,

modules/academy/api_teaching.go

@@ -32,6 +32,7 @@ func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeaching
 		return
 	}
 	if errdata, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
+		Rulesid:      level.Battleready,
 		Ptype:        pb.PlayType_heroteaching,
 		Format:       nil,
 		Sysformat:    level.UsFormatList,

modules/arena/api_challenge.go

@@ -116,6 +116,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
 		return
 	}
 	if errdata, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{
+		Rulesid:    105,
 		Ptype:      pb.PlayType_arena,
 		Redformat:  &pb.PVPFormation{Uid: red.Uid, Leadpos: red.Attack.Leadpos, Format: red.Attack.Formt},
 		Buleformat: &pb.PVPFormation{Uid: bule.Uid, Leadpos: bule.Defend.Leadpos, Format: bule.Defend.Formt},

modules/arena/api_plot.go

@@ -59,6 +59,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd
 		index = ndata.Index
 	}
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: npc.BattleReadyID,
 		Ptype:   pb.PlayType_arena,
 		Format:  req.Battle,
 		Mformat: []int32{npc.MonsterformatId[index]},

modules/combat/api_challenge.go

@@ -32,6 +32,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng
 		return
 	}
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: manster.BattleReadyID,
 		Ptype:   pb.PlayType_combat,
 		Format:  req.Battle,
 		Mformat: manster.FormatList,

modules/enchant/api_challenge.go

@@ -70,6 +70,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen
 		}
 	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: battleconf.BattleReadyID,
 		Ptype:   pb.PlayType_enchant,
 		Title:   "",
 		Format:  req.Battle,

modules/guildgve/api_challenge.go

@@ -69,6 +69,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.GuildGveChalle
 	// }
 
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: conf.BattleReadyID,
 		Ptype:   pb.PlayType_moonfantasy,
 		Format:  req.Battle,
 		Mformat: conf.Boss,

modules/hunting/api_challenge.go

@@ -101,6 +101,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
 	}
 
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: cfgData.BattleReadyID,
 		Ptype:   pb.PlayType_hunting,
 		Title:   "",
 		Format:  req.Battle,

modules/mainline/api_challenge.go

@@ -78,6 +78,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
 	}
 
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: conf.BattleReadyID,
 		Ptype:   pb.PlayType_mainline,
 		Title:   "",
 		Format:  req.Battle,

modules/mline/api_challenge.go

@@ -118,6 +118,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge
 		}
 	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: stageConf.BattleReadyID,
 		Ptype:   pb.PlayType_mainline,
 		Title:   "",
 		Format:  req.Battle,

modules/moonfantasy/api_battle.go

@@ -107,6 +107,7 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 	}
 
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: boss.BattleReadyID,
 		Ptype:   pb.PlayType_moonfantasy,
 		Format:  req.Battle,
 		Mformat: boss.Monsterformatid,

modules/pagoda/api_challenge.go

@@ -77,6 +77,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
 		}
 	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: conf.BattleReadyID,
 		Ptype:   pb.PlayType_pagoda,
 		Title:   "",
 		Format:  req.Battle,

modules/pagoda/api_racechallenge.go

@@ -114,6 +114,7 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
 		pType = pb.PlayType_race
 	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: conf.BattlereadyID,
 		Ptype:   pType,
 		Title:   "",
 		Format:  req.Battle,

modules/practice/api_npcbattkle.go

@@ -28,6 +28,7 @@ func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBa
 	}
 
 	if errdata, record = this.module.battle.CreateLPVEBattle(session, &pb.BattleLPVEReq{
+		Rulesid:        111,
 		Ptype:          pb.PlayType_practicenpc,
 		Format:         req.Formation,
 		Monsterleadpos: room.Captain,

modules/pvp/module.go

@@ -309,6 +309,7 @@ func (this *Pvp) startBattle(battle *BattleItem) {
 		err     error
 	)
 	if errdata, record = this.battle.CreateRtPvpBattle(&pb.BattleRTPVPReq{
+		Rulesid:     111,
 		Ptype:       pb.PlayType_friendsmeet,
 		Title:       "",
 		RedCompId:   battle.Red.Uid,

modules/viking/api_challenge.go

@@ -97,6 +97,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 	}
 
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: cfgData.BattleReadyID,
 		Ptype:   pb.PlayType_viking,
 		Title:   "",
 		Format:  req.Battle,

modules/worldtask/api_battlestart.go

@@ -53,6 +53,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 			record *pb.DBBattleRecord
 		)
 		errdata, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
+			Rulesid:    battleConf.BattleReadyID,
 			Ptype:      pb.PlayType_rtask,
 			Format:     req.Battle,
 			Buleformat: battleConf.FormatList,

modules/wtask/api_battlestart.go

@@ -41,6 +41,7 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.WTaskBattleS
 	}
 
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Rulesid: battleConf.BattleReadyID,
 		Ptype:   pb.PlayType_moonfantasy,
 		Format:  req.Battle,
 		Mformat: battleConf.FormatList,