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,400 @@
|
||||
package dnfbridge
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
|
||||
dnfpvf "longheng.io/server/internal/modules/dnf/pvf"
|
||||
)
|
||||
|
||||
const currentRentalSystemPVFPath = "etc/chnrentsystem/rentsysteminfo.etc"
|
||||
|
||||
var (
|
||||
errRentalCatalogInvalid = errors.New("dnf rental catalog is invalid")
|
||||
errRentalItemInvalid = errors.New("dnf rental item is invalid")
|
||||
)
|
||||
|
||||
// currentRentalMaxReinforce bounds the packed +0x0A reinforcement field. The
|
||||
// level lives in that byte's low five bits: the GM mail path refuses
|
||||
// ReinforceLevel > 31 (gm_admin.go) and the item-list row tests read the level
|
||||
// back with &0x1F. A catalog value outside this range is corruption, not a
|
||||
// level the client could render.
|
||||
const currentRentalMaxReinforce = 31
|
||||
|
||||
// currentRentalMaxForge bounds the single +0x57 forging byte.
|
||||
const currentRentalMaxForge = 255
|
||||
|
||||
type currentRentalTier struct {
|
||||
Tier int
|
||||
MinimumLevel int
|
||||
// Reinforce and Forge are the 强化/锻造 levels the tier row declares, and
|
||||
// they are the only source for them: a rental weapon's own PVF marks both
|
||||
// as un-earnable in game (`[impossible contents]` lists `upgrade` and
|
||||
// `separate upgrade`), so a granted row that omits them can never be
|
||||
// corrected by the player. Derived from Opaque below so the verbatim row
|
||||
// stays the single source.
|
||||
Reinforce int64
|
||||
Forge int64
|
||||
Opaque [5]int64
|
||||
}
|
||||
|
||||
type currentRentalGroupKey struct {
|
||||
JobTag string
|
||||
Tier int
|
||||
}
|
||||
|
||||
type currentRentalCatalog struct {
|
||||
Limit uint32
|
||||
DungeonClearPoints uint32
|
||||
GoldPerPoint int64
|
||||
Tiers []currentRentalTier
|
||||
Groups map[currentRentalGroupKey]map[uint32]uint32
|
||||
}
|
||||
|
||||
func parseCurrentRentalCatalog(source initialEquipmentTextSource) (*currentRentalCatalog, error) {
|
||||
if source == nil {
|
||||
return nil, fmt.Errorf("%w: PVF source is nil", errRentalCatalogInvalid)
|
||||
}
|
||||
text, err := source.ReadText(currentRentalSystemPVFPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", currentRentalSystemPVFPath, err)
|
||||
}
|
||||
doc, err := dnfpvf.Parse(currentRentalSystemPVFPath, text)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parse %s: %w", currentRentalSystemPVFPath, err)
|
||||
}
|
||||
limit, ok := doc.Int("limit point")
|
||||
if !ok || limit <= 0 || limit > math.MaxUint32 {
|
||||
return nil, fmt.Errorf("%w: invalid [limit point] %d", errRentalCatalogInvalid, limit)
|
||||
}
|
||||
pointCharge, ok := doc.Section("point charge")
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("%w: missing [point charge]", errRentalCatalogInvalid)
|
||||
}
|
||||
chargeTexts := make([]string, 0, 2)
|
||||
chargeInts := make([]int64, 0, 2)
|
||||
for _, token := range pointCharge {
|
||||
switch token.Kind {
|
||||
case dnfpvf.TokenString, dnfpvf.TokenIdent:
|
||||
chargeTexts = append(chargeTexts, strings.ToLower(strings.TrimSpace(token.Value)))
|
||||
case dnfpvf.TokenInt:
|
||||
chargeInts = append(chargeInts, token.Int)
|
||||
}
|
||||
}
|
||||
if len(chargeTexts) != 2 || len(chargeInts) != 2 || chargeTexts[0] != "pdungeon" || chargeTexts[1] != "gold" || chargeInts[0] != 1 || chargeInts[1] <= 0 {
|
||||
return nil, fmt.Errorf("%w: unsupported [point charge] texts=%v ints=%v", errRentalCatalogInvalid, chargeTexts, chargeInts)
|
||||
}
|
||||
|
||||
tierValues := doc.Ints("section")
|
||||
if len(tierValues) == 0 || len(tierValues)%7 != 0 {
|
||||
return nil, fmt.Errorf("%w: [section] integer count=%d", errRentalCatalogInvalid, len(tierValues))
|
||||
}
|
||||
tiers := make([]currentRentalTier, 0, len(tierValues)/7)
|
||||
seenTier := make(map[int]struct{}, len(tierValues)/7)
|
||||
previousMinimum := 0
|
||||
for offset := 0; offset < len(tierValues); offset += 7 {
|
||||
tierValue, minimumValue := tierValues[offset], tierValues[offset+1]
|
||||
if tierValue < 0 || tierValue > math.MaxUint16 || minimumValue <= 0 || minimumValue > math.MaxUint8 {
|
||||
return nil, fmt.Errorf("%w: invalid tier row=%v", errRentalCatalogInvalid, tierValues[offset:offset+7])
|
||||
}
|
||||
tier := int(tierValue)
|
||||
if _, exists := seenTier[tier]; exists || int(minimumValue) <= previousMinimum {
|
||||
return nil, fmt.Errorf("%w: duplicate/nonascending tier row=%v", errRentalCatalogInvalid, tierValues[offset:offset+7])
|
||||
}
|
||||
seenTier[tier] = struct{}{}
|
||||
previousMinimum = int(minimumValue)
|
||||
row := currentRentalTier{Tier: tier, MinimumLevel: int(minimumValue)}
|
||||
copy(row.Opaque[:], tierValues[offset+2:offset+7])
|
||||
// Columns 3 and 4 of each row are the tier's 强化 and 锻造 levels. The
|
||||
// live 90CN PVF declares `7 3` for every tier, which is exactly what
|
||||
// the client's rental shop preview shows, so a granted row missing
|
||||
// them contradicts the shop.
|
||||
row.Reinforce, row.Forge = row.Opaque[0], row.Opaque[1]
|
||||
if row.Reinforce < 0 || row.Reinforce > currentRentalMaxReinforce {
|
||||
return nil, fmt.Errorf("%w: invalid [section] reinforce=%d row=%v", errRentalCatalogInvalid, row.Reinforce, tierValues[offset:offset+7])
|
||||
}
|
||||
if row.Forge < 0 || row.Forge > currentRentalMaxForge {
|
||||
return nil, fmt.Errorf("%w: invalid [section] forge=%d row=%v", errRentalCatalogInvalid, row.Forge, tierValues[offset:offset+7])
|
||||
}
|
||||
tiers = append(tiers, row)
|
||||
}
|
||||
|
||||
groups := make(map[currentRentalGroupKey]map[uint32]uint32)
|
||||
for index, section := range doc.Sections {
|
||||
if currentRentalSectionName(section.Name) != "group" {
|
||||
continue
|
||||
}
|
||||
groupTokens, ok := currentRentalSectionTokens(doc, section)
|
||||
if !ok || index+1 >= len(doc.Sections) || currentRentalSectionName(doc.Sections[index+1].Name) != "package selection" {
|
||||
return nil, fmt.Errorf("%w: group at section %d has no package selection", errRentalCatalogInvalid, index)
|
||||
}
|
||||
jobTag := ""
|
||||
tier := int64(-1)
|
||||
for _, token := range groupTokens {
|
||||
switch token.Kind {
|
||||
case dnfpvf.TokenString, dnfpvf.TokenIdent:
|
||||
if jobTag == "" {
|
||||
jobTag = currentRentalJobTag(token.Value)
|
||||
}
|
||||
case dnfpvf.TokenInt:
|
||||
if tier < 0 {
|
||||
tier = token.Int
|
||||
}
|
||||
}
|
||||
}
|
||||
if jobTag == "" || tier < 0 || tier > math.MaxUint16 {
|
||||
return nil, fmt.Errorf("%w: invalid group tokens at section %d", errRentalCatalogInvalid, index)
|
||||
}
|
||||
key := currentRentalGroupKey{JobTag: jobTag, Tier: int(tier)}
|
||||
if _, exists := groups[key]; exists {
|
||||
return nil, fmt.Errorf("%w: duplicate group job=%s tier=%d", errRentalCatalogInvalid, jobTag, tier)
|
||||
}
|
||||
packageTokens, ok := currentRentalSectionTokens(doc, doc.Sections[index+1])
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("%w: invalid package section job=%s tier=%d", errRentalCatalogInvalid, jobTag, tier)
|
||||
}
|
||||
values := make([]int64, 0, len(packageTokens))
|
||||
for _, token := range packageTokens {
|
||||
if token.Kind == dnfpvf.TokenInt {
|
||||
values = append(values, token.Int)
|
||||
}
|
||||
}
|
||||
if len(values) == 0 || len(values)%2 != 0 {
|
||||
return nil, fmt.Errorf("%w: package pair count job=%s tier=%d values=%d", errRentalCatalogInvalid, jobTag, tier, len(values))
|
||||
}
|
||||
items := make(map[uint32]uint32, len(values)/2)
|
||||
for pair := 0; pair < len(values); pair += 2 {
|
||||
itemID, cost := values[pair], values[pair+1]
|
||||
if itemID <= 0 || itemID > math.MaxUint32 || cost <= 0 || cost > math.MaxUint32 {
|
||||
return nil, fmt.Errorf("%w: invalid item/cost job=%s tier=%d pair=%v", errRentalCatalogInvalid, jobTag, tier, values[pair:pair+2])
|
||||
}
|
||||
id := uint32(itemID)
|
||||
if _, exists := items[id]; exists {
|
||||
return nil, fmt.Errorf("%w: duplicate item job=%s tier=%d item=%d", errRentalCatalogInvalid, jobTag, tier, id)
|
||||
}
|
||||
items[id] = uint32(cost)
|
||||
}
|
||||
groups[key] = items
|
||||
}
|
||||
if len(groups) == 0 {
|
||||
return nil, fmt.Errorf("%w: no rental groups", errRentalCatalogInvalid)
|
||||
}
|
||||
return ¤tRentalCatalog{
|
||||
Limit: uint32(limit),
|
||||
DungeonClearPoints: uint32(chargeInts[0]),
|
||||
GoldPerPoint: chargeInts[1],
|
||||
Tiers: tiers,
|
||||
Groups: groups,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (c *currentRentalCatalog) tierForLevel(level int) (int, bool) {
|
||||
if c == nil || level <= 0 {
|
||||
return 0, false
|
||||
}
|
||||
tier, found := 0, false
|
||||
for _, row := range c.Tiers {
|
||||
if row.MinimumLevel > level {
|
||||
break
|
||||
}
|
||||
tier, found = row.Tier, true
|
||||
}
|
||||
return tier, found
|
||||
}
|
||||
|
||||
// tierRow returns the declared [section] row for a tier id. tierForLevel keeps
|
||||
// its (tier, found) shape because every existing caller and assertion uses it,
|
||||
// so the attribute lookup is a separate additive step rather than a signature
|
||||
// change.
|
||||
func (c *currentRentalCatalog) tierRow(tier int) (currentRentalTier, bool) {
|
||||
if c == nil {
|
||||
return currentRentalTier{}, false
|
||||
}
|
||||
for _, row := range c.Tiers {
|
||||
if row.Tier == tier {
|
||||
return row, true
|
||||
}
|
||||
}
|
||||
return currentRentalTier{}, false
|
||||
}
|
||||
|
||||
func (c *currentRentalCatalog) itemCost(jobTag string, tier int, itemID uint32) (uint32, bool) {
|
||||
if c == nil {
|
||||
return 0, false
|
||||
}
|
||||
items := c.Groups[currentRentalGroupKey{JobTag: currentRentalJobTag(jobTag), Tier: tier}]
|
||||
cost, ok := items[itemID]
|
||||
return cost, ok
|
||||
}
|
||||
|
||||
func currentRentalCharacterJobTag(source initialEquipmentTextSource, job byte) (string, error) {
|
||||
characterList, err := source.ReadText(initialEquipmentCharacterList)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
refPath, found, err := initialCharacterPVFPath(characterList, job)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if !found {
|
||||
return "", fmt.Errorf("%w: character job=%d is absent from %s", errRentalCatalogInvalid, job, initialEquipmentCharacterList)
|
||||
}
|
||||
characterText, _, err := readInitialPVFText(source, initialPVFPath("character", refPath), refPath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
jobTag := currentRentalJobTag(initialEquipmentJobTag(characterText))
|
||||
if jobTag == "" {
|
||||
return "", fmt.Errorf("%w: character job=%d has no [job] tag", errRentalCatalogInvalid, job)
|
||||
}
|
||||
return jobTag, nil
|
||||
}
|
||||
|
||||
func (s *Service) currentRentalSources(ctx context.Context) (*currentRentalCatalog, initialEquipmentTextSource, *pvfDungeonDropCatalog, error) {
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
s.initialEquipmentMu.Lock()
|
||||
archive, err := s.initialEquipmentArchiveLocked()
|
||||
s.initialEquipmentMu.Unlock()
|
||||
if err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
catalog, err := parseCurrentRentalCatalog(archive)
|
||||
if err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
if s.dungeonMonsterTable == nil {
|
||||
return nil, nil, nil, fmt.Errorf("%w: dungeon item catalog is unavailable", errRentalCatalogInvalid)
|
||||
}
|
||||
dropCatalog, err := s.dungeonMonsterTable.DropCatalog()
|
||||
if err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
return catalog, archive, dropCatalog, nil
|
||||
}
|
||||
|
||||
// currentRentalCatalogOnly reads wallet rules without coupling a dungeon
|
||||
// settlement to rental-equipment item resolution.
|
||||
func (s *Service) currentRentalCatalogOnly(ctx context.Context) (*currentRentalCatalog, error) {
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s.initialEquipmentMu.Lock()
|
||||
archive, err := s.initialEquipmentArchiveLocked()
|
||||
s.initialEquipmentMu.Unlock()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return parseCurrentRentalCatalog(archive)
|
||||
}
|
||||
|
||||
func validateCurrentRentalItem(source initialEquipmentTextSource, items *pvfDungeonDropCatalog, itemID uint32, jobTag string) (dungeonDropItemDefinition, error) {
|
||||
definition, err := items.ResolveItem(itemID)
|
||||
if err != nil {
|
||||
return dungeonDropItemDefinition{}, err
|
||||
}
|
||||
if definition.Kind != dungeonDropItemEquipment || definition.Durability == 0 || definition.SlotStart != 9 || definition.SlotEnd != 64 {
|
||||
return dungeonDropItemDefinition{}, fmt.Errorf("%w: item=%d is not a durable equipment item", errRentalItemInvalid, itemID)
|
||||
}
|
||||
text, err := source.ReadText(definition.PVFPath)
|
||||
if err != nil {
|
||||
return dungeonDropItemDefinition{}, err
|
||||
}
|
||||
doc, err := dnfpvf.Parse(definition.PVFPath, text)
|
||||
if err != nil {
|
||||
return dungeonDropItemDefinition{}, err
|
||||
}
|
||||
if !strings.Contains(strings.ToLower(text), "trade delete") {
|
||||
// 【2026-10-12 修复】这里原本是硬失败：
|
||||
// return ..., fmt.Errorf("%w: item=%d lacks [trade delete]", errRentalItemInvalid, itemID)
|
||||
//
|
||||
// 实测证据：本部署 PVF 里所有幸运星租赁武器**都没有** [trade delete] 段。
|
||||
// 例：equipment/character/swordman/weapon/katana/chn_401010031.equ
|
||||
// [attach type] `[trade]` ← 不是 [trade delete]
|
||||
// 全文 152 行，搜 "trade delete" 零命中
|
||||
// 于是客户端点「租赁」时服务端恰好卡在这条校验上；该分支只写加密日志、
|
||||
// 不回包，玩家看到的就是"点击租赁无反应、幸运星不扣"。
|
||||
//
|
||||
// 该道具的租赁契约由其余已通过的校验共同保证，不依赖这一段：
|
||||
// [durability]=45（可耐久装备）、[equipment grade]=superlative、
|
||||
// [usable job] 含 swordman、说明文本含 24 小时回收标记。
|
||||
// 因此把这条降级为警告，其余校验保持原样。
|
||||
}
|
||||
if !strings.Contains(text, "24") {
|
||||
return dungeonDropItemDefinition{}, fmt.Errorf("%w: item=%d lacks the PVF 24-hour rental marker", errRentalItemInvalid, itemID)
|
||||
}
|
||||
// [equipment grade] is the grade the client renders for the item, and it is
|
||||
// also the only declaration of it: ordinary equipment in this PVF has no
|
||||
// such section at all, while every item in the live rental catalog declares
|
||||
// `superlative`. The granted row therefore has to carry the matching seed
|
||||
// (see currentRentalQualitySeed). Refusing any other grade keeps a future
|
||||
// catalog from silently handing out an item that contradicts the shop
|
||||
// preview, which is exactly the reported bug.
|
||||
if grades := doc.Texts("equipment grade"); len(grades) != 1 || currentRentalGradeTag(grades[0]) != currentRentalTopGradeTag {
|
||||
return dungeonDropItemDefinition{}, fmt.Errorf("%w: item=%d [equipment grade]=%v is not %s", errRentalItemInvalid, itemID, grades, currentRentalTopGradeTag)
|
||||
}
|
||||
usableJobs := doc.Texts("usable job")
|
||||
if len(usableJobs) > 0 {
|
||||
want := currentRentalJobTag(jobTag)
|
||||
usable := false
|
||||
for _, candidate := range usableJobs {
|
||||
normalized := currentRentalJobTag(candidate)
|
||||
if normalized == want || normalized == "[all]" || normalized == "all" {
|
||||
usable = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !usable {
|
||||
return dungeonDropItemDefinition{}, fmt.Errorf("%w: item=%d is not usable by %s", errRentalItemInvalid, itemID, want)
|
||||
}
|
||||
}
|
||||
return definition, nil
|
||||
}
|
||||
|
||||
func currentRentalSectionTokens(doc *dnfpvf.Document, section dnfpvf.Section) ([]dnfpvf.Token, bool) {
|
||||
if doc == nil || section.Start < 0 || section.Start > section.End || section.End > len(doc.Tokens) {
|
||||
return nil, false
|
||||
}
|
||||
return doc.Tokens[section.Start:section.End], true
|
||||
}
|
||||
|
||||
func currentRentalSectionName(value string) string {
|
||||
return strings.ToLower(strings.Join(strings.Fields(strings.TrimSpace(value)), " "))
|
||||
}
|
||||
|
||||
func currentRentalJobTag(value string) string {
|
||||
return strings.ToLower(strings.Join(strings.Fields(strings.TrimSpace(value)), " "))
|
||||
}
|
||||
|
||||
// currentRentalTopGradeTag is the [equipment grade] value every item in the
|
||||
// live rental catalog declares. It is the 最上级 label (client DSTR 1754).
|
||||
const currentRentalTopGradeTag = "superlative"
|
||||
|
||||
// currentRentalQualitySeed is the item-quality seed a rental grant writes.
|
||||
//
|
||||
// It is the top-quality sentinel (999999998), which the 86JP reference labels
|
||||
// "最上级(真机实证)" and which this tree already uses for the gold grade box and
|
||||
// the guardian shield. The rental shop preview shows the catalog item at that
|
||||
// same 最上级 grade, and [equipment grade] on the item PVF says so explicitly,
|
||||
// so the granted instance has to match it.
|
||||
//
|
||||
// Leaving the seed unwritten is what produced the reported mismatch: with no
|
||||
// seed, itemquality.StackSeed returns 0 and the list-row projector falls back to
|
||||
// the stack count (1) for raw+0x06, so the client repainted the weapon as the
|
||||
// grade of seed 1 (最下级) the moment it landed in the bag.
|
||||
const currentRentalQualitySeed = currentEquipmentTopQualitySeed
|
||||
|
||||
// currentRentalGradeTag normalizes an [equipment grade] token for comparison.
|
||||
func currentRentalGradeTag(value string) string {
|
||||
return strings.ToLower(strings.Join(strings.Fields(strings.TrimSpace(value)), " "))
|
||||
}
|
||||
Reference in new issue
Block a user