diff --git a/Assets/NPC/EnermyRoot.prefab b/Assets/NPC/EnermyRoot.prefab index fe0deab..f1aa2dc 100644 --- a/Assets/NPC/EnermyRoot.prefab +++ b/Assets/NPC/EnermyRoot.prefab @@ -291,6 +291,11 @@ PrefabInstance: propertyPath: m_Name value: TrailRoot objectReference: {fileID: 0} + - target: {fileID: 4708354386871929370, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8132815969298277413, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} propertyPath: moveWithTransform diff --git a/Packages/manifest.json b/Packages/manifest.json index e800feb..ef993d8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,8 @@ "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", "com.unity.ide.rider": "3.0.40", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 922c63a..90a0d6b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -56,9 +56,42 @@ }, "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, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.17", + "com.unity.dt.app-ui": "1.3.6", + "com.unity.collections": "2.4.3", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.imageconversion": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.30", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -84,7 +117,7 @@ }, "com.unity.collections": { "version": "2.6.8", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.8.29", @@ -95,6 +128,18 @@ }, "url": "https://packages.unity.com" }, + "com.unity.dt.app-ui": { + "version": "2.2.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.screencapture": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, @@ -128,7 +173,7 @@ }, "com.unity.mathematics": { "version": "1.3.3", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -143,7 +188,7 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", - "depth": 3, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -215,7 +260,7 @@ }, "com.unity.test-framework.performance": { "version": "3.5.0", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.33", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index a238233..ba95f13 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,4 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Start.unity guid: 8875df5a0c3c24206ac44d10bf5968ab - m_configObjects: {} + m_configObjects: + com.unity.dt.app-ui: {fileID: 11400000, guid: 1b1c20d82303e4b5781c3ef50ac1449f, + type: 2} + m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json b/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json new file mode 100644 index 0000000..380fa36 --- /dev/null +++ b/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json @@ -0,0 +1,11 @@ +{ + "CustomInstructionsGUID": "", + "CheckpointEnabled": false, + "GitInstanceTypeValue": 0, + "CustomGitPath": "", + "CheckpointRetentionWeeks": 2, + "PlanExecutionPromptDismissed": false, + "CheckpointDiscoveryBannerDismissed": false, + "CheckpointDiscoveryUserDisabled": false, + "CheckpointDiscoveryFlowStarted": false +} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ac7cd51..ceadce7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -841,7 +841,8 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 webEnableSubmoduleStrippingCompatibility: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + iPhone: SENTIS_ANALYTICS_ENABLED additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {}