diff --git a/logic/controller/fight_boss野怪和地图怪.go b/logic/controller/fight_boss野怪和地图怪.go index 2ed65d32f..66acbeb61 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 33e4de553..574a731f5 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 {