From 6d5cba379a66c3487f4e4c19c702aced39aa4c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Thu, 11 Dec 2025 19:37:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(blazing):=20=E4=BF=AE=E5=A4=8D=E5=AE=A0?=
 =?UTF-8?q?=E7=89=A9=E8=9E=8D=E5=90=88=E6=9D=90=E6=96=99=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整了缓存获取逻辑，忽略错误并优化返回值处理。
从 DictInfoService 获取的数据现在正确使用 Value 字段，
并且简化了随机属性索引的返回方式。
---
 .../service/pet_fusion_material_service.go       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/blazing/service/pet_fusion_material_service.go b/modules/blazing/service/pet_fusion_material_service.go
index 37c1e8b6..91498115 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
 }