From 9c0ff3c9ada0643403de4ff2dc452e474c055562 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 21 Feb 2023 14:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=98=9F=E9=95=BF=E6=8A=80?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/battle/modelBattle.go | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index c999198d0..401df5298 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -639,6 +639,7 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
 		}
 		if n < int(caprule.Lv[1]) {
 			ok = false
+			return
 		}
 	}
 	if len(caprule.Start) == 2 { //星级校验
@@ -650,6 +651,7 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
 		}
 		if n < int(caprule.Start[1]) {
 			ok = false
+			return
 		}
 	}
 
@@ -662,19 +664,25 @@ func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb
 		}
 		if n < int(caprule.Race[1]) {
 			ok = false
+			return
 		}
 	}
 
 	if len(caprule.Heroid) > 0 { //阵营校验
-		n := 0
-		for _, v := range conf {
-			if v != nil && v.Race == caprule.Race[0] {
-				n++
+
+		for _, v := range caprule.Heroid {
+			iskeep := false
+			for _, v1 := range heros {
+				if v1 != nil && v1.HeroID == v {
+					iskeep = true
+				}
+			}
+			if !iskeep {
+				ok = false
+				return
 			}
 		}
-		if n < int(caprule.Race[1]) {
-			ok = false
-		}
+
 	}
 	return
 }