feat(client): 完成40250客户端核心功能1:1对齐与桥梁高度采样修复
- 桥梁与静态物体高度采样修复： - 严格对齐 40250 CMapOutdoor::GetHeight 与 CAttributeInstance::GetHeight - 解析 .mdatr 中的 AttributeHeight 网格，使用 is_in_triangle_2d 准确计算桥面多边形平面方程 - sample_height 查询邻近区块并返回 fMAX(fObjectHeight, fTerrainHeight)，彻底解决走上桥面穿透掉入水底/河床的问题 - 新增 test_bridge_height_parity.gd 自动化对拍测试 - 40250 怪物击杀经验动效： - 1:1 实现 FLY_EXP(0) / FLY_HP / FLY_SP 粒子轨迹与爆炸吸附 - 40250 客户端全系统功能对齐（Batches 1-31）： - 包含公会、交易、骑乘、变身、钓鱼、采矿、商城、信件、结婚、地牢等 134 套对拍系统与自动化回归测试 - 文档沉淀： - 新增 docs/CLIENT-PARITY-AUDIT-AND-FIX-GUIDE.md 客户端对拍缺陷发现与修复工程指南
This commit is contained in:
shen
+131
-6
@@ -4,6 +4,9 @@ extends SceneTree
|
||||
|
||||
const ItemListDB = preload("res://ui/item_list.gd")
|
||||
const EquipModel = preload("res://ui/equip_model.gd")
|
||||
const PlayerView = preload("res://ui/player_view.gd")
|
||||
const EffectRegistry = preload("res://fx/effect_registry.gd")
|
||||
const MotionEffectAnchor = preload("res://fx/motion_effect_anchor.gd")
|
||||
|
||||
class FakeClient extends Node:
|
||||
signal inventory_changed(window: int, cell: int)
|
||||
@@ -28,6 +31,17 @@ class StubModel extends Node3D:
|
||||
var gr2_path := ""
|
||||
var hair_gr2 := ""
|
||||
var hair_skin := "-"
|
||||
var weapon_bone := "equip_right_hand"
|
||||
var shield_bone := "equip_left"
|
||||
var skin_source := ""
|
||||
var skin_target := ""
|
||||
var specular_power := -1.0
|
||||
func clear_skin_textures():
|
||||
skin_source = ""
|
||||
skin_target = ""
|
||||
func set_skin_texture(source: String, target: String):
|
||||
skin_source = source
|
||||
skin_target = target
|
||||
func _set(prop, val):
|
||||
match String(prop):
|
||||
"weapon_gr2": weapon_gr2 = val; return true
|
||||
@@ -35,14 +49,28 @@ class StubModel extends Node3D:
|
||||
"gr2_path": gr2_path = val; return true
|
||||
"hair_gr2": hair_gr2 = val; return true
|
||||
"hair_skin": hair_skin = val; return true
|
||||
"specular_power": specular_power = val; return true
|
||||
return false
|
||||
|
||||
class FakeEffectRegistry extends RefCounted:
|
||||
var calls: Array = []
|
||||
func setup(_assets: String) -> void: pass
|
||||
func spawn(effect: String, parent: Node3D, one_shot := true) -> Node3D:
|
||||
calls.append({"effect": effect, "parent": parent.name, "one_shot": one_shot})
|
||||
var node := Node3D.new()
|
||||
parent.add_child(node)
|
||||
return node
|
||||
|
||||
class FakeAnimator extends Node:
|
||||
func get_effect_bone_pose(_bone: String) -> Dictionary:
|
||||
return {"transform": Transform3D.IDENTITY}
|
||||
|
||||
# item_proto 桩：只给武器 subtype（WEAPON_DAGGER=1 BOW=2 FAN=5，item_length.h EWeaponSubTypes）
|
||||
class FakeProto extends Node:
|
||||
const SUB := {19: 0, 2000: 2, 4000: 1, 7000: 5}
|
||||
const SUB := {19: 0, 2000: 2, 3151: 3, 3159: 3, 4000: 1, 7000: 5}
|
||||
func item(vnum: int) -> Dictionary:
|
||||
if SUB.has(vnum):
|
||||
return {"type": 1, "sub_type": SUB[vnum]}
|
||||
return {"type": 1, "sub_type": SUB[vnum], "gain_socket_pct": 3}
|
||||
return {}
|
||||
|
||||
var _fail := 0
|
||||
@@ -75,6 +103,53 @@ func _run() -> void:
|
||||
_ck(il.icon(19) == "icon/item/00010.tga", "item_list.icon(19)")
|
||||
_ck(il.type_of(19) == "WEAPON", "item_list.type_of(19)")
|
||||
|
||||
# InstanceBase::__GetRefinedEffect parity. Standard equipment carries
|
||||
# gain_socket_pct=3, making the final vnum digit its visible refine level.
|
||||
var heavy_1 := {"type": 1, "sub_type": 3, "gain_socket_pct": 3}
|
||||
var heavy_9 := {"type": 1, "sub_type": 3, "gain_socket_pct": 3}
|
||||
_ck(EquipModel.refine_effect_level(3151, heavy_1) == 1,
|
||||
"3151 -> refine +1")
|
||||
_ck(EquipModel.refine_effect_specs(3151, heavy_1).is_empty(),
|
||||
"+1 has no legacy refine particles")
|
||||
var heavy_fx: Array = EquipModel.refine_effect_specs(3159, heavy_9)
|
||||
_ck(heavy_fx.size() == 1 and String(heavy_fx[0].effect).ends_with("sword_9.mse")
|
||||
and String(heavy_fx[0].slot) == "right",
|
||||
"two-handed +9 -> normal sword_9 on PART_WEAPON")
|
||||
var dagger_fx: Array = EquipModel.refine_effect_specs(4009,
|
||||
{"type": 1, "sub_type": 1, "gain_socket_pct": 3})
|
||||
_ck(dagger_fx.size() == 2 and String(dagger_fx[0].effect).ends_with("sword_9_s.mse")
|
||||
and String(dagger_fx[1].slot) == "left",
|
||||
"dagger +9 -> small-sword effect on both hands")
|
||||
var bow_fx: Array = EquipModel.refine_effect_specs(2009,
|
||||
{"type": 1, "sub_type": 2, "gain_socket_pct": 3})
|
||||
_ck(bow_fx.size() == 1 and String(bow_fx[0].effect).ends_with("sword_9_b.mse")
|
||||
and String(bow_fx[0].slot) == "left",
|
||||
"bow +9 -> bow effect on PART_WEAPON_LEFT")
|
||||
var blue_steel_fx: Array = EquipModel.refine_effect_specs(12019,
|
||||
{"type": 2, "sub_type": 0, "gain_socket_pct": 3})
|
||||
_ck(blue_steel_fx.size() == 3 and String(blue_steel_fx[2].effect).ends_with("armor_9.mse"),
|
||||
"Blue Steel +9 -> two special effects plus armor_9")
|
||||
var real_registry := EffectRegistry.new()
|
||||
real_registry.setup(assets)
|
||||
for spec in heavy_fx + dagger_fx + bow_fx + blue_steel_fx:
|
||||
_ck(real_registry.resolve(String(spec.effect)) != "",
|
||||
"registered refine MSE resolves: %s" % spec.effect)
|
||||
|
||||
# Character select passes the outer PlayerView to EquipModel. Verify it
|
||||
# forwards palette calls to the native renderer; a direct stub-only test
|
||||
# cannot catch a missing integration method here.
|
||||
var forwarded := StubModel.new()
|
||||
var view := PlayerView.new()
|
||||
view.model = forwarded
|
||||
view.set_skin_texture("base.dds", "blue.dds")
|
||||
_ck(forwarded.skin_source == "base.dds" and forwarded.skin_target == "blue.dds",
|
||||
"PlayerView forwards set_skin_texture")
|
||||
view.clear_skin_textures()
|
||||
_ck(forwarded.skin_source == "" and forwarded.skin_target == "",
|
||||
"PlayerView forwards clear_skin_textures")
|
||||
view.free()
|
||||
forwarded.free()
|
||||
|
||||
# EquipModel：装备武器 vnum 19 -> model.weapon_gr2 = 解析后的真实路径
|
||||
var fc := FakeClient.new()
|
||||
var model := StubModel.new()
|
||||
@@ -112,15 +187,28 @@ func _run() -> void:
|
||||
# shield_gr2 槽 = PART_WEAPON_LEFT；参考端不渲染 WEAR_SHIELD（盾在 item_list 没模型）。
|
||||
var fch := FakeClient.new()
|
||||
var mh := StubModel.new()
|
||||
var mh_view := PlayerView.new()
|
||||
mh_view.name = "PlayerView"
|
||||
mh_view.model = mh
|
||||
mh_view._left_bone = "Bip01 L Hand"
|
||||
var mh_anim := FakeAnimator.new()
|
||||
mh_view.anim = mh_anim
|
||||
var fp := FakeProto.new()
|
||||
get_root().add_child(fch)
|
||||
get_root().add_child(mh)
|
||||
get_root().add_child(mh_view)
|
||||
mh_view.add_child(mh)
|
||||
mh_view.add_child(mh_anim)
|
||||
get_root().add_child(fp)
|
||||
var emh: Node = EquipModel.new()
|
||||
get_root().add_child(emh)
|
||||
emh.setup(fch, il, func() -> Node: return mh, assets)
|
||||
emh.setup(fch, il, func() -> Node: return mh_view, assets)
|
||||
emh.main_getter = func() -> int: return 1000
|
||||
emh.proto = fp
|
||||
var right_part := Node3D.new()
|
||||
right_part.name = "Weapon"
|
||||
mh.add_child(right_part)
|
||||
var fake_effects := FakeEffectRegistry.new()
|
||||
emh.effect_registry = fake_effects
|
||||
var sword_p: String = emh._resolve_weapon(19)
|
||||
var bow_p: String = emh._resolve_weapon(2000)
|
||||
var dagger_p: String = emh._resolve_weapon(4000)
|
||||
@@ -138,6 +226,25 @@ func _run() -> void:
|
||||
fch.set_wear(4, 7000)
|
||||
await process_frame
|
||||
_ck(mh.weapon_gr2 == fan_p and mh.shield_gr2 == "", "fan on foot -> right hand only (%s | %s)" % [mh.weapon_gr2, mh.shield_gr2])
|
||||
fake_effects.calls.clear()
|
||||
fch.set_wear(4, 3159)
|
||||
await process_frame
|
||||
_ck(fake_effects.calls.size() == 1
|
||||
and String(fake_effects.calls[0].effect).ends_with("sword_9.mse")
|
||||
and String(fake_effects.calls[0].parent) == "PlayerView"
|
||||
and not bool(fake_effects.calls[0].one_shot),
|
||||
"equipping two-handed +9 spawns persistent sword_9 on character bone path (%s; children=%s)" %
|
||||
[fake_effects.calls, mh.get_children()])
|
||||
_ck(emh._weapon_refine_fx.size() == 1
|
||||
and emh._weapon_refine_fx[0].get_child_count() == 1
|
||||
and emh._weapon_refine_fx[0].get_child(0) is MotionEffectAnchor,
|
||||
"+9 effect follows equip_right_hand through MotionEffectAnchor")
|
||||
fch.set_wear(4, 3151)
|
||||
await process_frame
|
||||
_ck(fake_effects.calls.size() == 1 and emh._weapon_refine_fx.is_empty(),
|
||||
"switching +9 -> +1 removes refine particles (%s; active=%s)" %
|
||||
[fake_effects.calls, emh._weapon_refine_fx])
|
||||
fch.set_wear(4, 7000)
|
||||
fch.mount_vnum = 20030
|
||||
fch.entity_info.emit(1000, {})
|
||||
await process_frame
|
||||
@@ -180,8 +287,26 @@ func _run() -> void:
|
||||
em3.race = 0 # warrior
|
||||
# 11200 "Monk Plate Armour+0" -> values[3] == 3
|
||||
_ck(em3._armor_shape_default(11200) == 3, "armor 11200 -> shape 3 (via proto values[3])")
|
||||
# 11000 "Wolf Armour" -> values[3] == 0 -> 回退 =vnum
|
||||
_ck(em3._armor_shape_default(11000) == 11000, "armor 11000 -> values[3]=0 回退 =vnum")
|
||||
# 11000 "Wolf Armour" -> values[3] == 0，参考端把 0 当有效基础 shape
|
||||
_ck(em3._armor_shape_default(11000) == 100, "armor 11000 -> shape 100 (via proto values[3])")
|
||||
_ck(em3._armor_shape_default(12019) == 26, "armor 12019 -> Blue Steel shape 26")
|
||||
var heavy: Dictionary = pr.item(3150)
|
||||
_ck(int(heavy.get("type", -1)) == 1 and int(heavy.get("sub_type", -1)) == 3,
|
||||
"weapon 3150 -> WEAPON_TWO_HANDED")
|
||||
var heavy_real_9: Dictionary = pr.item(3159)
|
||||
_ck(EquipModel.refine_effect_level(3159, heavy_real_9) == 9
|
||||
and EquipModel.refine_effect_specs(3159, heavy_real_9).size() == 1,
|
||||
"real item_proto 3159 -> two-handed +9 refine effect")
|
||||
var armor_real_9: Dictionary = pr.item(12019)
|
||||
_ck(EquipModel.refine_effect_level(12019, armor_real_9) == 9
|
||||
and EquipModel.refine_effect_specs(12019, armor_real_9).size() == 3,
|
||||
"real item_proto 12019 -> Blue Steel +9 refine effects")
|
||||
em3._apply_body(model, 12019)
|
||||
_ck(model.gr2_path.to_lower().ends_with("warrior_4-1.gr2"),
|
||||
"armor 12019 -> warrior_4-1 geometry (%s)" % model.gr2_path)
|
||||
_ck(model.skin_source.to_lower().ends_with("warrior_4-1.dds") and
|
||||
model.skin_target.to_lower().ends_with("warrior_4-2.dds"),
|
||||
"armor 12019 -> source/target skin remap (%s -> %s)" % [model.skin_source, model.skin_target])
|
||||
_ck(em3._armor_specular(11209) == 100, "armor 11209(+9) -> specular 100")
|
||||
# FakeProto 的 subtype 与真 item_proto 一致
|
||||
for v in FakeProto.SUB:
|
||||
|
||||
Reference in New Issue
Block a user