diff --git a/unity/Assets/2.5D Engine/Scripts/Player.cs b/unity/Assets/2.5D Engine/Scripts/Player.cs index 365b9bd..ef1c1ca 100644 --- a/unity/Assets/2.5D Engine/Scripts/Player.cs +++ b/unity/Assets/2.5D Engine/Scripts/Player.cs @@ -4,7 +4,9 @@ using System.Collections; namespace IndianOceanAssets.Engine2_5D { // Ensures the GameObject has these essential components - [RequireComponent(typeof(HealthSystem), typeof(SwordAttack), typeof(ProjectileShooter), typeof(SpiritLanternSystem))] + [RequireComponent(typeof(HealthSystem), typeof(SwordAttack))] + [RequireComponent(typeof(ProjectileShooter))] + [RequireComponent(typeof(SpiritLanternSystem))] public class PlayerController : MonoBehaviour { [Header("Movement")] diff --git a/unity/Assets/Editor/SpiritLanternPrefabCreator.cs b/unity/Assets/Editor/SpiritLanternPrefabCreator.cs index 6e1cbff..337259e 100644 --- a/unity/Assets/Editor/SpiritLanternPrefabCreator.cs +++ b/unity/Assets/Editor/SpiritLanternPrefabCreator.cs @@ -55,6 +55,8 @@ public static class SpiritLanternPrefabCreator Object.DestroyImmediate(root); Debug.Log($"[SpiritLantern] Prefab 已创建: {prefabPath}"); - EditorUtility.PingAsset(AssetDatabase.LoadMainAssetAtPath(prefabPath)); + var asset = AssetDatabase.LoadMainAssetAtPath(prefabPath); + Selection.activeObject = asset; + EditorGUIUtility.PingObject(asset); } } diff --git a/unity/Packages/manifest.json b/unity/Packages/manifest.json index b083dc8..fff1caa 100644 --- a/unity/Packages/manifest.json +++ b/unity/Packages/manifest.json @@ -38,6 +38,17 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } -} + "com.unity.modules.xr": "1.0.0", + "com.ivanmurzak.unity.mcp": "0.82.3" + }, + "scopedRegistries": [ + { + "name": "package.openupm.com", + "url": "https://package.openupm.com", + "scopes": [ + "com.ivanmurzak", + "extensions.unity" + ] + } + ] +} \ No newline at end of file diff --git a/unity/Packages/packages-lock.json b/unity/Packages/packages-lock.json index 67853ff..8a0adfa 100644 --- a/unity/Packages/packages-lock.json +++ b/unity/Packages/packages-lock.json @@ -1,5 +1,16 @@ { "dependencies": { + "com.ivanmurzak.unity.mcp": { + "version": "0.82.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.uielements": "1.0.0", + "extensions.unity.playerprefsex": "2.1.5" + }, + "url": "https://package.openupm.com" + }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0, @@ -226,6 +237,13 @@ }, "url": "https://packages.tuanjie.cn" }, + "extensions.unity.playerprefsex": { + "version": "2.1.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://package.openupm.com" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/unity/ProjectSettings/PackageManagerSettings.asset b/unity/ProjectSettings/PackageManagerSettings.asset index 361734e..e4b1b0f 100644 --- a/unity/ProjectSettings/PackageManagerSettings.asset +++ b/unity/ProjectSettings/PackageManagerSettings.asset @@ -26,11 +26,20 @@ MonoBehaviour: m_IsDefault: 1 m_Capabilities: 7 m_ConfigSource: 0 - m_UserSelectedRegistryName: + - m_Id: scoped:project:package.openupm.com + m_Name: package.openupm.com + m_Url: https://package.openupm.com + m_Scopes: + - com.ivanmurzak + - extensions.unity + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 + m_UserSelectedRegistryName: package.openupm.com m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -862 - m_OriginalInstanceId: -864 + m_UserModificationsInstanceId: -858 + m_OriginalInstanceId: -860 m_LoadAssets: 0 diff --git a/unity/UserSettings/Search.settings b/unity/UserSettings/Search.settings index 9e26dfe..b0d87b2 100644 --- a/unity/UserSettings/Search.settings +++ b/unity/UserSettings/Search.settings @@ -1 +1,76 @@ -{} \ No newline at end of file +trackSelection = true +refreshSearchWindowsInPlayMode = false +pickerAdvancedUI = false +fetchPreview = true +defaultFlags = 0 +keepOpen = true +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + asset = { + active = true + priority = 25 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + packages = { + active = false + priority = 90 + defaultAction = null + } + store = { + active = false + priority = 100 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = true +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file