4v5u09Z5a4Yuc/mtgodot-poc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32 Commits 1 Branch 0 Tags
e0c1853909333f13c72880bb2cb386ef409eb58e
Commit Graph
12 Commits
Author SHA1 Message Date
shenleiandClaude Opus 5 e0c1853909 fix(net): 主角 VID 归参考端所有，GC_CHARACTER_DEL 不再把玩家「去主角化」 
实机故障：进入游戏后整屏灰紫，主角还是蓝色胶囊占位体，2D UI 与小地图正常。

根因（已实证，非推测）。`EntityStore::mut_despawn()` 在 despawn 的 vid 等于
主角 vid 时把 `m_main_vid` 清零。40250 服务器在 spawn-in 头几秒会对玩家自己的
vid 反复下发 GC_CHARACTER_DEL + GC_CHARACTER_ADD（视野重算，实测约 10 次）。
第一次 DEL 就把玩家永久去主角化：`get_main_vid()` 返回 0 →
`_sync_main_character()` 直接 return → 建模代码从未跑过（main_attempts=0）→
占位胶囊留在 y=0 → 相机跟着它钻到 C1 地形底下 → 满屏灰紫。地图其实一直是好的
（chunks_built 20/20、objects_placed 565）。

参考端怎么做（40250 ClientVS22）。主角身份属于 `CNetworkActorManager::m_dwMainVID`，
只由 `SetMainActorVID()`（GC_MAIN_CHARACTER）写，只在管理器析构时清；
`RemoveActor()` 删 actor 行和角色实例，但绝不碰它；重新加入时
`__AppendCharacterManagerActor()` 用 `kCreateData.m_isMain = __IsMainActorVID(dwVID)`
重新推导，并再跑一次 `SetMainCharacterIndex(dwVID)`。

修法（entity_store.cpp）：
- `mut_despawn()` 只删行、只发 Despawn，不动 m_main_vid；m2dev 分支的
  GC_CHARACTER_DEL 同规则。
- `mut_spawn_full()` 在 `e.vid == m_main_vid` 时把 `is_main` 置回 true，
  并重新广播 MainSet，对齐参考端的重新推导。

顺带落地的渲染修复（同一次实机排查中定位）：
- libgr2 `sample_pose()` 增加 `root_offset` 形参；`Metin2AnimPlayer::apply_pose()`
  显式传单位阵而不是模型的 InitialPlacement。Metin2 动画 gr2 的根骨轨道自带骨盆
  高度，再乘一次 IP 会把整个人抬高一个骨盆高（武 99.4cm / 刺 92.6 / 巫 103.7 /
  萨 95.5，正好各自的 IP.z）——即此前的「人物悬空」。`bind_pose()` 语义不变。
- `Metin2Model::_load_hair()` 改用与身体/武器同一条 `make_material()`
  （specular_disabled）而不是 roughness=1.0 的 StandardMaterial3D，头发不再被
  PBR 高光洗成奶白色块。

取证与回归工具：
- `project/net_trace.gd`（新）：主角 vid 生命周期取证。挂在 AppFlow 之后逐帧读
  `get_main_vid()`，归零时打印 `NETTRACE: MAIN_LOST was=.. now=0 reason=..` 加最近
  24 条环形事件；`reason` 区分 despawn 与 silent（reset_for_map_change 清空
  m_changes，是静默清零）。`MT_NETTRACE=1` 打开逐事件日志。
- `game_scene.gd`：诊断 tick 支持重复采样（分辨主角装配是「没跑」还是「没跑完」），
  新增 main_sync_ready / main_loading / main_view_key / main_map_vid /
  main_retry_in_ms 字段；`MT_DIAG_SHOT=<png>` 让游戏自己存一帧实机画面
  （screencapture 拍到的是终端窗口，没用）。
- `project/model_render_test.gd` + `test/rendering/model_baseline.json`（新）：
  八个种族的模型渲染基线（--bless 重新落盘）。
- `project/char_bench_test.gd`（新）：无网络无地图的单角色实验台，五变体 ×
  六机位出证据图，只产图不做阈值判定。
- `project/package_render_test.gd`（新）：导出包内的渲染自检入口
  （导出模板不接受 --script，只能走 MT_TEST_MODE）。
- `/project/build/` 加入 .gitignore（渲染用例的落图输出）。

实机复验（真实服务器，非模拟）：
- 修前 `LIVE_SMOKE FAIL: 主角色 VID 有效`；
  `NETTRACE: MAIN_LOST was=25910 now=0 reason=despawn t=+7737ms`，
  环里紧跟 `spawn vid=25910 is_main=false`。
- 修后 `LIVE_SMOKE RESULT: PASS`，main_vid=25933、entities=19；
  40s 实机跑 16 次诊断采样全部 model_built=True / main_attempts=1 /
  main_sync_ready=True，player_pos 落在 C1 地形上而非 y=0；
  MT_DIAG_SHOT 存下的帧里地形、建筑、NPC、树木、真实角色模型、HUD、小地图俱全。

