diff --git a/modules/blazing/service/pet_fusion_material_service.go b/modules/blazing/service/pet_fusion_material_service.go index 37c1e8b62..914981154 100644 --- a/modules/blazing/service/pet_fusion_material_service.go +++ b/modules/blazing/service/pet_fusion_material_service.go @@ -46,7 +46,7 @@ func (s *PetFusionMaterialService) Data(Material1 [4]uint32) uint32 { } } - ret, err := s.Cache.GetOrSetFuncLock(context.Background(), cacheKey, func(context.Context) (interface{}, error) { + ret, _ := s.Cache.GetOrSetFuncLock(context.Background(), cacheKey, func(context.Context) (interface{}, error) { m := cool.DBM(s.Model) @@ -65,25 +65,25 @@ func (s *PetFusionMaterialService) Data(Material1 [4]uint32) uint32 { return effect, nil }, 0) - effect2s := service.DictInfoServiceS.GetData("effect") effect := ret.Interface().(*model.PetFusionMaterial) - if err != nil { + if effect == nil { + effect2s := service.DictInfoServiceS.GetData("effect") for _, v := range effect2s { - return gconv.Uint32(v.Remark) + return gconv.Uint32(v.Value) } } r := grand.Intn(4) switch r { case 0: - return gconv.Uint32(effect2s[effect.Trait1Idx].Remark) + return effect.Trait1Idx case 1: - return gconv.Uint32(effect2s[effect.Trait2Idx].Remark) + return effect.Trait2Idx case 2: - return gconv.Uint32(effect2s[effect.Trait3Idx].Remark) + return effect.Trait3Idx case 3: - return gconv.Uint32(effect2s[effect.Trait4Idx].Remark) + return effect.Trait4Idx } return 0 }