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/prefabs/GrassTile.gd.uid
+++ b/scenes/prefabs/GrassTile.gd.uid
@@ -1 +0,0 @@
-uid://b7bgtip4yxeg8
--- a/scenes/prefabs/ui/ChatMessage.gd.uid
+++ b/scenes/prefabs/ui/ChatMessage.gd.uid
@@ -1 +0,0 @@
-uid://djqrgj3h0lif7