1

logic/controller/pet_info.go

@@ -85,15 +85,17 @@ func (h Controller) PlayerShowPet(
 		return
 	}
 
-	slot, ok := player.FindPetBagSlot(data.CatchTime)
-	if !ok {
+	// 仅允许仓库精灵展示：背包中的精灵直接拒绝
+	if _, ok := player.FindPetBagSlot(data.CatchTime); ok {
+		return nil, errorcode.ErrorCodes.ErrCannotShowBagPokemon
+	}
+
+	ret := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime)
+	if ret == nil {
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
 
-	currentPet := slot.PetInfoPtr()
-	if currentPet == nil {
-		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
-	}
+	currentPet := &ret.Data
 
 	player.SetPetDisplay(data.Flag, currentPet)
 	player.GetSpace().RefreshUserInfo(player)