1

logic/controller/fight_boss.go

@@ -87,7 +87,7 @@ func (Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, p *playe
 					-1,
 					0, //野怪没特性
 
-					bm.Lv, nil)
+					bm.Lv, nil, 0)
 				monster.CatchTime = uint32(i)
 				if bm.Hp != 0 {
 					monster.Hp = uint32(bm.Hp)
@@ -158,21 +158,21 @@ func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInf
 		return nil, errorcode.ErrorCodes.ErrSystemError
 	}
 	refPet := p.OgreInfo.Data[data1.Number]
-	if refPet.Id == 0 {
+	if refPet.ID == 0 {
 
 		return nil, errorcode.ErrorCodes.ErrPokemonNotExists
 	}
 	if refPet.Ext != 0 {
-		refPet.Id = refPet.Ext
+		refPet.ID = refPet.Ext
 
 	}
 	monster := model.GenPetInfo(
-		int(refPet.Id), -1,
+		int(refPet.ID), -1,
 		-1,
 		0, //野怪没特性
 
 		int(refPet.Lv),
-		refPet.ShinyInfo)
+		refPet.ShinyInfo, -1)
 	if refPet.Ext != 0 {
 		if grand.Meet(3, 100) {
 			monster.RandShiny()