```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful

feat(fight): 使用专用函数构建战斗结束数据包

为战斗结束消息创建专用的构建函数,
统一处理战斗结束信息的数据包构建逻辑,
提高代码的一致性和可维护性。

fix(config): 优化数据库查询语句以提高性能

将数组包含操作(@>)替换为 ANY 操作符,
在 Egg、MapPit、PetFusion 等服务中使用更高效
的查询方式
This commit is contained in:
昔念
2026-04-12 13:27:39 +08:00
parent 174830731c
commit f9543a5156
9 changed files with 65 additions and 14 deletions

View File

@@ -26,7 +26,7 @@ func (s *EggService) GetData(p1 uint32) []int32 {
m := dbm_enable(s.Model)
var pet []model.Egg //一个特性应该是唯一的,但是我们要获取默认随机特性
m.Wheref(`male_pet_ids @> ARRAY[?]::integer[]`, p1).Scan(&pet)
m.Wheref(`? = ANY(male_pet_ids)`, p1).Scan(&pet)
var petIDs []int32
for _, p := range pet {
petIDs = append(petIDs, p.FemalePetIDs...)
@@ -40,8 +40,8 @@ func (s *EggService) GetResult(m, f, level uint32) (uint32, bool) {
md := dbm_enable(s.Model)
var pet *model.Egg //一个特性应该是唯一的,但是我们要获取默认随机特性
md.Wheref(`male_pet_ids @> ARRAY[?]::integer[]`, m).
Wheref(`female_pet_ids @> ARRAY[?]::integer[]`, f).Scan(&pet)
md.Wheref(`? = ANY(male_pet_ids)`, m).
Wheref(`? = ANY(female_pet_ids)`, f).Scan(&pet)
if pet != nil {
pet.Probs[len(pet.Probs)-1] += int32(level)
t, _ := utils.RandomByWeight(pet.OutputMons, pet.Probs)

View File

@@ -41,7 +41,7 @@ func (s *MapPitService) GetDataALL(mapid uint32) []model.MapPit {
func (s *MapPitService) GetPet(petid uint32) []model.MapPit {
var pet []model.MapPit //一个特性应该是唯一的,但是我们要获取默认随机特性
dbm_enable(s.Model).Wheref(`refresh_id @> ARRAY[?]::integer[]`, petid).Scan(&pet)
dbm_enable(s.Model).Wheref(`? = ANY(refresh_id)`, petid).Scan(&pet)
return pet

View File

@@ -51,7 +51,7 @@ func (s *PetFusionService) Data(p1, p2, rand uint32) uint32 {
func (s *PetFusionService) getData(p1, p2 uint32) uint32 {
var pet []model.PetFusion //一个特性应该是唯一的,但是我们要获取默认随机特性
dbm_enable(s.Model).Where("main_pet_id", p1).Wheref(`sub_pet_ids @> ARRAY[?]::integer[]`, p2).Scan(&pet)
dbm_enable(s.Model).Where("main_pet_id", p1).Wheref(`? = ANY(sub_pet_ids)`, p2).Scan(&pet)
if len(pet) != 0 {
var pets, props []int

View File

@@ -47,7 +47,7 @@ func (s *ShinyService) listByPetID(id uint32) []model.ColorfulSkin {
var ret []model.ColorfulSkin
dbm_enable(s.Model).
Wheref(`bind_elf_ids @> ?::jsonb`, id).
Wheref(`CAST(? AS text) = ANY(ARRAY(SELECT jsonb_array_elements_text(bind_elf_ids)))`, id).
Wheref(`jsonb_typeof(bind_elf_ids) = ?`, "array").
Scan(&ret)