DNF90 服务端与启动器完整源码（含 GM 工具功能增强）
服务端（Go）： - GM 塞背包/带属性装备发放：在线角色推送 op14 增量物品行，背包实时刷新，无需回角色选择界面 - GM 改金币/改等级：去掉在线拒绝，落库后推送 op14 钱包/op37 等级状态，在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel（自带在线刷新） - 无限/锁死疲劳模式 + 燃烧疲劳：每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示（op12 mode 0） - 深渊史诗掉率：GM 全局倍率 + 城镇增益药剂窗口倍率，真实接入掉落结算 启动器（Python/JS）： - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具：疲劳与燃烧、深渊史诗掉率、拍卖行上架（单一定价对齐） - 拍卖行上架前端对齐服务端单一价格语义，修复 400 报错
This commit is contained in:
hanfuit committed
commit
645b64fe21
4388 files changed
+1405457
No files matched your search
@@ -0,0 +1,134 @@
|
||||
package guardiangem
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrOwnerUnavailable = errors.New("guardian gem owner is unavailable")
|
||||
ErrCharacterRequired = errors.New("guardian gem character id is required")
|
||||
ErrInventoryMissing = errors.New("guardian gem inventory is missing")
|
||||
ErrProjectorRequired = errors.New("guardian gem mutation projector is required")
|
||||
)
|
||||
|
||||
type Assets struct {
|
||||
Inventory *dnfrepo.InventoryRecord
|
||||
Equipment *dnfrepo.EquipmentRecord
|
||||
}
|
||||
|
||||
type Changes struct {
|
||||
InventorySlots bool
|
||||
InventoryWarehouse bool
|
||||
Equipment bool
|
||||
}
|
||||
|
||||
type Projector func(*Assets) (Changes, error)
|
||||
|
||||
type Command struct {
|
||||
CharacterID string
|
||||
UpdatedAt time.Time
|
||||
Project Projector
|
||||
}
|
||||
|
||||
// Owner owns the atomic character inventory/equipment commit for guardian-gem
|
||||
// insertion. PVF validation and current-client raw socket projection remain
|
||||
// in the bridge.
|
||||
type Owner struct {
|
||||
items dnfrepo.CharacterItemUnitOfWork
|
||||
}
|
||||
|
||||
func NewOwner(repositories dnfrepo.Group) (*Owner, error) {
|
||||
if repositories.CharacterItems == nil {
|
||||
return nil, ErrOwnerUnavailable
|
||||
}
|
||||
return &Owner{items: repositories.CharacterItems}, nil
|
||||
}
|
||||
|
||||
func (o *Owner) Insert(ctx context.Context, command Command) error {
|
||||
if o == nil || o.items == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
characterID := strings.TrimSpace(command.CharacterID)
|
||||
if characterID == "" {
|
||||
return ErrCharacterRequired
|
||||
}
|
||||
if command.Project == nil {
|
||||
return ErrProjectorRequired
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
now := command.UpdatedAt.UTC()
|
||||
if now.IsZero() {
|
||||
now = time.Now().UTC()
|
||||
}
|
||||
|
||||
return o.items.WithinCharacterItems(ctx, characterID, func(
|
||||
inventories dnfrepo.InventoryRepository,
|
||||
equipmentRepo dnfrepo.EquipmentRepository,
|
||||
) error {
|
||||
if inventories == nil || equipmentRepo == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
inventory, found, err := inventories.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("load guardian gem inventory: %w", err)
|
||||
}
|
||||
if !found || strings.TrimSpace(inventory.CharacterID) != characterID {
|
||||
return fmt.Errorf("%w: character=%s", ErrInventoryMissing, characterID)
|
||||
}
|
||||
inventory = dnfrepo.CloneInventory(inventory)
|
||||
equipment, equipmentFound, err := equipmentRepo.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("load guardian gem equipment: %w", err)
|
||||
}
|
||||
if equipmentFound {
|
||||
equipment = dnfrepo.CloneEquipment(equipment)
|
||||
} else {
|
||||
equipment = dnfrepo.EquipmentRecord{
|
||||
CharacterID: characterID,
|
||||
Entries: make(map[string]dnfrepo.EquipmentEntry),
|
||||
}
|
||||
}
|
||||
if equipment.Entries == nil {
|
||||
equipment.Entries = make(map[string]dnfrepo.EquipmentEntry)
|
||||
}
|
||||
|
||||
changes, err := command.Project(&Assets{
|
||||
Inventory: &inventory,
|
||||
Equipment: &equipment,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
inventoryFields := make([]dnfrepo.InventoryField, 0, 2)
|
||||
if changes.InventorySlots {
|
||||
inventoryFields = append(inventoryFields, dnfrepo.InventoryFieldSlots)
|
||||
}
|
||||
if changes.InventoryWarehouse {
|
||||
inventoryFields = append(inventoryFields, dnfrepo.InventoryFieldWarehouse)
|
||||
}
|
||||
if len(inventoryFields) > 0 {
|
||||
inventory.UpdatedAt = now
|
||||
if err := dnfrepo.SaveInventoryFields(ctx, inventories, inventory, inventoryFields...); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if changes.Equipment {
|
||||
equipment.UpdatedAt = now
|
||||
if err := dnfrepo.SaveEquipmentFields(ctx, equipmentRepo, equipment, dnfrepo.EquipmentFieldEntries); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
package guardiangem
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
dnfrepomemory "longheng.io/server/internal/modules/dnf/repository/memory"
|
||||
)
|
||||
|
||||
func TestOwnerInsertCommitsInventoryAndEquipmentAtomically(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedGuardianGemOwner(t, ctx, repositories)
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatalf("NewOwner error = %v", err)
|
||||
}
|
||||
|
||||
err = owner.Insert(ctx, Command{
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
source := assets.Inventory.Slots["38:49"]
|
||||
source.Count--
|
||||
assets.Inventory.Slots["38:49"] = source
|
||||
target := assets.Equipment.Entries["32"]
|
||||
target.Extra = map[string]string{"raw_data_65": "socket"}
|
||||
assets.Equipment.Entries["32"] = target
|
||||
return Changes{InventorySlots: true, Equipment: true}, nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Insert error = %v", err)
|
||||
}
|
||||
inventory, _, _ := repositories.Inventory.Load(ctx, "77")
|
||||
equipment, _, _ := repositories.Equipment.Load(ctx, "77")
|
||||
if inventory.Slots["38:49"].Count != 1 || equipment.Entries["32"].Extra["raw_data_65"] != "socket" {
|
||||
t.Fatalf("inventory=%+v equipment=%+v", inventory, equipment)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerInsertRollsBackProjectedContainers(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
seedGuardianGemOwner(t, ctx, repositories)
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
wantErr := errors.New("reject guardian gem projection")
|
||||
err = owner.Insert(ctx, Command{
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "38:49")
|
||||
delete(assets.Equipment.Entries, "32")
|
||||
return Changes{InventorySlots: true, Equipment: true}, wantErr
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, wantErr) {
|
||||
t.Fatalf("Insert error = %v, want %v", err, wantErr)
|
||||
}
|
||||
inventory, _, _ := repositories.Inventory.Load(ctx, "77")
|
||||
equipment, _, _ := repositories.Equipment.Load(ctx, "77")
|
||||
if inventory.Slots["38:49"].Count != 2 || equipment.Entries["32"].ItemID != 100380017 {
|
||||
t.Fatalf("rollback inventory=%+v equipment=%+v", inventory, equipment)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerInsertRejectsMissingInventoryBeforeProjection(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
called := false
|
||||
err = owner.Insert(ctx, Command{
|
||||
CharacterID: "77",
|
||||
Project: func(*Assets) (Changes, error) {
|
||||
called = true
|
||||
return Changes{}, nil
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, ErrInventoryMissing) || called {
|
||||
t.Fatalf("Insert error=%v called=%t", err, called)
|
||||
}
|
||||
}
|
||||
|
||||
func seedGuardianGemOwner(t *testing.T, ctx context.Context, repositories dnfrepo.Group) {
|
||||
t.Helper()
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{
|
||||
"38:49": {ItemID: 90002, Count: 2},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Equipment.Save(ctx, dnfrepo.EquipmentRecord{
|
||||
CharacterID: "77",
|
||||
Entries: map[string]dnfrepo.EquipmentEntry{
|
||||
"32": {ItemID: 100380017, SlotIndex: 32},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user