回归：gamescene_test / equip_model_test / gamescene_visual_test（feet_gap
0.001373）/ model_render_test（8 races）/ char_select_visual_test / 包内
MT_TEST_MODE=render 全绿；ctest 22/23，唯一失败 net.classic_session 已用
「还原本次改动 → 重跑 → diff 失败集合」确认与本次修改无关（失败集合完全相同）。

注：画面整体偏暗属于光照/色调差距，受 PARITY-GAP.md §0 门禁约束（对照帧未落盘前
不做相机/光照/色调/材质调参），本次不碰。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SJugvEJwz3FK4hw9ti3SRb
 2026-09-08 17:15:55 +09:00
shenandshen c3a6fb973e fix(rendering): checkpoint main-character recovery and visual regression work 
Handle late main-character data, guarded model construction, bounded retries and map correction. Validate player model sources and add lifecycle and real-asset visual regressions.

Include pending material and character-selection changes, updated A1 screenshot, and the detailed rendering repair plan. Hair occlusion, full UI parity and final macOS package acceptance remain unfinished.
 2026-09-08 08:52:30 +08:00
shenleiandClaude Code 8092ff44e2 装备校验链/快捷栏/公会/好友情侣/交易仓库五项差距修复（增量 129） 
- 装备校验：can_equip 按 CanEquipNow→FindEquipCell→EquipItem 精确重排，
  新增 find_equip_cell() 1:1 复刻（RING/UNIQUE 占用翻转、COSTUME/BELT/DS），
  帝国 antiflag 降级为 tooltip 提示，LIMIT_PCBANG/REAL_TIME* 语义与倒计时文案
- 快捷栏：死亡全槽禁用+激活守卫、变身（affect 220）技能置灰、
  物品槽失配置灰（服务器回收/换武器后刷新）
- 公会：GUILD_AUTH_* 权限位门控踢人/公告/技能升级，/gskillup、
  被宣战应答弹窗（/war·/nowar）、资金存取行（40250 服务端已禁用仍保留 1:1）
- 好友/情侣：messenger 三固定组（好友/公会/情侣），lover_login/logout/
  near/far/divorce 命令事件→在线/在身边状态与离婚隐藏
- 交易/仓库：ExchangeState.last_notice（ALREADY/LESS_GOLD）结束浮层提示；
  仓库改密 /safebox_change_password 三段输入；关窗补 /safebox_close·/mall_close；
  仓库金钱经核实 40250 无 wire 协议，UI 定界只读
- app_flow：重连时 guild_marks_ready 重复连接加 is_connected 守卫
- 相机 look_at 零向量守卫（首帧/传送落点）
- 测试：equip/love/guild 断言更新，79 项中 78 绿（game_camera_test 为
  HEAD 既有失败）；真服冒烟 LIVE_SMOKE PASS（192.168.21.203 全链路）
- docs/CLIENT-GAP.md 同步增量 129

Co-Authored-By: Claude Code <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018kUFvQGYusuY3dkfGitmAe
 2026-09-07 21:43:30 +09:00
shenandshen 61272b75e9 客户端问题修改 2026-09-07 14:53:36 +08:00
shenlei b19d5b5dd3 feat: complete mobile UI implementation 2026-09-04 19:54:33 +09:00
shenlei 9a4a044da5 Complete remaining client gap features 2026-09-04 13:25:05 +09:00
shenlei 13ccb8d02d 完善客户端功能并同步差距文档 2026-09-03 18:40:01 +09:00
shenleiandClaude Sonnet 5 d7711ba5f0 40250 classic: increment 50 (Phase 1 W3) — §8.3 in-game help window 
Implement the in-game Help window as a 1:1 migration of uihelp.py's
HelpWindow (single-page: ENABLE_HELP_MULTIPAGE = 0 -> LoadDialogSinglePage).

- project/ui/help_ui.gd (new): loads the real helpwindow.py uiscript via
  UiScript -> UiBuild; _relabel() resolves the <HELP_*>/<CLOSE> placeholders
  (produced when UiManager has no locale callback) from the project Locale
  table (en) with verbatim English fallbacks, covering the original script's
  two duplicate help_02 rows (right/middle camera). open/close/toggle/is_open;
  close_button -> close; ESC handled by the UiManager window stack.
