diff --git a/.gitignore b/.gitignore index 24a87d0..d020406 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /[Bb]uilds/ /[Ll]ogs/ /[Mm]emoryCaptures/ +/[Uu]serSettings/ # Asset meta data should only be ignored when the corresponding asset is also ignored !/[Aa]ssets/**/*.meta diff --git a/Assets/Example/Atlas.spriteatlas b/Assets/Example/Atlas.spriteatlas deleted file mode 100644 index f84bc66..0000000 --- a/Assets/Example/Atlas.spriteatlas +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!687078895 &4343727234628468602 -SpriteAtlas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Atlas - m_EditorData: - serializedVersion: 2 - textureSettings: - serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: [] - packingSettings: - serializedVersion: 2 - padding: 4 - blockOffset: 1 - allowAlphaSplitting: 0 - enableRotation: 1 - enableTightPacking: 1 - variantMultiplier: 1 - packables: - - {fileID: 102900000, guid: fe7d38a3315fc7247ab8551f5e9c4f1e, type: 3} - totalSpriteSurfaceArea: 817850 - bindAsDefault: 1 - m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: adcc8250367187e44bcf2b145ca12522, type: 3} - - {fileID: 21300000, guid: e3705575bb82b484e9084d6010a74527, type: 3} - - {fileID: 21300000, guid: 1ccf3cb8ebccff74291cffcdf8a7891b, type: 3} - - {fileID: 21300000, guid: b6bd2b2a44548504a8d31cd0c74afdcc, type: 3} - - {fileID: 21300000, guid: 00c4910e9109b56449300a6b01acf8fe, type: 3} - m_PackedSpriteNamesToIndex: - - kodai_mammoth_tatakau - - fashion_gunpuku_onepiece - - kaizoku_viking - - monban_heitai_seiyou - - nigaoe_ned_kelly - m_Tag: Atlas - m_IsVariant: 0 diff --git a/Assets/Example/Atlas.spriteatlas.meta b/Assets/Example/Atlas.spriteatlas.meta deleted file mode 100644 index 78b3375..0000000 --- a/Assets/Example/Atlas.spriteatlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b67ae4422d1e24e46b18050c1dbd7f74 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SpriteAssist/Editor/Import/SpritePostProcessor.cs b/Assets/SpriteAssist/Editor/Import/SpritePostProcessor.cs index 3e7159f..85ae0c2 100644 --- a/Assets/SpriteAssist/Editor/Import/SpritePostProcessor.cs +++ b/Assets/SpriteAssist/Editor/Import/SpritePostProcessor.cs @@ -7,8 +7,7 @@ public class SpritePostProcessor : AssetPostprocessor { private void OnPostprocessSprites(Texture2D tex, Sprite[] sprites) { - string path = AssetDatabase.GetAssetPath(tex); - if(!SpriteAssistSettings.instance.ShouldProcessSprite(path)) return; + if (!SpriteAssistSettings.instance.ShouldProcessSprite(assetPath)) return; SpriteInspector.isSpriteReloaded = true; diff --git a/Assets/SpriteAssist/Example~/Atlas.spriteatlas b/Assets/SpriteAssist/Example~/Atlas.spriteatlas deleted file mode 100644 index f84bc66..0000000 --- a/Assets/SpriteAssist/Example~/Atlas.spriteatlas +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!687078895 &4343727234628468602 -SpriteAtlas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Atlas - m_EditorData: - serializedVersion: 2 - textureSettings: - serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: [] - packingSettings: - serializedVersion: 2 - padding: 4 - blockOffset: 1 - allowAlphaSplitting: 0 - enableRotation: 1 - enableTightPacking: 1 - variantMultiplier: 1 - packables: - - {fileID: 102900000, guid: fe7d38a3315fc7247ab8551f5e9c4f1e, type: 3} - totalSpriteSurfaceArea: 817850 - bindAsDefault: 1 - m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: adcc8250367187e44bcf2b145ca12522, type: 3} - - {fileID: 21300000, guid: e3705575bb82b484e9084d6010a74527, type: 3} - - {fileID: 21300000, guid: 1ccf3cb8ebccff74291cffcdf8a7891b, type: 3} - - {fileID: 21300000, guid: b6bd2b2a44548504a8d31cd0c74afdcc, type: 3} - - {fileID: 21300000, guid: 00c4910e9109b56449300a6b01acf8fe, type: 3} - m_PackedSpriteNamesToIndex: - - kodai_mammoth_tatakau - - fashion_gunpuku_onepiece - - kaizoku_viking - - monban_heitai_seiyou - - nigaoe_ned_kelly - m_Tag: Atlas - m_IsVariant: 0 diff --git a/Assets/SpriteAssist/Example~/Atlas.spriteatlas.meta b/Assets/SpriteAssist/Example~/Atlas.spriteatlas.meta deleted file mode 100644 index 78b3375..0000000 --- a/Assets/SpriteAssist/Example~/Atlas.spriteatlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b67ae4422d1e24e46b18050c1dbd7f74 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 6c67a6d..3b0fc2e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,14 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ai.navigation": "1.1.5", + "com.unity.collab-proxy": "2.6.0", + "com.unity.ide.rider": "3.0.34", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.7", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 099cd18..392dbcc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,15 +6,22 @@ "source": "builtin", "dependencies": {} }, - "com.unity.collab-proxy": { - "version": "1.17.7", + "com.unity.ai.navigation": { + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.0.1" + "com.unity.modules.ai": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.collab-proxy": { + "version": "2.6.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -23,7 +30,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -32,7 +39,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -47,26 +54,8 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.services.core": { - "version": "1.6.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -77,7 +66,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -86,13 +75,13 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -238,17 +227,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 0bfbd13..a5a70d7 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,33 +3,45 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Visible Meta Files + serializedVersion: 12 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 4 + m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 m_AsyncShaderCompilation: 1 + m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 0 m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 m_UseLegacyProbeSampleCount: 0 + m_SerializeInlineMappingsOnOneLine: 0 + m_DisableCookiesInLightmapper: 1 m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 m_CacheServerMode: 0 m_CacheServerEndpoint: m_CacheServerNamespacePrefix: default m_CacheServerEnableDownload: 1 m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index eabd633..09e5a3b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2022.3.55f1 +m_EditorVersionWithRevision: 2022.3.55f1 (9f374180d209) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000