DNF90 服务端与启动器完整源码(含 GM 工具功能增强)
服务端(Go): - GM 塞背包/带属性装备发放:在线角色推送 op14 增量物品行,背包实时刷新,无需回角色选择界面 - GM 改金币/改等级:去掉在线拒绝,落库后推送 op14 钱包/op37 等级状态,在线实时刷新 - 等级端点统一切换到新版 GMSetCharacterLevel(自带在线刷新) - 无限/锁死疲劳模式 + 燃烧疲劳:每房间消耗 2 点、打怪与通关经验双倍 - 燃烧疲劳开关时给所有在线角色推送系统提示(op12 mode 0) - 深渊史诗掉率:GM 全局倍率 + 城镇增益药剂窗口倍率,真实接入掉落结算 启动器(Python/JS): - 标题栏自绘、窗口 1204x717、禁止拖拽改大小、仅最小化/关闭 - GM 工具:疲劳与燃烧、深渊史诗掉率、拍卖行上架(单一定价对齐) - 拍卖行上架前端对齐服务端单一价格语义,修复 400 报错
This commit is contained in:
commit
645b64fe21
4388 files changed
+1405457
No files matched your search
@@ -0,0 +1,142 @@
|
||||
package socketemblem
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrOwnerUnavailable = errors.New("socket and emblem owner is unavailable")
|
||||
ErrCharacterRequired = errors.New("socket and emblem character id is required")
|
||||
ErrInventoryNotFound = errors.New("socket and emblem inventory is not found")
|
||||
ErrProjectorRequired = errors.New("socket and emblem mutation projector is required")
|
||||
)
|
||||
|
||||
// Assets are transaction-local clones. The bridge projector may translate
|
||||
// current-client raw rows, but only this owner commits the resulting aggregate
|
||||
// changes.
|
||||
type Assets struct {
|
||||
Inventory *dnfrepo.InventoryRecord
|
||||
Equipment *dnfrepo.EquipmentRecord
|
||||
EquipmentFound bool
|
||||
}
|
||||
|
||||
type Changes struct {
|
||||
Inventory bool
|
||||
Equipment bool
|
||||
}
|
||||
|
||||
type Projector func(*Assets) (Changes, error)
|
||||
|
||||
type Command struct {
|
||||
CharacterID string
|
||||
UpdatedAt time.Time
|
||||
Project Projector
|
||||
}
|
||||
|
||||
// Owner is the durable boundary shared by the four independently registered
|
||||
// socket/emblem gameplays.
|
||||
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) OpenEquipmentSocket(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "equipment-socket-open", command)
|
||||
}
|
||||
|
||||
func (o *Owner) AttachEquipmentEmblems(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "equipment-emblem-attach", command)
|
||||
}
|
||||
|
||||
func (o *Owner) OpenAvatarSocket(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "avatar-socket-open", command)
|
||||
}
|
||||
|
||||
func (o *Owner) AttachAvatarEmblems(ctx context.Context, command Command) error {
|
||||
return o.mutate(ctx, "avatar-emblem-attach", command)
|
||||
}
|
||||
|
||||
func (o *Owner) mutate(ctx context.Context, operation string, 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,
|
||||
equipment dnfrepo.EquipmentRepository,
|
||||
) error {
|
||||
if inventories == nil || equipment == nil {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
inventory, found, err := inventories.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !found || strings.TrimSpace(inventory.CharacterID) != characterID {
|
||||
return fmt.Errorf("%w: character=%s operation=%s", ErrInventoryNotFound, characterID, operation)
|
||||
}
|
||||
equipmentRecord, equipmentFound, err := equipment.Load(ctx, characterID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if equipmentFound && strings.TrimSpace(equipmentRecord.CharacterID) != characterID {
|
||||
return ErrOwnerUnavailable
|
||||
}
|
||||
|
||||
inventory = dnfrepo.CloneInventory(inventory)
|
||||
equipmentRecord = dnfrepo.CloneEquipment(equipmentRecord)
|
||||
changes, err := command.Project(&Assets{
|
||||
Inventory: &inventory,
|
||||
Equipment: &equipmentRecord,
|
||||
EquipmentFound: equipmentFound,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if changes.Inventory {
|
||||
inventory.UpdatedAt = now
|
||||
if err := dnfrepo.SaveInventoryFields(ctx, inventories, inventory, dnfrepo.InventoryFieldSlots); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if changes.Equipment {
|
||||
if !equipmentFound {
|
||||
return fmt.Errorf("%w: character=%s operation=%s equipment missing", ErrOwnerUnavailable, characterID, operation)
|
||||
}
|
||||
equipmentRecord.UpdatedAt = now
|
||||
if err := dnfrepo.SaveEquipmentFields(ctx, equipment, equipmentRecord, dnfrepo.EquipmentFieldEntries); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
package socketemblem
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
dnfrepo "longheng.io/server/internal/modules/dnf/repository"
|
||||
dnfrepomemory "longheng.io/server/internal/modules/dnf/repository/memory"
|
||||
)
|
||||
|
||||
func TestOwnerCommitsInventoryAndEquipmentTogether(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{
|
||||
"0:8": {ItemID: 6001, Count: 1},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repositories.Equipment.Save(ctx, dnfrepo.EquipmentRecord{
|
||||
CharacterID: "77",
|
||||
Entries: map[string]dnfrepo.EquipmentEntry{
|
||||
"17": {SlotIndex: 17, ItemID: 9001},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = owner.AttachEquipmentEmblems(ctx, Command{
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "0:8")
|
||||
entry := assets.Equipment.Entries["17"]
|
||||
entry.Extra = map[string]string{"equipment_emblem_data": "02"}
|
||||
assets.Equipment.Entries["17"] = entry
|
||||
return Changes{Inventory: true, Equipment: true}, nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
inventory, found, err := repositories.Inventory.Load(ctx, "77")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load inventory found=%v err=%v", found, err)
|
||||
}
|
||||
if _, found := inventory.Slots["0:8"]; found {
|
||||
t.Fatalf("consumed stack persisted: %+v", inventory.Slots)
|
||||
}
|
||||
equipment, found, err := repositories.Equipment.Load(ctx, "77")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load equipment found=%v err=%v", found, err)
|
||||
}
|
||||
if equipment.Entries["17"].Extra["equipment_emblem_data"] != "02" {
|
||||
t.Fatalf("equipment projection not persisted: %+v", equipment.Entries["17"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerRollsBackProjectorFailure(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{
|
||||
"0:8": {ItemID: 6001, Count: 1},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
wantErr := errors.New("projection failed")
|
||||
err = owner.OpenAvatarSocket(ctx, Command{
|
||||
CharacterID: "77",
|
||||
Project: func(assets *Assets) (Changes, error) {
|
||||
delete(assets.Inventory.Slots, "0:8")
|
||||
return Changes{Inventory: true}, wantErr
|
||||
},
|
||||
})
|
||||
if !errors.Is(err, wantErr) {
|
||||
t.Fatalf("OpenAvatarSocket() error=%v want=%v", err, wantErr)
|
||||
}
|
||||
inventory, found, err := repositories.Inventory.Load(ctx, "77")
|
||||
if err != nil || !found {
|
||||
t.Fatalf("load inventory found=%v err=%v", found, err)
|
||||
}
|
||||
if inventory.Slots["0:8"].Count != 1 {
|
||||
t.Fatalf("failed projection leaked mutation: %+v", inventory.Slots)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOwnerExposesFourGameplayBoundaries(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
repositories := dnfrepomemory.NewMemoryGroup()
|
||||
if err := repositories.Inventory.Save(ctx, dnfrepo.InventoryRecord{
|
||||
CharacterID: "77",
|
||||
Slots: map[string]dnfrepo.ItemStack{},
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
owner, err := NewOwner(repositories)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
command := Command{
|
||||
CharacterID: "77",
|
||||
Project: func(*Assets) (Changes, error) {
|
||||
return Changes{}, nil
|
||||
},
|
||||
}
|
||||
for name, apply := range map[string]func(context.Context, Command) error{
|
||||
"equipment socket": owner.OpenEquipmentSocket,
|
||||
"equipment emblem": owner.AttachEquipmentEmblems,
|
||||
"avatar socket": owner.OpenAvatarSocket,
|
||||
"avatar emblem": owner.AttachAvatarEmblems,
|
||||
} {
|
||||
if err := apply(ctx, command); err != nil {
|
||||
t.Fatalf("%s: %v", name, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user