Merge branch 'develop' of https://gitlab.yeomai.site/Yeomai/Vision into develop

# Conflicts:
#	Assets/Core/Fonts/FontsSample.prefab.meta
#	Assets/Core/Fonts/TMP_fonts/SmileySans-Oblique SDF.asset
#	Assets/Core/Fonts/digits_sheet_1.json.meta
#	ProjectSettings/ProjectSettings.asset

.gitignore

@@ -65,3 +65,9 @@ mono_crash.*.json
 crashlytics-build.properties
 .DS_Store
 *~
+# --- 打包中间产物：性能测试包在打包开始时生成到 Assets/Resources，打包结束自动删除 ---
+# 只忽略这两个文件本身，目录 Assets/Resources 与其 .meta 必须保留
+/Assets/Resources/PerformanceTestRunInfo.json
+/Assets/Resources/PerformanceTestRunInfo.json.meta
+/Assets/Resources/PerformanceTestRunSettings.json
+/Assets/Resources/PerformanceTestRunSettings.json.meta

Packages/manifest.json

@@ -5,7 +5,6 @@
     "com.esotericsoftware.spine.spine-unity": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2",
     "com.esotericsoftware.spine.timeline": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2",
     "com.esotericsoftware.spine.urp-shaders": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2",
-    "com.unity.ai.assistant": "2.20.0-pre.2",
     "com.unity.ai.inference": "2.6.1",
     "com.unity.cinemachine": "2.10.7",
     "com.unity.collab-proxy": "2.13.6",

Packages/packages-lock.json

@@ -56,26 +56,6 @@
       },
       "hash": "e7dc1435fa4a0083ab431f1b28e083c14a1f5c68"
     },
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.ai.assistant": {
-      "version": "2.20.0-pre.2",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.mathematics": "1.3.2",
-        "com.unity.nuget.mono-cecil": "1.11.5",
-        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.ai.inference": {
       "version": "2.6.1",
       "depth": 0,
@@ -173,7 +153,7 @@
     },
     "com.unity.mathematics": {
       "version": "1.3.3",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
@@ -188,7 +168,7 @@
     },
     "com.unity.nuget.mono-cecil": {
       "version": "1.11.6",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"

ProjectSettings/Packages/com.unity.ai.assistant/Settings.json

@@ -7,5 +7,5 @@
     "PlanExecutionPromptDismissed": false,
     "CheckpointDiscoveryBannerDismissed": false,
     "CheckpointDiscoveryUserDisabled": false,
-    "CheckpointDiscoveryFlowStarted": false
+    "CheckpointDiscoveryFlowStarted": true
 }