装备校验链/快捷栏/公会/好友情侣/交易仓库五项差距修复（增量 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
This commit is contained in:
shenlei
+92
-4
@@ -29,6 +29,11 @@ func setup(m2client: Node, parent: Node) -> void:
|
||||
client.friends_changed.connect(refresh)
|
||||
if client.has_signal("friend_invite_ask"):
|
||||
client.friend_invite_ask.connect(_on_friend_invite)
|
||||
# 原版 messenger 是三固定分组（uimessenger.py MessengerFriendGroup/GuildGroup/
|
||||
# FamilyGroup）；公会与情侣组数据变化时同样刷新。
|
||||
for sig in ["guild_changed", "lover_changed"]:
|
||||
if client.has_signal(sig):
|
||||
client.connect(sig, refresh)
|
||||
|
||||
func is_open() -> bool:
|
||||
return _root != null and _root.visible
|
||||
@@ -58,15 +63,98 @@ func refresh() -> void:
|
||||
return
|
||||
for c in _list.get_children():
|
||||
c.queue_free()
|
||||
var friends: Array = client.get_friends()
|
||||
# 三固定分组（对齐原版 MessengerWindow）：好友 / 公会 / 情侣。
|
||||
_section("好友")
|
||||
var friends: Array = client.get_friends() if client.has_method("get_friends") else []
|
||||
if friends.is_empty():
|
||||
var e := Label.new()
|
||||
e.text = "（好友列表为空）"
|
||||
e.add_theme_font_size_override("font_size", 11)
|
||||
e.modulate = Color(0.6, 0.6, 0.6)
|
||||
_list.add_child(e)
|
||||
return
|
||||
for f in friends:
|
||||
_list.add_child(_row(f))
|
||||
else:
|
||||
for f in friends:
|
||||
_list.add_child(_row(f))
|
||||
_section("公会")
|
||||
if client.has_method("get_guild") and client.get_guild().get("in_guild", false) \
|
||||
and client.has_method("get_guild_members"):
|
||||
var members: Array = client.get_guild_members()
|
||||
members.sort_custom(func(a, b):
|
||||
return int(a.get("grade", 99)) < int(b.get("grade", 99)))
|
||||
for m in members:
|
||||
_list.add_child(_guild_row(m))
|
||||
else:
|
||||
var g := Label.new()
|
||||
g.text = "（未加入公会）"
|
||||
g.add_theme_font_size_override("font_size", 11)
|
||||
g.modulate = Color(0.6, 0.6, 0.6)
|
||||
_list.add_child(g)
|
||||
_section("情侣")
|
||||
if client.has_method("get_lover") and client.get_lover().get("valid", false):
|
||||
_list.add_child(_lover_row(client.get_lover()))
|
||||
else:
|
||||
var l := Label.new()
|
||||
l.text = "（暂无）"
|
||||
l.add_theme_font_size_override("font_size", 11)
|
||||
l.modulate = Color(0.6, 0.6, 0.6)
|
||||
_list.add_child(l)
|
||||
|
||||
func _section(title: String) -> void:
|
||||
var h := Label.new()
|
||||
h.text = "— %s —" % title
|
||||
h.add_theme_font_size_override("font_size", 12)
|
||||
h.modulate = Color(0.75, 0.82, 0.95)
|
||||
_list.add_child(h)
|
||||
|
||||
# 公会组成员：在线态来自 GC_GUILD_LOGIN/LOGOUT；点按同样发起私聊。
|
||||
func _guild_row(m: Dictionary) -> Control:
|
||||
var row := HBoxContainer.new()
|
||||
row.custom_minimum_size = Vector2(640, 46) if _mobile_mode else Vector2(260, 0)
|
||||
var dot := Label.new()
|
||||
dot.text = "●"
|
||||
dot.custom_minimum_size = Vector2(28, 42) if _mobile_mode else Vector2.ZERO
|
||||
dot.vertical_alignment = VERTICAL_ALIGNMENT_CENTER
|
||||
dot.modulate = Color(0.4, 0.9, 0.4) if m.get("online", false) else Color(0.4, 0.4, 0.4)
|
||||
row.add_child(dot)
|
||||
var nm := Button.new()
|
||||
nm.text = String(m.get("name", "?"))
|
||||
nm.flat = true
|
||||
nm.custom_minimum_size = Vector2(450, 42) if _mobile_mode else Vector2(150, 0)
|
||||
nm.alignment = HORIZONTAL_ALIGNMENT_LEFT
|
||||
nm.pressed.connect(func() -> void: whisper_to.emit(String(m.get("name", ""))))
|
||||
row.add_child(nm)
|
||||
if int(m.get("grade", 1)) == 0:
|
||||
var lead := Label.new()
|
||||
lead.text = "会长"
|
||||
lead.modulate = Color(0.95, 0.8, 0.4)
|
||||
lead.add_theme_font_size_override("font_size", 10)
|
||||
row.add_child(lead)
|
||||
return row
|
||||
|
||||
# 情侣组成员：lover_login/logout/near/far（CHAT_TYPE_COMMAND，marriage.cpp）。
|
||||
func _lover_row(lover: Dictionary) -> Control:
|
||||
var row := HBoxContainer.new()
|
||||
row.custom_minimum_size = Vector2(640, 46) if _mobile_mode else Vector2(260, 0)
|
||||
var dot := Label.new()
|
||||
dot.text = "♥"
|
||||
dot.custom_minimum_size = Vector2(28, 42) if _mobile_mode else Vector2.ZERO
|
||||
dot.vertical_alignment = VERTICAL_ALIGNMENT_CENTER
|
||||
dot.modulate = Color(0.95, 0.4, 0.55) if lover.get("online", false) else Color(0.4, 0.4, 0.4)
|
||||
row.add_child(dot)
|
||||
var nm := Button.new()
|
||||
nm.text = String(lover.get("name", "?"))
|
||||
nm.flat = true
|
||||
nm.custom_minimum_size = Vector2(450, 42) if _mobile_mode else Vector2(150, 0)
|
||||
nm.alignment = HORIZONTAL_ALIGNMENT_LEFT
|
||||
nm.pressed.connect(func() -> void: whisper_to.emit(String(lover.get("name", ""))))
|
||||
row.add_child(nm)
|
||||
if lover.get("near", false):
|
||||
var near := Label.new()
|
||||
near.text = "在身边"
|
||||
near.modulate = Color(1.0, 0.6, 0.7)
|
||||
near.add_theme_font_size_override("font_size", 10)
|
||||
row.add_child(near)
|
||||
return row
|
||||
|
||||
func _row(f: Dictionary) -> Control:
|
||||
var row := HBoxContainer.new()
|
||||
|
||||
Reference in New Issue
Block a user