diff --git a/modules/config/service/shiny.go b/modules/config/service/shiny.go index 13315e54e..c344aaa23 100644 --- a/modules/config/service/shiny.go +++ b/modules/config/service/shiny.go @@ -68,6 +68,9 @@ func (s *ShinyService) RandShiny(id uint32) *data.GlowFilter { } } + if len(ret) == 0 { + return nil + } r := model.GenerateRandomOffspringMatrix() var t = data.GetDef() diff --git a/modules/player/model/pet.go b/modules/player/model/pet.go index 6280f1d76..c2884fff0 100644 --- a/modules/player/model/pet.go +++ b/modules/player/model/pet.go @@ -218,7 +218,10 @@ func (pet *PetInfo) Cure() { func (pet *PetInfo) FixShiny() { co := service.NewShinyService().RandShiny(pet.ID) - pet.ShinyInfo = append(pet.ShinyInfo, *co) + if co != nil { + pet.ShinyInfo = append(pet.ShinyInfo, *co) + } + } // 比重融合