From de297c990475cdb0913a1b6a4b06aa974b9787e5 Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Thu, 26 Feb 2026 19:22:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BAOgrePetInfo=E6=B7=BB=E5=8A=A0G?=
 =?UTF-8?q?etID=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/fight_boss野怪和地图怪.go | 5 +----
 logic/service/player/player.go             | 7 +++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/logic/controller/fight_boss野怪和地图怪.go b/logic/controller/fight_boss野怪和地图怪.go
index 2ed65d32..66acbeb6 100644
--- a/logic/controller/fight_boss野怪和地图怪.go
+++ b/logic/controller/fight_boss野怪和地图怪.go
@@ -134,12 +134,9 @@ func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInf
 
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
-	if refPet.Ext != 0 {
-		refPet.ID = refPet.Ext
 
-	}
 	monster := model.GenPetInfo(
-		int(refPet.ID), -1,
+		int(refPet.GetID()), -1,
 		-1,
 		0, //野怪没特性
 
diff --git a/logic/service/player/player.go b/logic/service/player/player.go
index 33e4de55..574a731f 100644
--- a/logic/service/player/player.go
+++ b/logic/service/player/player.go
@@ -39,6 +39,13 @@ type OgrePetInfo struct {
 	IsCapture int               `struc:"skip"`
 }
 
+func (o *OgrePetInfo) GetID() int {
+
+	if o.Ext != 0 {
+		return int(o.Ext)
+	}
+	return int(o.ID)
+}
 func (o *OgrePetInfo) FixSHiny() {
 	var co *data.GlowFilter
 	if o.Ext == 0 {