From f81593bfafcd52f7f6b3719ab118fa3e41e834b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Fri, 5 Sep 2025 22:42:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(fightc):=20=E4=BC=98=E5=8C=96=E6=88=98?=
 =?UTF-8?q?=E6=96=97=E5=87=86=E5=A4=87=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整了 1v1 战斗和野怪战斗中宠物实体的创建时机
- 修复了部分情况下宠物实体未正确创建的问题
- 优化了战斗准备流程，提高了代码的可读性和稳定性
---
 logic/service/fightc.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/logic/service/fightc.go b/logic/service/fightc.go
index 0856ea57..4235ec57 100644
--- a/logic/service/fightc.go
+++ b/logic/service/fightc.go
@@ -91,20 +91,21 @@ func (f *FightC) ReadyFight(c PlayerI) {
 	case 1: // 1v1
 		if c == f.Our {
 			f.AFinished = true
-			f.OurCurrentPet = info.CreateBattlePetEntity(f.Info.OurPetList[0])
+
 			if f.BFinished {
 
 				rrsult()
 			}
 		} else {
 			f.Opp = c
+			f.OppCurrentPet = info.CreateBattlePetEntity(f.Info.OpponentPetList[0])
 			f.BFinished = true
 			if f.AFinished {
 				rrsult()
 			}
 		}
 	case 3: // 野怪战斗
-
+		f.OppCurrentPet = info.CreateBattlePetEntity(f.Info.OpponentPetList[0])
 		//判断捕捉率大于0
 		if gconv.Int(xmlres.PetMAP[int(f.Info.OpponentPetList[0].ID)].CatchRate) > 0 {
 			rett.Info2.Catchable = 1
@@ -129,7 +130,7 @@ func (f *FightC) NewFight(i *info.NoteReadyToFightInfo, plays PlayerI) {
 	f.Info = i
 	f.StartTime = time.Now()
 	f.actionChan = make(chan info.BattleActionI, 2) // 初始化全局操作通道
-
+	f.OurCurrentPet = info.CreateBattlePetEntity(f.Info.OurPetList[0])
 	switch i.FightId {
 	case 1:
 		// 1v1，等双方进入