From 57bdb5b17c0976d4eb2cca464d7278b7e5c84ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Mon, 8 Sep 2025 01:24:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(logic):=20=E4=BF=AE=E5=A4=8D=20MAXPET=20?=
 =?UTF-8?q?=E4=B8=BA=200=20=E6=97=B6=E7=9A=84=E5=AE=A0=E7=89=A9=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在加载玩家宠物信息时，增加了对 MAXPET 为 0 的判断
- 当 MAXPET 为 0 时，不再加载任何宠物到战斗中
- 此修改避免了在不应该加载宠物的情况下错误地添加宠物到战斗中
---
 logic/service/fightc.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/logic/service/fightc.go b/logic/service/fightc.go
index 5bb47d0e..1dc0339c 100644
--- a/logic/service/fightc.go
+++ b/logic/service/fightc.go
@@ -186,7 +186,7 @@ func NewFight(i info.NoteReadyToFightInfo, p1 PlayerI, p2 PlayerI) *FightC {
 		Player:     p1,
 	}
 	for k, v := range p1.GetPetInfo() {
-		if k < int(i.MAXPET) {
+		if i.MAXPET != 0 && k < int(i.MAXPET) { //todo 待测试
 			f.Our.AllPet = append(f.Our.AllPet, info.CreateBattlePetEntity(v, f.rand))
 		}
 
@@ -197,7 +197,7 @@ func NewFight(i info.NoteReadyToFightInfo, p1 PlayerI, p2 PlayerI) *FightC {
 		Player:     p2,
 	}
 	for k, v := range p2.GetPetInfo() {
-		if k < int(i.MAXPET) {
+		if i.MAXPET != 0 && k < int(i.MAXPET) {
 			f.Opp.AllPet = append(f.Opp.AllPet, info.CreateBattlePetEntity(v, f.rand))
 		}
 	}