Merge main into qbb0530-main: 解决冲突并保留聊天和位置同步功能

2026-02-07 16:27:53 +08:00
parent 326ab7ce5c 48216b72f7
commit ded049b61b
37 changed files with 68 additions and 582 deletions
--- a/scenes/MainScene.gd
+++ b/scenes/MainScene.gd
@@ -14,7 +14,6 @@ extends Control
 # 场景节点引用
@onready var auth_scene: Control = $AuthScene
@onready var main_game_ui: Control = $MainGameUI
-@onready var chat_ui: Control = %ChatUI
@onready var user_label: Label = $MainGameUI/TopBar/HBoxContainer/UserLabel
@onready var logout_button: Button = $MainGameUI/TopBar/HBoxContainer/LogoutButton

@@ -156,4 +155,4 @@ func _input(event):
 				get_tree().quit()
 			GameState.MAIN_GAME:
 				# 在游戏中按ESC可能显示菜单或返回登录
-				show_auth_scene()
+				show_auth_scene()