1

modules/config/model/egg.go

@@ -11,9 +11,9 @@ const (
 // Egg 性别配置模型（替换原宠物融合配方模型）
 type Egg struct {
 	*cool.Model // 保留通用Model（ID/创建时间/更新时间等）
-	//雄性
-	MalePetIDs []int32 `gorm:"type:int[];comment:'雄性宠物ID列表（如：[1001,1002]）'" json:"male_pet_ids"`
 	//雌性
+	MalePetIDs []int32 `gorm:"type:int[];comment:'雄性宠物ID列表（如：[1001,1002]）'" json:"male_pet_ids"`
+	//雄性
 	FemalePetIDs []int32 `gorm:"type:int[];comment:'雌性宠物ID列表（如：[1001,1002]）'" json:"female_pet_ids"`
 	//子代指定性别配置表名
 	OutputMons []int32 `gorm:"type:int[];not null;comment:'宠物类型ID'" json:"pet_type_id"`

modules/config/service/egg.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"blazing/common/utils"
 	"blazing/cool"
 	"blazing/modules/config/model"
 )
@@ -20,13 +21,36 @@ func NewEggService() *EggService {
 	}
 }
 
-func (s *EggService) Get(id uint32) *model.Egg {
-	if id == 0 {
-		return nil
-	}
-	var item *model.Egg
-	dbm(s.Model).Where("id", id).Scan(&item)
+func (s *EggService) GetData(p1 uint32) []int32 {
+	//cacheKey := strings.Join([]string{fmt.Sprintf("%d", p1), fmt.Sprintf("%d", p2)}, ":")
+	m := dbm(s.Model)
 
-	return item
+	var pet []model.Egg //一个特性应该是唯一的,但是我们要获取默认随机特性
+	m.Wheref(`male_pet_ids @> ARRAY[?]::integer[]`, p1).
+		Where("is_enable", 1).Scan(&pet)
+	var petIDs []int32
+	for _, p := range pet {
+		petIDs = append(petIDs, p.FemalePetIDs...)
+	}
+
+	return petIDs
+
+}
+func (s *EggService) GetResult(m, f uint32) uint32 {
+	//cacheKey := strings.Join([]string{fmt.Sprintf("%d", p1), fmt.Sprintf("%d", p2)}, ":")
+	md := dbm(s.Model)
+
+	var pet *model.Egg //一个特性应该是唯一的,但是我们要获取默认随机特性
+	md.Wheref(`male_pet_ids @> ARRAY[?]::integer[]`, m).
+		Wheref(`female_pet_ids @> ARRAY[?]::integer[]`, f).
+		Where("is_enable", 1).Scan(&pet)
+	if pet != nil {
+
+		t, _ := utils.RandomByWeight(pet.OutputMons, pet.Probs)
+		return uint32(t)
+
+	}
+
+	return 0
 
 }

modules/config/service/pet_fusion_service.go

@@ -44,7 +44,7 @@ func (s *PetFusionService) Data(p1, p2, rand uint32) uint32 {
 			props = append(props, int(v.Probability))
 
 		}
-		t,_:=utils.RandomByIntProbs(pets, props)
+		t, _ := utils.RandomByWeight(pets, props)
 		return uint32(t)
 		//说明是失败，直接返回失败
 	} else {