hanfuit
645b64fe21
服务端（Go）： - GM 塞背包/带属性装备发放：在线角色推送 op14 增量物品行，背包实时刷新，无需回角色选择界面 - GM 改金币/改等级：去掉在线拒绝，落库后推送 op14 钱包/op37 等级状态，在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel（自带在线刷新） - 无限/锁死疲劳模式 + 燃烧疲劳：每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示（op12 mode 0） - 深渊史诗掉率：GM 全局倍率 + 城镇增益药剂窗口倍率，真实接入掉落结算 启动器（Python/JS）： - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具：疲劳与燃烧、深渊史诗掉率、拍卖行上架（单一定价对齐） - 拍卖行上架前端对齐服务端单一价格语义，修复 400 报错
82 lines
2.5 KiB
Go
82 lines
2.5 KiB
Go
package dnfbridge
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"longheng.io/server/internal/modules/dnf/alignedcmd"
|
|
"longheng.io/server/internal/modules/dnf/dnfenum"
|
|
dnfpet "longheng.io/server/internal/modules/dnf/pet"
|
|
)
|
|
|
|
func (s *Service) preloadPetPVFCatalog(ctx context.Context) error {
|
|
if s == nil {
|
|
return nil
|
|
}
|
|
if ctx == nil {
|
|
ctx = context.Background()
|
|
}
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
if _, err := s.currentPetPVFCatalog(); err != nil {
|
|
return fmt.Errorf("preload pet pvf catalog: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// currentPetPVFCatalog lazily loads the typed pet catalog from the same active
|
|
// runtime Script.pvf used by the other bridge-owned catalogs. Both success and
|
|
// failure are cached so a malformed/missing PVF cannot trigger repeated heavy
|
|
// archive scans or silently fall back to request/inventory metadata.
|
|
func (s *Service) currentPetPVFCatalog() (*dnfpet.PVFCatalog, error) {
|
|
if s == nil {
|
|
return nil, dnfpet.ErrPetPVFSourceRequired
|
|
}
|
|
s.petCatalogMu.Lock()
|
|
defer s.petCatalogMu.Unlock()
|
|
if s.petCatalog != nil || s.petCatalogLoadErr != nil {
|
|
return s.petCatalog, s.petCatalogLoadErr
|
|
}
|
|
s.initialEquipmentMu.Lock()
|
|
archive, err := s.initialEquipmentArchiveLocked()
|
|
s.initialEquipmentMu.Unlock()
|
|
if err == nil {
|
|
s.petCatalog, err = dnfpet.NewPVFCatalog(archive)
|
|
}
|
|
s.petCatalogLoadErr = err
|
|
if err == nil && s.petCatalog != nil {
|
|
s.logInfo("dnf pet PVF catalog loaded", "max_creature_level", dnfpet.MaxCreatureLevel)
|
|
}
|
|
return s.petCatalog, s.petCatalogLoadErr
|
|
}
|
|
|
|
// alignedPetHatchResolverForCommand keeps PVF loading request-driven. Only the
|
|
// real current hatch command needs this dependency; other aligned commands do
|
|
// not open or scan the pet catalog.
|
|
func (s *Service) alignedPetHatchResolverForCommand(opcode dnfenum.CmdPacket) (alignedcmd.PetHatchResolver, error) {
|
|
if opcode != dnfenum.CmdPacketHatchCreature {
|
|
return nil, nil
|
|
}
|
|
catalog, err := s.currentPetPVFCatalog()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if catalog == nil {
|
|
return nil, dnfpet.ErrPetPVFSourceRequired
|
|
}
|
|
return func(eggItemID int64) (alignedcmd.PetHatchResolution, error) {
|
|
definition, err := catalog.ResolveHatch(eggItemID)
|
|
if err != nil {
|
|
return alignedcmd.PetHatchResolution{}, err
|
|
}
|
|
return alignedcmd.PetHatchResolution{
|
|
EggItemID: definition.EggItemID,
|
|
HatchedItemID: definition.HatchedItemID,
|
|
EggPVFPath: definition.EggPVFPath,
|
|
HatchedPVFPath: definition.HatchedPVFPath,
|
|
MinimumLevel: definition.MinimumLevel,
|
|
}, nil
|
|
}, nil
|
|
}
|