- project/ui/system_menu_ui.gd: help_button changed from the placeholder toast
  to close() + open_help(); adds const HelpUI, an injectable help_ui member,
  _ensure_help() (lazy build, reuses the menu's ui/client/assets_root),
  open_help(), toggle_help(); setup() gains an optional 6th arg (old 5-arg
  callers unaffected).
- project/game_scene.gd: single elif in _unhandled_input — KEY_H without
  ctrl/meta -> system_menu_ui.toggle_help() (Ctrl+H stays free for
  /user_horse_ride).
- project/help_ui_test.gd (new): headless SceneTree test — helpwindow.py load,
  19 verbatim help rows + taskbar labels bound and non-placeholder,
  close_button text, rows() helper, close/open/toggle, ESC stack top,
  SystemMenuUI.open_help() lazy build.

Tests: help_ui_test, system_menu_ui_test, gamescene_test, ui_test all PASS
(plus system_option_ui_test, char_status_ui_test). No build/ in this worktree
so C++ ctest not run (no C++ change). Real-server and visual (.sub textures)
not verified. Docs: CLIENT-GAP.md W3 row + increment 50 bullet;
CLIENT-GAP-FIX.md §8.3 status/改动/测试/验收 + C.5 batch record.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014yvAPqPivoY7vmBbzgqK4W
 2026-09-02 15:34:36 +09:00
shenleiandClaude Sonnet 5 f32064c74a 40250 classic: parallel-dev checkpoint through increment 49 (W0 interface freeze) 
Captures the uncommitted parallel-development work (increments 46-49) on the
40250 classic client port, folded into docs/CLIENT-GAP.md + CLIENT-GAP-FIX.md.

Increment 49 (W0 interface-freeze batch, Phase 1 prerequisite) lands the
cross-workflow shared-file scaffolding so the 4 Phase 1 workflows can run in
isolated worktrees without contention:

- entity_store.{h,cpp}: Entity gains empire/affect_flags/owner_vid/state_flags;
  new mut_spawn_full() (single-shot two-packet merge, §2.3), mut_ownership()
  (§2.5), mut_map_bgm() + take_bgm_dirty()/bgm_name()/bgm_volume() (§9.1),
  drain_dirty() (§2.1/§2.5 bare-field-update queue); mut_char_info() now stores
  empire; reset_for_map_change() clears m_dirty.
- m2_client.cpp: new bgm_changed(name, volume) signal; classic + m2dev pump
  loops drain drain_dirty() -> entity_info and take_bgm_dirty() -> bgm_changed;
  entity_dict() exposes the 4 new keys.
- classic/classic_parser.{h,cpp}: GC_MAIN_CHARACTER3_BGM /
  GC_MAIN_CHARACTER4_BGM_VOL route bgm_name/bgm_volume to mut_map_bgm() (was
  discarded); new m_pending_actor staging map (W1 fills §2.2 merge logic).
- project/bgm_director.gd (new) + game_scene.gd: BGM consumption split out of
  net_world.gd so W2/W4 don't collide; §8.6/§4.8 keybind convergence (digits
  1-4 -> quickslots 0-3, F1-F4 -> quickslots 4-7, Ctrl+1..9 -> _emote()).

Tests: cmake --build build clean; ctest 16/16; 15 GDScript regressions green
(netbridge, gamescene, netplay, p9, p10, p2b, p8, system_menu_ui, skill,
combat_fx, skill_fx, player_motion, char_status_ui, chat, inventory), no skips.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014yvAPqPivoY7vmBbzgqK4W
 2026-09-02 15:13:01 +09:00
shenandshen 44bdcb0781 Fix 40250 classic login and world loading 2026-09-02 07:03:25 +08:00
shenlei 8f61990a83 Implement 40250 classic client port 2026-09-01 18:49:28 +09:00
shenandClaude Sonnet 5 47baf6c0c6 Metin2 game client (P0–P11) + mobile asset pipeline 
Networked client on the existing Godot 4.7 + libgr2 renderer:
- net: m2dev wire protocol (libsodium KX + XChaCha20), auth/select/game
  phases, EntityStore world model, ~all GC/CG headers. char create/delete,
  private shop / mall / cube, SHOP_GC_START_EX, guild, party (+ CG_PARTY_SET_STATE),
  quests, dragon soul, refine, safebox, exchange.
- UI: in-game windows migrated 1:1 from the reference uiscript/root .py —
  char status (/stat), inventory+equipment, select-item ([SELECT_ITEM] quest
  token), system-option + game-option + ESC system menu, private-shop 39-grid,
  party info board, shop tabs, atlas, minimap, quickbar, chat, …
- EterGrnLib polish: GR2 material blend/two-sided, LOD crossfade, motion-event
  dispatch, contact shadow, ray-AABB picking, weapon grip pre-transform.

Portable asset IO (A1) — all extension/libgr2/formats/mtproto reads routed
through godot::FileAccess (res:// PCK works on iOS/Android); standalone-lib
*_path() kept for the non-Godot CTests. AssetResolver + PropertyRegistry
switched to a baked index (bake_asset_index.gd) instead of std::filesystem.

Mobile builds: build-{android,ios}.sh, export-android.sh, pack-assets.sh,
gen-debug-keystore.sh. Assets ship as a zip mounted at runtime by
project/asset_pack.gd (adb push now; HTTP download is a drop-in later).

ctest 10/10, 34 GDScript suites, macOS/iOS/Android all build.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013EJxkHiNKS4kybHS3XKyAJ
 2026-08-31 20:02:12 +09:00