diff --git a/Assets/Editor Default Resources/RainbowFolders.meta b/Assets/Editor Default Resources/RainbowFolders.meta index d61ded2..187e6ae 100644 --- a/Assets/Editor Default Resources/RainbowFolders.meta +++ b/Assets/Editor Default Resources/RainbowFolders.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 792438fdcf8ff4b7fbd8432c1c961543 +guid: 15c53d2c713236c4ab4783726464f0d6 folderAsset: yes timeCreated: 1465749084 licenseType: Pro diff --git a/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset new file mode 100644 index 0000000..b606503 --- /dev/null +++ b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61ce4e6f0e8de4b869c42bc50400d057, type: 3} + m_Name: RainbowTypeFoldersIconsStorage + m_EditorClassIdentifier: + TypeFolderIcons: + - Type: 0 + SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3} + LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3} + - Type: 1 + SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3} + LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3} + - Type: 2 + SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3} + LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3} + - Type: 3 + SmallIcon: {fileID: 2800000, guid: 0a498e8f7fbcbef4db91d2d411e3f70f, type: 3} + LargeIcon: {fileID: 2800000, guid: b88339035f924f94eab1e64bac79149f, type: 3} + - Type: 4 + SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3} + LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3} + - Type: 5 + SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3} + LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3} + - Type: 6 + SmallIcon: {fileID: 2800000, guid: 0508340b76cfbdd43826ca620f578abd, type: 3} + LargeIcon: {fileID: 2800000, guid: a4decc2460e61e44b9ccd3d2d248738b, type: 3} + - Type: 7 + SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3} + LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3} + - Type: 8 + SmallIcon: {fileID: 2800000, guid: 36e0a02c0316e0b40bd7ffc8eb437a7f, type: 3} + LargeIcon: {fileID: 2800000, guid: ce20e3678b7748244854c06fcd7d7d00, type: 3} + - Type: 9 + SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3} + LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3} + - Type: 10 + SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3} + LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3} + - Type: 11 + SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3} + LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3} + - Type: 12 + SmallIcon: {fileID: 2800000, guid: 015a543b4163bfa498964b0db1004815, type: 3} + LargeIcon: {fileID: 2800000, guid: fe053ca6ee802d5478277554f1b356d5, type: 3} + - Type: 13 + SmallIcon: {fileID: 2800000, guid: c75be7d9cde129149bb04f51d452d85a, type: 3} + LargeIcon: {fileID: 2800000, guid: 4716b9cfe49343c499142d04bb004e0b, type: 3} + - Type: 14 + SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3} + LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3} + - Type: 15 + SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3} + LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3} diff --git a/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset.meta b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset.meta new file mode 100644 index 0000000..1e90f40 --- /dev/null +++ b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83c5f3085e6d0471f827f92748ca3a08 +timeCreated: 1471261627 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor.meta b/Assets/RainbowFolders/Editor.meta index 037b9ed..3162e07 100644 --- a/Assets/RainbowFolders/Editor.meta +++ b/Assets/RainbowFolders/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bba1aaa97f638264b99ee09630fecc9a +guid: fc6c22ab2ea5043bf8788e4a41ef31a3 folderAsset: yes timeCreated: 1445169651 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Menu.meta b/Assets/RainbowFolders/Editor/Menu.meta index 3b0f4d7..11c0daa 100644 --- a/Assets/RainbowFolders/Editor/Menu.meta +++ b/Assets/RainbowFolders/Editor/Menu.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1cb17b1cd220fa5448d9b5759e732aba +guid: 7532884cf31a8433fb2b3d36c307215d folderAsset: yes timeCreated: 1453925955 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Menu/Colors.meta b/Assets/RainbowFolders/Editor/Menu/Colors.meta index 5b2dc39..dc07602 100644 --- a/Assets/RainbowFolders/Editor/Menu/Colors.meta +++ b/Assets/RainbowFolders/Editor/Menu/Colors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70f2a8f1d3133498bbcecff32faab037 +guid: e45bcbff2108c421b950e2e7ed931766 folderAsset: yes timeCreated: 1466808712 licenseType: Pro diff --git a/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs b/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs index 72414e4..4a9a0fc 100644 --- a/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs +++ b/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs @@ -17,8 +17,6 @@ namespace Borodar.RainbowFolders.Editor { public enum FolderColors { - Default = -1, - Red = 0, Vermilion = 1, Orange = 2, diff --git a/Assets/RainbowFolders/Editor/Menu/RainbowFoldersProjectContextMenu.cs b/Assets/RainbowFolders/Editor/Menu/RainbowFoldersProjectContextMenu.cs index e6e86e7..dd0c0ac 100644 --- a/Assets/RainbowFolders/Editor/Menu/RainbowFoldersProjectContextMenu.cs +++ b/Assets/RainbowFolders/Editor/Menu/RainbowFoldersProjectContextMenu.cs @@ -13,6 +13,7 @@ */ +using System.Diagnostics.CodeAnalysis; using Borodar.RainbowFolders.Editor.Settings; using UnityEditor; using System.Linq; @@ -20,116 +21,203 @@ namespace Borodar.RainbowFolders.Editor { [InitializeOnLoad] + [SuppressMessage("ReSharper", "UnusedMember.Local")] public static class RainbowFoldersProjectContextMenu { - private const string COLORIZE_MENU = "Assets/Rainbow Folders/Colorize/"; - private const string TAG_MENU = "Assets/Rainbow Folders/Tag/"; + private const string MENU_BASE = "Assets/Rainbow Folders/"; + private const string MENU_COLORIZE = MENU_BASE + "Colorize/"; + private const string MENU_TAG = MENU_BASE + "Tag/"; + private const string MENU_TYPE = MENU_BASE + "Folder Type/"; + + // Default + private const string ITEM_DEFAULT = MENU_BASE + "Revert to Default"; // Colors - private const string DEFAULT = COLORIZE_MENU + "Revert to Default"; - private const string RED = COLORIZE_MENU + "Red"; - private const string VERMILION = COLORIZE_MENU + "Vermilion"; - private const string ORANGE = COLORIZE_MENU + "Orange"; - private const string YELLOW_ORANGE = COLORIZE_MENU + "Yellow-Orange"; - private const string YELLOW = COLORIZE_MENU + "Yellow"; - private const string LIME = COLORIZE_MENU + "Lime"; - private const string GREEN = COLORIZE_MENU + "Green"; - private const string BONDI_BLUE = COLORIZE_MENU + "Bondi Blue"; - private const string BLUE = COLORIZE_MENU + "Blue"; - private const string INDIGO = COLORIZE_MENU + "Indigo"; - private const string VIOLET = COLORIZE_MENU + "Violet"; - private const string MAGENTA = COLORIZE_MENU + "Magenta"; + private const string COLOR_RED = MENU_COLORIZE + "Red"; + private const string COLOR_VERMILION = MENU_COLORIZE + "Vermilion"; + private const string COLOR_ORANGE = MENU_COLORIZE + "Orange"; + private const string COLOR_YELLOW_ORANGE = MENU_COLORIZE + "Yellow-Orange"; + private const string COLOR_YELLOW = MENU_COLORIZE + "Yellow"; + private const string COLOR_LIME = MENU_COLORIZE + "Lime"; + private const string COLOR_GREEN = MENU_COLORIZE + "Green"; + private const string COLOR_BONDI_BLUE = MENU_COLORIZE + "Bondi Blue"; + private const string COLOR_BLUE = MENU_COLORIZE + "Blue"; + private const string COLOR_INDIGO = MENU_COLORIZE + "Indigo"; + private const string COLOR_VIOLET = MENU_COLORIZE + "Violet"; + private const string COLOR_MAGENTA = MENU_COLORIZE + "Magenta"; // Tags - private const string TAG_DEFAULT = TAG_MENU + "Revert to Default"; - private const string TAG_RED = TAG_MENU + "Red"; - private const string TAG_VERMILION = TAG_MENU + "Vermilion"; - private const string TAG_ORANGE = TAG_MENU + "Orange"; - private const string TAG_YELLOW_ORANGE = TAG_MENU + "Yellow-Orange"; - private const string TAG_YELLOW = TAG_MENU + "Yellow"; - private const string TAG_LIME = TAG_MENU + "Lime"; - private const string TAG_GREEN = TAG_MENU + "Green"; - private const string TAG_CYAN = TAG_MENU + "Cyan"; - private const string TAG_BLUE = TAG_MENU + "Blue"; - private const string TAG_DARK_BLUE = TAG_MENU + "Dark Blue"; - private const string TAG_VIOLET = TAG_MENU + "Violet"; - private const string TAG_MAGENTA = TAG_MENU + "Magenta"; - - private const string WARNING_MSG = - "Can only colorize folders. Please right click on the folder in the Project window"; - - #region colorize_context_menu - [MenuItem(DEFAULT, false, 2000)] static void Default() { Colorize(FolderColors.Default); } - [MenuItem(RED)] static void Red() { Colorize(FolderColors.Red);} - [MenuItem(VERMILION)] static void Vermilion() { Colorize(FolderColors.Vermilion); } - [MenuItem(ORANGE)] static void Orange() { Colorize(FolderColors.Orange); } - [MenuItem(YELLOW_ORANGE)] static void YellowOrange() { Colorize(FolderColors.YellowOrange); } - [MenuItem(YELLOW)] static void Yellow() { Colorize(FolderColors.Yellow); } - [MenuItem(LIME)] static void Lime() { Colorize(FolderColors.Lime); } - [MenuItem(GREEN)] static void Green() { Colorize(FolderColors.Green); } - [MenuItem(BONDI_BLUE)] static void BondiBlue() { Colorize(FolderColors.BondiBlue); } - [MenuItem(BLUE)] static void Blue() { Colorize(FolderColors.Blue); } - [MenuItem(INDIGO)] static void Indigo() { Colorize(FolderColors.Indigo); } - [MenuItem(VIOLET)] static void Violet() { Colorize(FolderColors.Violet); } - [MenuItem(MAGENTA)] static void Magenta() { Colorize(FolderColors.Magenta); } - #endregion - - #region tag_context_menu - [MenuItem(TAG_DEFAULT, false, 2000)] static void TagDefault() { Tag(FolderTags.Default); } - [MenuItem(TAG_RED)] static void TagRed() { Tag(FolderTags.Red);} - [MenuItem(TAG_VERMILION)] static void TagVermilion() { Tag(FolderTags.Vermilion);} - [MenuItem(TAG_ORANGE)] static void TagOrange() { Tag(FolderTags.Orange);} - [MenuItem(TAG_YELLOW_ORANGE)] static void TagYellowOrange() { Tag(FolderTags.YellowOrange);} - [MenuItem(TAG_YELLOW)] static void TagYellow() { Tag(FolderTags.Yellow);} - [MenuItem(TAG_LIME)] static void TagLime() { Tag(FolderTags.Lime);} - [MenuItem(TAG_GREEN)] static void TagGreen() { Tag(FolderTags.Green);} - [MenuItem(TAG_CYAN)] static void TagCyan() { Tag(FolderTags.Cyan);} - [MenuItem(TAG_BLUE)] static void TagBlue() { Tag(FolderTags.Blue);} - [MenuItem(TAG_DARK_BLUE)] static void TagDarkBlue() { Tag(FolderTags.DarkBlue);} - [MenuItem(TAG_VIOLET)] static void TagViolet() { Tag(FolderTags.Violet);} - [MenuItem(TAG_MAGENTA)] static void TagMagenta() { Tag(FolderTags.Magenta);} - #endregion + private const string TAG_RED = MENU_TAG + "Red"; + private const string TAG_VERMILION = MENU_TAG + "Vermilion"; + private const string TAG_ORANGE = MENU_TAG + "Orange"; + private const string TAG_YELLOW_ORANGE = MENU_TAG + "Yellow-Orange"; + private const string TAG_YELLOW = MENU_TAG + "Yellow"; + private const string TAG_LIME = MENU_TAG + "Lime"; + private const string TAG_GREEN = MENU_TAG + "Green"; + private const string TAG_CYAN = MENU_TAG + "Cyan"; + private const string TAG_BLUE = MENU_TAG + "Blue"; + private const string TAG_DARK_BLUE = MENU_TAG + "Dark Blue"; + private const string TAG_VIOLET = MENU_TAG + "Violet"; + private const string TAG_MAGENTA = MENU_TAG + "Magenta"; - public static void Tag(FolderTags tag) + // Type + private const string TYPE_PREFABS = MENU_TYPE + "Prefabs"; + private const string TYPE_SCENES = MENU_TYPE + "Scenes"; + private const string TYPE_SCRIPTS = MENU_TYPE + "Scripts"; + private const string TYPE_EXTENSIONS = MENU_TYPE + "Extensions"; + private const string TYPE_PLUGINS = MENU_TYPE + "Plugins"; + private const string TYPE_TEXTURES = MENU_TYPE + "Textures"; + private const string TYPE_MATERIALS = MENU_TYPE + "Materials"; + private const string TYPE_AUDIO = MENU_TYPE + "Audio"; + private const string TYPE_BRACKETS = MENU_TYPE + "Brackets"; + private const string TYPE_FONTS = MENU_TYPE + "Fonts"; + private const string TYPE_EDITOR = MENU_TYPE + "Editor"; + private const string TYPE_RESOURCES = MENU_TYPE + "Resources"; + private const string TYPE_SHADERS = MENU_TYPE + "Shaders"; + private const string TYPE_TERRAINS = MENU_TYPE + "Terrains"; + private const string TYPE_MESHES = MENU_TYPE + "Meshes"; + private const string TYPE_RAINBOW = MENU_TYPE + "Rainbow"; + + //--------------------------------------------------------------------- + // Menu Items + //--------------------------------------------------------------------- + + // Default + + [MenuItem(ITEM_DEFAULT, false, 2000)] + private static void Default() { RevertToDefault(); } + + // Colors + + [MenuItem(COLOR_RED)] + private static void Red() { Colorize(FolderColors.Red);} + [MenuItem(COLOR_VERMILION)] + private static void Vermilion() { Colorize(FolderColors.Vermilion); } + [MenuItem(COLOR_ORANGE)] + private static void Orange() { Colorize(FolderColors.Orange); } + [MenuItem(COLOR_YELLOW_ORANGE)] + private static void YellowOrange() { Colorize(FolderColors.YellowOrange); } + [MenuItem(COLOR_YELLOW)] + private static void Yellow() { Colorize(FolderColors.Yellow); } + [MenuItem(COLOR_LIME)] + private static void Lime() { Colorize(FolderColors.Lime); } + [MenuItem(COLOR_GREEN)] + private static void Green() { Colorize(FolderColors.Green); } + [MenuItem(COLOR_BONDI_BLUE)] + private static void BondiBlue() { Colorize(FolderColors.BondiBlue); } + [MenuItem(COLOR_BLUE)] + private static void Blue() { Colorize(FolderColors.Blue); } + [MenuItem(COLOR_INDIGO)] + private static void Indigo() { Colorize(FolderColors.Indigo); } + [MenuItem(COLOR_VIOLET)] + private static void Violet() { Colorize(FolderColors.Violet); } + [MenuItem(COLOR_MAGENTA)] + private static void Magenta() { Colorize(FolderColors.Magenta); } + + // Tags + + [MenuItem(TAG_RED)] + private static void TagRed() { Tag(FolderTags.Red);} + [MenuItem(TAG_VERMILION)] + private static void TagVermilion() { Tag(FolderTags.Vermilion);} + [MenuItem(TAG_ORANGE)] + private static void TagOrange() { Tag(FolderTags.Orange);} + [MenuItem(TAG_YELLOW_ORANGE)] + private static void TagYellowOrange() { Tag(FolderTags.YellowOrange);} + [MenuItem(TAG_YELLOW)] + private static void TagYellow() { Tag(FolderTags.Yellow);} + [MenuItem(TAG_LIME)] + private static void TagLime() { Tag(FolderTags.Lime);} + [MenuItem(TAG_GREEN)] + private static void TagGreen() { Tag(FolderTags.Green);} + [MenuItem(TAG_CYAN)] + private static void TagCyan() { Tag(FolderTags.Cyan);} + [MenuItem(TAG_BLUE)] + private static void TagBlue() { Tag(FolderTags.Blue);} + [MenuItem(TAG_DARK_BLUE)] + private static void TagDarkBlue() { Tag(FolderTags.DarkBlue);} + [MenuItem(TAG_VIOLET)] + private static void TagViolet() { Tag(FolderTags.Violet);} + [MenuItem(TAG_MAGENTA)] + private static void TagMagenta() { Tag(FolderTags.Magenta);} + + // Type + + [MenuItem(TYPE_PREFABS)] + private static void TypePrefabs() { AssingType(FolderTypes.Prefabs); } + [MenuItem(TYPE_SCENES)] + private static void TypeScenes() { AssingType(FolderTypes.Scenes); } + [MenuItem(TYPE_SCRIPTS)] + private static void TypeScripts() { AssingType(FolderTypes.Scripts); } + [MenuItem(TYPE_EXTENSIONS)] + private static void TypeExtensions() { AssingType(FolderTypes.Extensions); } + [MenuItem(TYPE_PLUGINS)] + private static void TypePlugins() { AssingType(FolderTypes.Plugins); } + [MenuItem(TYPE_TEXTURES)] + private static void TypeTextures() { AssingType(FolderTypes.Textures); } + [MenuItem(TYPE_MATERIALS)] + private static void TypeMaterials() { AssingType(FolderTypes.Materials); } + [MenuItem(TYPE_AUDIO)] + private static void TypeAudio() { AssingType(FolderTypes.Audio); } + [MenuItem(TYPE_BRACKETS)] + private static void TypeBrackets() { AssingType(FolderTypes.Brackets); } + [MenuItem(TYPE_FONTS)] + private static void TypeFonts() { AssingType(FolderTypes.Fonts); } + [MenuItem(TYPE_EDITOR)] + private static void TypeEditor() { AssingType(FolderTypes.Editor); } + [MenuItem(TYPE_RESOURCES)] + private static void TypeResources() { AssingType(FolderTypes.Resources); } + [MenuItem(TYPE_SHADERS)] + private static void TypeShaders() { AssingType(FolderTypes.Shaders); } + [MenuItem(TYPE_TERRAINS)] + private static void TypeTerrains() { AssingType(FolderTypes.Terrains); } + [MenuItem(TYPE_MESHES)] + private static void TypeMeshes() { AssingType(FolderTypes.Meshes); } + [MenuItem(TYPE_RAINBOW)] + private static void TypeRainbow() { AssingType(FolderTypes.Rainbow); } + + //--------------------------------------------------------------------- + // Public + //--------------------------------------------------------------------- + + public static void RevertToDefault() { - if (tag == FolderTags.Default) - { - RevertSelectedFoldersToDefault(); - return; - } + RevertSelectedFoldersToDefault(); + } + public static void Tag(FolderTags tag) + { var icons = FolderTagsStorage.Instance.GetIconsByTag(tag); ChangeSelectedFoldersIcons(icons); } public static void Colorize(FolderColors color) { - if (color == FolderColors.Default) - { - RevertSelectedFoldersToDefault(); - return; - } - var icons = FolderColorsStorage.Instance.GetIconsByColor(color); ChangeSelectedFoldersIcons(icons); } + public static void AssingType(FolderTypes type) + { + var icons = FolderTypesStorage.Instance.GetIconsByType(type); + ChangeSelectedFoldersIcons(icons); + } + + //--------------------------------------------------------------------- + // Helpers + //--------------------------------------------------------------------- + private static void ChangeSelectedFoldersIcons(FolderIconPair icons) { Selection.assetGUIDs.ToList().ForEach( assetGuid => { var assetPath = AssetDatabase.GUIDToAssetPath(assetGuid); - if (AssetDatabase.IsValidFolder(assetPath)) - { - var folder = AssetDatabase.LoadAssetAtPath(assetPath); - var path = AssetDatabase.GetAssetPath(folder); - RainbowFoldersSettings.Instance.ChangeFolderIconsByPath(path, icons); - } - else - { - // Can't colorize other assets - } + if (!AssetDatabase.IsValidFolder(assetPath)) return; + + var folder = AssetDatabase.LoadAssetAtPath(assetPath); + var path = AssetDatabase.GetAssetPath(folder); + RainbowFoldersSettings.Instance.ChangeFolderIconsByPath(path, icons); } ); } diff --git a/Assets/RainbowFolders/Editor/Menu/Tags.meta b/Assets/RainbowFolders/Editor/Menu/Tags.meta index 211f796..0b2e6de 100644 --- a/Assets/RainbowFolders/Editor/Menu/Tags.meta +++ b/Assets/RainbowFolders/Editor/Menu/Tags.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 195d6ccf46d3c4c6ca77183772f28cbb +guid: 238ea62c437d84c8788c3c097e44b670 folderAsset: yes timeCreated: 1466808761 licenseType: Pro diff --git a/Assets/RainbowFolders/Editor/Menu/Tags/FolderTags.cs b/Assets/RainbowFolders/Editor/Menu/Tags/FolderTags.cs index eeaf24e..d0bf724 100644 --- a/Assets/RainbowFolders/Editor/Menu/Tags/FolderTags.cs +++ b/Assets/RainbowFolders/Editor/Menu/Tags/FolderTags.cs @@ -17,8 +17,6 @@ namespace Borodar.RainbowFolders.Editor { public enum FolderTags { - Default = -1, - Red = 0, Vermilion = 1, Orange = 2, diff --git a/Assets/RainbowFolders/Editor/Menu/Types.meta b/Assets/RainbowFolders/Editor/Menu/Types.meta new file mode 100644 index 0000000..44ae26b --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: af84f6f5a29684a6e9823a2a371a3702 +folderAsset: yes +timeCreated: 1471261623 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs new file mode 100644 index 0000000..9801f6a --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs @@ -0,0 +1,36 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +namespace Borodar.RainbowFolders.Editor +{ + public enum FolderTypes + { + Prefabs = 0, + Scenes = 1, + Scripts = 2, + Extensions = 3, + Plugins = 4, + Textures = 5, + Materials = 6, + Audio = 7, + Brackets = 8, + Fonts = 9, + Editor = 10, + Resources = 11, + Shaders = 12, + Terrains = 13, + Meshes = 14, + Rainbow = 15 + } +} diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs.meta b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs.meta new file mode 100644 index 0000000..1bc93d3 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypes.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b3b3947f98eaf4dd1bf60144abe49392 +timeCreated: 1471261623 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs new file mode 100644 index 0000000..ef5a1a2 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs @@ -0,0 +1,72 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +using UnityEngine; +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using Borodar.RainbowFolders.Editor.Settings; +using System.IO; + +namespace Borodar.RainbowFolders.Editor +{ + public class FolderTypesStorage : ScriptableObject + { + public const string FOLDER_TYPE_STORAGE_ASSET_NAME = "RainbowTypeFoldersIconsStorage"; + + public List TypeFolderIcons; + + private static FolderTypesStorage instance; + + public static FolderTypesStorage Instance + { + get + { + if (instance == null) + { + var typeStorageAssetPath = GetTypeStorageAssetPath(); + if ((instance = EditorGUIUtility.Load(typeStorageAssetPath) as FolderTypesStorage) == null) + { + if (!Directory.Exists(Path.Combine(Application.dataPath, RainbowFoldersSettings.SETTINGS_PATH))) + { + AssetDatabase.CreateFolder("Assets", RainbowFoldersSettings.SETTINGS_PATH); + } + + RainbowFoldersEditorUtility.CreateAsset(FOLDER_TYPE_STORAGE_ASSET_NAME, + Path.Combine("Assets", RainbowFoldersSettings.SETTINGS_PATH)); + instance = EditorGUIUtility.Load(typeStorageAssetPath) as FolderTypesStorage; + } + } + return instance; + } + } + + private static string GetTypeStorageAssetPath() + { + string assetNameWithExtension = string.Join(".", new[] + { + FOLDER_TYPE_STORAGE_ASSET_NAME, + RainbowFoldersSettings.SETTINGS_ASSET_EXTENSION + }); + string settingsPath = Path.Combine(RainbowFoldersSettings.SETTINGS_FOLDER, assetNameWithExtension); + return settingsPath; + } + + public FolderIconPair GetIconsByType(FolderTypes type) + { + var colorFolder = TypeFolderIcons.Single(x => x.Type == type); + return new FolderIconPair { SmallIcon = colorFolder.SmallIcon, LargeIcon = colorFolder.LargeIcon }; + } + } +} diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs.meta b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs.meta new file mode 100644 index 0000000..7aae5a1 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FolderTypesStorage.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 61ce4e6f0e8de4b869c42bc50400d057 +timeCreated: 1471261623 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs b/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs new file mode 100644 index 0000000..543a93b --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs @@ -0,0 +1,44 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +using Borodar.ReorderableList; +using UnityEditor; +using UnityEngine; + +namespace Borodar.RainbowFolders.Editor +{ + [CustomEditor(typeof(FolderTypesStorage))] + public class FoldersTypesContainerEditor : UnityEditor.Editor + { + private const string PROP_NAME_FOLDERS = "TypeFolderIcons"; + + private SerializedProperty _foldersProperty; + + protected void OnEnable() + { + _foldersProperty = serializedObject.FindProperty(PROP_NAME_FOLDERS); + } + + public override void OnInspectorGUI() + { + GUI.enabled = false; + EditorGUILayout.HelpBox("This is internal file for RainbowFolders. Do not edit.", MessageType.Warning); + + serializedObject.Update(); + ReorderableListGUI.Title("Internal storage of folder types icons"); + ReorderableListGUI.ListField(_foldersProperty); + serializedObject.ApplyModifiedProperties(); + } + } +} \ No newline at end of file diff --git a/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs.meta b/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs.meta new file mode 100644 index 0000000..1d1dcdb --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/FoldersTypesContainerEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c7803dbd8e1af4df2930924e67dc5294 +timeCreated: 1471261623 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs b/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs new file mode 100644 index 0000000..7e79032 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs @@ -0,0 +1,83 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +using UnityEngine; +using UnityEditor; + +namespace Borodar.RainbowFolders.Editor.Settings +{ + [CustomPropertyDrawer(typeof(RainbowTypeFolder))] + public class RainbowColorTypeFolderDrawer : PropertyDrawer + { + private const float PADDING = 8f; + private const float LINE_HEIGHT = 16f; + private const float LABELS_WIDTH = 100f; + private const float PREVIEW_SIZE_SMALL = 16f; + private const float PREVIEW_SIZE_LARGE = 64f; + + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + var originalPosition = position; + + var folderType = property.FindPropertyRelative("Type"); + var smallIcon = property.FindPropertyRelative("SmallIcon"); + var largeIcon = property.FindPropertyRelative("LargeIcon"); + + // Labels + + position.y += PADDING; + position.width = LABELS_WIDTH; + position.height = LINE_HEIGHT; + + EditorGUI.LabelField(position, "Folder Color"); + position.y += LINE_HEIGHT; + EditorGUI.LabelField(position, "Small Icon"); + position.y += LINE_HEIGHT; + EditorGUI.LabelField(position, "Large Icon"); + + // Values + + position.x += LABELS_WIDTH; + position.y = originalPosition.y + PADDING; + position.width = originalPosition.width - LABELS_WIDTH - PREVIEW_SIZE_LARGE - PADDING; + + EditorGUI.PropertyField(position, folderType, GUIContent.none); + position.y += LINE_HEIGHT; + EditorGUI.PropertyField(position, smallIcon, GUIContent.none); + position.y += LINE_HEIGHT; + EditorGUI.PropertyField(position, largeIcon, GUIContent.none); + + // Preview + + position.x += position.width + PADDING; + position.y = originalPosition.y; + position.width = position.height = PREVIEW_SIZE_LARGE; + GUI.DrawTexture(position, (Texture2D)largeIcon.objectReferenceValue ?? GetDefaultFolderIcon()); + + position.y += PREVIEW_SIZE_LARGE - PREVIEW_SIZE_SMALL - 4f; + position.width = position.height = PREVIEW_SIZE_SMALL; + GUI.DrawTexture(position, (Texture2D)smallIcon.objectReferenceValue ?? GetDefaultFolderIcon()); + } + + public override float GetPropertyHeight(SerializedProperty property, GUIContent label) + { + return PREVIEW_SIZE_LARGE; + } + + private static Texture2D GetDefaultFolderIcon() + { + return EditorGUIUtility.FindTexture("Folder Icon"); + } + } +} \ No newline at end of file diff --git a/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs.meta b/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs.meta new file mode 100644 index 0000000..c1079c5 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/RainbowColorTypeFolderDrawer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9b79d7f5a46ea46578e3c02a31f8da9a +timeCreated: 1471261623 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs b/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs new file mode 100644 index 0000000..2504d15 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs @@ -0,0 +1,27 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +using System; +using UnityEngine; + +namespace Borodar.RainbowFolders.Editor +{ + [Serializable] + public class RainbowTypeFolder + { + public FolderTypes Type; + public Texture2D SmallIcon; + public Texture2D LargeIcon; + } +} \ No newline at end of file diff --git a/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs.meta b/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs.meta new file mode 100644 index 0000000..1f5fa96 --- /dev/null +++ b/Assets/RainbowFolders/Editor/Menu/Types/RainbowTypeFolder.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3ce09789c11bc40de9b9d95710b37851 +timeCreated: 1471261623 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RainbowFolders/Editor/RainbowFoldersBrowserIcons.cs b/Assets/RainbowFolders/Editor/RainbowFoldersBrowserIcons.cs index 98fb8f9..22a4334 100644 --- a/Assets/RainbowFolders/Editor/RainbowFoldersBrowserIcons.cs +++ b/Assets/RainbowFolders/Editor/RainbowFoldersBrowserIcons.cs @@ -18,7 +18,7 @@ namespace Borodar.RainbowFolders.Editor { - /* + /* * This script allows you to set custom icons for folders in project browser. * Recommended icon sizes - small: 16x16 px, large: 64x64 px; */ @@ -44,7 +44,6 @@ static RainbowFoldersBrowserIcons() static void ReplaceFolderIcon(string guid, Rect rect) { var path = AssetDatabase.GUIDToAssetPath(guid); - if (!AssetDatabase.IsValidFolder(path)) return; var isSmall = rect.width > rect.height; @@ -58,16 +57,22 @@ static void ReplaceFolderIcon(string guid, Rect rect) } var texture = RainbowFoldersSettings.Instance.GetCustomFolderIcon(path, isSmall); - if (texture == null) return; + if (rect.width > LARGE_ICON_SIZE) { + // center the icon if it is zoomed var offset = (rect.width - LARGE_ICON_SIZE) / 2f; var position = new Rect(rect.x + offset, rect.y + offset, LARGE_ICON_SIZE, LARGE_ICON_SIZE); GUI.DrawTexture(position, texture); } else { + #if UNITY_5_5_OR_NEWER + // unity shifted small icons a bit in 5.5 + if (isSmall) rect = new Rect(rect.x + 3, rect.y, rect.width, rect.height); + #endif + GUI.DrawTexture(rect, texture); } } diff --git a/Assets/RainbowFolders/Editor/Settings.meta b/Assets/RainbowFolders/Editor/Settings.meta index ad7d5c0..0f6b168 100644 --- a/Assets/RainbowFolders/Editor/Settings.meta +++ b/Assets/RainbowFolders/Editor/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4518fd6fde8775c48bd18c8f640604ea +guid: aa5ce7f201ea04b8e8cee21ec1672ee8 folderAsset: yes timeCreated: 1445183189 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Textures.meta b/Assets/RainbowFolders/Editor/Textures.meta index d9c6e8e..edfc1c2 100644 --- a/Assets/RainbowFolders/Editor/Textures.meta +++ b/Assets/RainbowFolders/Editor/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a22e8451a23c69641bba3499fb913af2 +guid: 547022d0acfea47aeb6a4e1daac05343 folderAsset: yes timeCreated: 1445107207 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Textures/Colors.meta b/Assets/RainbowFolders/Editor/Textures/Colors.meta index cf89978..13b0e9a 100644 --- a/Assets/RainbowFolders/Editor/Textures/Colors.meta +++ b/Assets/RainbowFolders/Editor/Textures/Colors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3fa59dc52b596642be3417dfd6f740a +guid: 81c6e1827a3534c0ebbd2d08548bd2bf folderAsset: yes timeCreated: 1465731045 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Textures/Tags.meta b/Assets/RainbowFolders/Editor/Textures/Tags.meta index 970560b..4ceec27 100644 --- a/Assets/RainbowFolders/Editor/Textures/Tags.meta +++ b/Assets/RainbowFolders/Editor/Textures/Tags.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90ff21df57f706b4dbb5ee636d5ee3f9 +guid: 07856c9b9ff5244c5aef0d62ba23302c folderAsset: yes timeCreated: 1466782420 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Textures/Types.meta b/Assets/RainbowFolders/Editor/Textures/Types.meta index a121538..4496e07 100644 --- a/Assets/RainbowFolders/Editor/Textures/Types.meta +++ b/Assets/RainbowFolders/Editor/Textures/Types.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 627f1a4882699164e99b03a97e11dfb6 +guid: 155d3c8b189f74d798a1382ab358a085 folderAsset: yes timeCreated: 1465731118 licenseType: Free diff --git a/Assets/RainbowFolders/Editor/Textures/Types/Special.meta b/Assets/RainbowFolders/Editor/Textures/Types/Special.meta index fab0643..c04c209 100644 --- a/Assets/RainbowFolders/Editor/Textures/Types/Special.meta +++ b/Assets/RainbowFolders/Editor/Textures/Types/Special.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d738287ace899ff43b0d254fcc4b2a5b +guid: 28fccb3361db74d2a9dae164319fdc34 folderAsset: yes timeCreated: 1465731151 licenseType: Free diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 5a96ca8..1c938f8 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,16 +3,31 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 9 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} m_DeferredReflections: m_Mode: 1 m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} m_LegacyDeferred: m_Mode: 1 m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -21,9 +36,20 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_ShaderSettings: - useScreenSpaceShadows: 1 - m_BuildTargetShaderSettings: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_TierSettings_Tier1: + renderingPath: 1 + useCascadedShadowMaps: 0 + m_TierSettings_Tier2: + renderingPath: 1 + useCascadedShadowMaps: 0 + m_TierSettings_Tier3: + renderingPath: 1 + useCascadedShadowMaps: 0 + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 m_LightmapKeepPlain: 1 diff --git a/ProjectSettings/NavMeshProjectSettings.asset b/ProjectSettings/NavMeshProjectSettings.asset new file mode 100644 index 0000000..a04f35c --- /dev/null +++ b/ProjectSettings/NavMeshProjectSettings.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshAreas: + m_ObjectHideFlags: 0 + serializedVersion: 2 + areas: + - name: Walkable + cost: 1 + - name: Not Walkable + cost: 1 + - name: Jump + cost: 2 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8f24308..34fe037 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,6 +4,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 8 + productGUID: 1f20db2868dfd0b44b68e6ee95aff580 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 @@ -72,6 +73,7 @@ PlayerSettings: uiUse16BitDepthBuffer: 0 ignoreAlphaClear: 0 xboxOneResolution: 0 + xboxOneMonoLoggingLevel: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 @@ -98,7 +100,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 0 singlePassStereoRendering: 0 protectGraphicsMemory: 0 - productGUID: 1f20db2868dfd0b44b68e6ee95aff580 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -254,6 +255,7 @@ PlayerSettings: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 @@ -280,6 +282,7 @@ PlayerSettings: ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 ps4disableAutoHideSplash: 0 ps4IncludedModules: [] monoEnv: @@ -424,14 +427,48 @@ PlayerSettings: iOS::EnableIncrementalBuildSupportForIl2cpp: 0 iOS::ScriptingBackend: 1 boolPropertyNames: + - Android::VR::enable + - Metro::VR::enable + - N3DS::VR::enable + - PS3::VR::enable + - PS4::VR::enable + - PSM::VR::enable + - PSP2::VR::enable + - SamsungTV::VR::enable + - Standalone::VR::enable + - Tizen::VR::enable + - WebGL::VR::enable - WebGL::analyzeBuildSize - WebGL::dataCaching - WebGL::useEmbeddedResources + - WebPlayer::VR::enable + - WiiU::VR::enable + - Xbox360::VR::enable + - XboxOne::VR::enable - XboxOne::enus + - iOS::VR::enable + - tvOS::VR::enable + Android::VR::enable: 0 + Metro::VR::enable: 0 + N3DS::VR::enable: 0 + PS3::VR::enable: 0 + PS4::VR::enable: 0 + PSM::VR::enable: 0 + PSP2::VR::enable: 0 + SamsungTV::VR::enable: 0 + Standalone::VR::enable: 0 + Tizen::VR::enable: 0 + WebGL::VR::enable: 0 WebGL::analyzeBuildSize: 0 WebGL::dataCaching: 0 WebGL::useEmbeddedResources: 0 + WebPlayer::VR::enable: 0 + WiiU::VR::enable: 0 + Xbox360::VR::enable: 0 + XboxOne::VR::enable: 0 XboxOne::enus: 1 + iOS::VR::enable: 0 + tvOS::VR::enable: 0 stringPropertyNames: - Analytics_ServiceEnabled::Analytics_ServiceEnabled - Build_ServiceEnabled::Build_ServiceEnabled @@ -457,7 +494,44 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - vectorPropertyNames: [] + vectorPropertyNames: + - Android::VR::enabledDevices + - Metro::VR::enabledDevices + - N3DS::VR::enabledDevices + - PS3::VR::enabledDevices + - PS4::VR::enabledDevices + - PSM::VR::enabledDevices + - PSP2::VR::enabledDevices + - SamsungTV::VR::enabledDevices + - Standalone::VR::enabledDevices + - Tizen::VR::enabledDevices + - WebGL::VR::enabledDevices + - WebPlayer::VR::enabledDevices + - WiiU::VR::enabledDevices + - Xbox360::VR::enabledDevices + - XboxOne::VR::enabledDevices + - iOS::VR::enabledDevices + - tvOS::VR::enabledDevices + Android::VR::enabledDevices: + - Oculus + Metro::VR::enabledDevices: [] + N3DS::VR::enabledDevices: [] + PS3::VR::enabledDevices: [] + PS4::VR::enabledDevices: + - PlayStationVR + PSM::VR::enabledDevices: [] + PSP2::VR::enabledDevices: [] + SamsungTV::VR::enabledDevices: [] + Standalone::VR::enabledDevices: + - Oculus + Tizen::VR::enabledDevices: [] + WebGL::VR::enabledDevices: [] + WebPlayer::VR::enabledDevices: [] + WiiU::VR::enabledDevices: [] + Xbox360::VR::enabledDevices: [] + XboxOne::VR::enabledDevices: [] + iOS::VR::enabledDevices: [] + tvOS::VR::enabledDevices: [] cloudProjectId: projectName: organizationId: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 558807b..4215e14 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.3.5f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.0f2 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050c..0000000 --- a/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 9b7a578..cc79974 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,6 +3,13 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_Enabled: 0 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 @@ -12,3 +19,10 @@ UnityConnectSettings: m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: