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,203 @@
|
||||
package worldmap
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrMapChoiceRequired = errors.New("dnf dungeon map choice is required")
|
||||
ErrMapChoiceRejected = errors.New("dnf dungeon map choice is not a candidate")
|
||||
)
|
||||
|
||||
type DungeonMapChoice struct {
|
||||
DungeonID int64 `json:"dungeon_id"`
|
||||
MazeIndex int `json:"maze_index"`
|
||||
Coordinate RoomCoordinate `json:"coordinate"`
|
||||
FileType MapFileType `json:"file_type"`
|
||||
Source ResolutionSource `json:"source"`
|
||||
Candidates []Map `json:"candidates"`
|
||||
}
|
||||
|
||||
type DungeonMapChooser func(choice DungeonMapChoice) (mapID int64, err error)
|
||||
|
||||
func BuildDungeonLayout(
|
||||
resolver *Resolver,
|
||||
dungeonID int64,
|
||||
mazeIndex int,
|
||||
chooser DungeonMapChooser,
|
||||
) (*DungeonTopology, error) {
|
||||
topology, err := BuildDungeonTopology(resolver, dungeonID, mazeIndex)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
dungeonIndex := resolver.byDungeon[dungeonID]
|
||||
maze := resolver.table.dungeons[dungeonIndex.dungeonPos].Mazes[mazeIndex]
|
||||
|
||||
for key, room := range topology.rooms {
|
||||
if room.Map != nil {
|
||||
continue
|
||||
}
|
||||
request := ResolveRequest{
|
||||
DungeonID: dungeonID, MazeIndex: mazeIndex,
|
||||
X: room.Coordinate.X, Y: room.Coordinate.Y,
|
||||
}
|
||||
candidates, candidateErr := resolver.ResolveCandidates(request)
|
||||
if candidateErr != nil && !errors.Is(candidateErr, ErrMapUnresolved) {
|
||||
return nil, candidateErr
|
||||
}
|
||||
fileType := expectedMapFileType(maze, key)
|
||||
source := ResolutionSource("")
|
||||
if len(candidates) > 0 {
|
||||
source = candidates[0].Source
|
||||
} else {
|
||||
pool, poolFileType, poolErr := dungeonLayoutPoolCandidates(
|
||||
resolver,
|
||||
dungeonID,
|
||||
mazeIndex,
|
||||
fileType,
|
||||
room,
|
||||
)
|
||||
if poolErr != nil {
|
||||
// PVF special dungeons can expose logical greed/boss coordinates
|
||||
// without assigning a MAP resource to every cell. The current
|
||||
// client only needs the entrance MAP during SELECT_DUNGEON; later
|
||||
// mechanism/warp movement resolves its target independently. Keep
|
||||
// the parser evidence on non-start cells instead of inventing a
|
||||
// type-pool map or rejecting the entire dungeon up front.
|
||||
if !room.Start && errors.Is(poolErr, ErrMapPoolEmpty) {
|
||||
continue
|
||||
}
|
||||
return nil, fmt.Errorf(
|
||||
"assign dungeon room map %s: coordinate_error=%v pool_error=%w",
|
||||
room.Coordinate, candidateErr, poolErr,
|
||||
)
|
||||
}
|
||||
source = ResolutionTypePool
|
||||
fileType = poolFileType
|
||||
candidates = make([]ResolvedMap, 0, len(pool))
|
||||
for _, mapValue := range pool {
|
||||
candidates = append(candidates, ResolvedMap{Map: mapValue, Source: source})
|
||||
}
|
||||
}
|
||||
|
||||
choice := DungeonMapChoice{
|
||||
DungeonID: dungeonID, MazeIndex: mazeIndex, Coordinate: room.Coordinate,
|
||||
FileType: fileType, Source: source, Candidates: resolvedCandidateMaps(candidates),
|
||||
}
|
||||
selected, selectErr := selectDungeonMapCandidate(choice, chooser)
|
||||
if selectErr != nil {
|
||||
return nil, selectErr
|
||||
}
|
||||
room.Map = &selected
|
||||
room.ResolutionError = ""
|
||||
topology.rooms[key] = room
|
||||
delete(topology.resolutionErrors, key)
|
||||
topology.Diagnostics = removeRoomResolutionDiagnostic(topology.Diagnostics, room.Coordinate)
|
||||
}
|
||||
return topology, nil
|
||||
}
|
||||
|
||||
func dungeonLayoutPoolCandidates(
|
||||
resolver *Resolver,
|
||||
dungeonID int64,
|
||||
mazeIndex int,
|
||||
fileType MapFileType,
|
||||
room DungeonRoom,
|
||||
) ([]Map, MapFileType, error) {
|
||||
request := MapPoolRequest{DungeonID: dungeonID, MazeIndex: mazeIndex, FileType: fileType}
|
||||
pool, err := resolver.PoolCandidates(request)
|
||||
if err == nil {
|
||||
return pool, fileType, nil
|
||||
}
|
||||
for _, fallbackType := range dungeonLayoutFallbackPoolFileTypes(fileType, room) {
|
||||
fallbackRequest := MapPoolRequest{DungeonID: dungeonID, MazeIndex: mazeIndex, FileType: fallbackType}
|
||||
fallbackPool, fallbackErr := resolver.PoolCandidates(fallbackRequest)
|
||||
if fallbackErr == nil {
|
||||
return fallbackPool, fallbackType, nil
|
||||
}
|
||||
}
|
||||
return nil, fileType, err
|
||||
}
|
||||
|
||||
func dungeonLayoutFallbackPoolFileTypes(fileType MapFileType, room DungeonRoom) []MapFileType {
|
||||
if fileType != MapFileBoss || !room.Start || !room.Boss {
|
||||
return nil
|
||||
}
|
||||
// Tower-style single-room floors declare the only room as both start and
|
||||
// boss in the .dgn, while the owned .map is a normal uncoordinated map
|
||||
// (for example towerofdespair_down/15130despair001.map). Prefer the real
|
||||
// dungeon-owned normal pool; accept a start pool as a narrow fallback for
|
||||
// the same start==boss shape.
|
||||
return []MapFileType{MapFileNormal, MapFileStart}
|
||||
}
|
||||
|
||||
func selectDungeonMapCandidate(choice DungeonMapChoice, chooser DungeonMapChooser) (ResolvedMap, error) {
|
||||
if len(choice.Candidates) == 0 {
|
||||
return ResolvedMap{}, fmt.Errorf(
|
||||
"%w: dungeon=%d maze=%d room=%s file_type=%s",
|
||||
ErrMapPoolEmpty, choice.DungeonID, choice.MazeIndex, choice.Coordinate, choice.FileType,
|
||||
)
|
||||
}
|
||||
if len(choice.Candidates) == 1 && chooser == nil {
|
||||
return ResolvedMap{Map: cloneMap(choice.Candidates[0]), Source: choice.Source}, nil
|
||||
}
|
||||
if chooser == nil {
|
||||
return ResolvedMap{}, fmt.Errorf(
|
||||
"%w: dungeon=%d maze=%d room=%s file_type=%s candidates=%v",
|
||||
ErrMapChoiceRequired, choice.DungeonID, choice.MazeIndex, choice.Coordinate,
|
||||
choice.FileType, mapIDs(choice.Candidates),
|
||||
)
|
||||
}
|
||||
mapID, err := chooser(cloneDungeonMapChoice(choice))
|
||||
if err != nil {
|
||||
return ResolvedMap{}, err
|
||||
}
|
||||
for _, candidate := range choice.Candidates {
|
||||
if candidate.ID == mapID {
|
||||
return ResolvedMap{Map: cloneMap(candidate), Source: choice.Source}, nil
|
||||
}
|
||||
}
|
||||
return ResolvedMap{}, fmt.Errorf(
|
||||
"%w: dungeon=%d maze=%d room=%s map_id=%d candidates=%v",
|
||||
ErrMapChoiceRejected, choice.DungeonID, choice.MazeIndex, choice.Coordinate,
|
||||
mapID, mapIDs(choice.Candidates),
|
||||
)
|
||||
}
|
||||
|
||||
func resolvedCandidateMaps(values []ResolvedMap) []Map {
|
||||
out := make([]Map, 0, len(values))
|
||||
for _, value := range values {
|
||||
out = append(out, cloneMap(value.Map))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func cloneDungeonMapChoice(in DungeonMapChoice) DungeonMapChoice {
|
||||
candidates := in.Candidates
|
||||
in.Candidates = make([]Map, len(candidates))
|
||||
for index, candidate := range candidates {
|
||||
in.Candidates[index] = cloneMap(candidate)
|
||||
}
|
||||
return in
|
||||
}
|
||||
|
||||
func mapIDs(values []Map) []int64 {
|
||||
out := make([]int64, len(values))
|
||||
for index, value := range values {
|
||||
out[index] = value.ID
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func removeRoomResolutionDiagnostic(values []TopologyDiagnostic, coordinate RoomCoordinate) []TopologyDiagnostic {
|
||||
out := values[:0]
|
||||
for _, diagnostic := range values {
|
||||
if diagnostic.Code == "room_map_unresolved" && diagnostic.Coordinate != nil &&
|
||||
diagnostic.Coordinate.X == coordinate.X && diagnostic.Coordinate.Y == coordinate.Y {
|
||||
continue
|
||||
}
|
||||
out = append(out, diagnostic)
|
||||
}
|
||||
return out
|
||||
}
|
||||
Reference in new issue
Block a user