Merge branch 'develop' into 情绪分支测试

2025-05-15 17:52:54 +08:00
parent 5c13601fcb 8d8aed74c2
commit 843bb4f0e9
48 changed files with 2716 additions and 281 deletions
@@ -1,5 +1,10 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta
 guid: b0870ff3b9020364cb3dd8aba273bbba
+========
+guid: 020615eb526a782489f42bb8f48c395a
+folderAsset: yes
+>>>>>>>> develop:Assets/Language/Dialog/FP_Prologue.meta
 DefaultImporter:
  externalObjects: {}
  userData: