From fc0842e3881aefd1a5b0515c1d4a8454e9d39b38 Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Mon, 23 Feb 2026 04:12:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86OgreInfo=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BAOgrePet=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/fight_boss野怪和地图怪.go |  2 +-
 logic/service/player/Monster.go            | 30 +++++++++++-----------
 logic/service/player/player.go             |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/logic/controller/fight_boss野怪和地图怪.go b/logic/controller/fight_boss野怪和地图怪.go
index c2e5714f1..f88fdab35 100644
--- a/logic/controller/fight_boss野怪和地图怪.go
+++ b/logic/controller/fight_boss野怪和地图怪.go
@@ -161,7 +161,7 @@ func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInf
 	if data1.Number > 9 {
 		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
-	refPet := p.OgreInfo.Data[data1.Number]
+	refPet := p.Data[data1.Number]
 	if refPet.ID == 0 {
 
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
diff --git a/logic/service/player/Monster.go b/logic/service/player/Monster.go
index 90191e43f..10489015b 100644
--- a/logic/service/player/Monster.go
+++ b/logic/service/player/Monster.go
@@ -37,12 +37,12 @@ func (p *Player) GenMonster() {
 	replce = []int{newNum} //产生替换新的精灵
 	if atomic.CompareAndSwapUint32(&p.Canmon, 2, 1) {
 
-		p.OgreInfo.Data = [9]OgrePetInfo{} //切地图清空
-		replce = p.monsters[:]             //产生替换新的精灵
+		p.Data = [9]OgrePetInfo{} //切地图清空
+		replce = p.monsters[:]    //产生替换新的精灵
 
 	}
 	p.MapNPC.Reset(10 * time.Second)
-	p.OgreInfo.Data[oldnum] = OgrePetInfo{} //切地图清空
+	p.Data[oldnum] = OgrePetInfo{} //切地图清空
 	mapss, ok := xmlres.MonsterMap[gconv.Int(p.Info.MapID)]
 
 	if ok && mapss.Monsters != nil {
@@ -60,39 +60,39 @@ func (p *Player) GenMonster() {
 			id := strings.Split(m.ID, " ")
 			lv := strings.Split(m.Lv, " ")
 
-			p.OgreInfo.Data[i] = OgrePetInfo{}
-			p.OgreInfo.Data[i].ID = gconv.Uint32(RandomStringFromSlice(id))
+			p.Data[i] = OgrePetInfo{}
+			p.Data[i].ID = gconv.Uint32(RandomStringFromSlice(id))
 
-			if p.OgreInfo.Data[i].ID != 0 {
+			if p.Data[i].ID != 0 {
 
-				p.OgreInfo.Data[i].Lv = gconv.Uint32(RandomStringFromSlice(lv))
+				p.Data[i].Lv = gconv.Uint32(RandomStringFromSlice(lv))
 
 				if len(id) == 1 { //说明这里只固定刷一个，概率变尼尔尼奥,不是稀有精灵
 
 					nieo, _, _ := p.Roll(20, 1000)
 					if nieo {
-						p.OgreInfo.Data[i].Ext = 77
+						p.Data[i].Ext = 77
 						if grand.Meet(1, 2) {
-							p.OgreInfo.Data[i].Ext = 416
+							p.Data[i].Ext = 416
 						}
 
-						p.OgreInfo.Data[i].Lv = 16
+						p.Data[i].Lv = 16
 					}
 
 				}
 				if cool.Config.ServerInfo.IsVip != 0 { //测试服,百分百异色
-					p.OgreInfo.Data[i].FixSHiny()
+					p.Data[i].FixSHiny()
 				} else {
-					if xmlres.PetMAP[int(p.OgreInfo.Data[i].ID)].CatchRate != 0 && grand.Meet(1, 500) {
+					if xmlres.PetMAP[int(p.Data[i].ID)].CatchRate != 0 && grand.Meet(1, 500) {
 
-						p.OgreInfo.Data[i].RandomByWeightShiny()
+						p.Data[i].RandomByWeightShiny()
 
 					}
 				}
 
 				if grand.Meet(3, 10) && len(mapinfo.DropItemIds) > 0 {
 
-					p.OgreInfo.Data[i].Item = append(p.OgreInfo.Data[i].Item, int64(mapinfo.DropItemIds[grand.Intn(len(mapinfo.DropItemIds))]))
+					p.Data[i].Item = append(p.Data[i].Item, int64(mapinfo.DropItemIds[grand.Intn(len(mapinfo.DropItemIds))]))
 
 				}
 			}
@@ -101,7 +101,7 @@ func (p *Player) GenMonster() {
 
 	}
 	if p != nil {
-		p.SendPackCmd(2004, &p.OgreInfo)
+		p.SendPackCmd(2004, &p.OgrePet)
 	}
 
 }
diff --git a/logic/service/player/player.go b/logic/service/player/player.go
index 2bfea14d8..c4dcca3a7 100644
--- a/logic/service/player/player.go
+++ b/logic/service/player/player.go
@@ -82,7 +82,7 @@ type Player struct {
 	Fightinfo info.Fightinfo // 当前邀请的玩家ID
 
 	Logintime uint32 // 当前登录时间
-	OgreInfo  OgrePet
+	OgrePet
 
 	Service *blservice.UserService
 	User    *service.BaseSysUserService