diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 79b88239..710ed8a0 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -2,10 +2,8 @@ latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - + C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -13,8 +11,7 @@ 10.0.20506 2.0 - {7cc02776-5953-02f0-1d58-e2f51d95c564} - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {7627C07C-5359-F002-1D58-E2F51D95C564} Library Properties Assembly-CSharp-Editor @@ -30,9 +27,8 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0 prompt 4 - + 0169 False - False pdbonly @@ -40,9 +36,8 @@ Temp\bin\Release\ prompt 4 - + 0169 False - False true @@ -282,22 +277,22 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll - C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll - C:/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -648,106 +643,107 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll - {e0f48af5-6d3e-b154-523d-8f755dc8e665} + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} Assembly-CSharp + false diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 48fc790b..83aec578 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,10 +2,8 @@ latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - + C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -13,8 +11,7 @@ 10.0.20506 2.0 - {e0f48af5-6d3e-b154-523d-8f755dc8e665} - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} Library Properties Assembly-CSharp @@ -30,9 +27,8 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 - + 0169 False - False pdbonly @@ -40,9 +36,8 @@ Temp\bin\Release\ prompt 4 - + 0169 False - False true @@ -571,7 +566,7 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -919,94 +914,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/Monster/Crab/Crab.prefab b/Assets/Animations/Monster/Crab/Crab.prefab index 775d08e0..47575605 100644 --- a/Assets/Animations/Monster/Crab/Crab.prefab +++ b/Assets/Animations/Monster/Crab/Crab.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &1119590322399632647 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -195,7 +198,7 @@ MonoBehaviour: health: 4 baseAttack: 3.5 isKilled: 0 - MinionName: + MinionName: Crab target: {fileID: 0} chaseRadius: 5 attackRadius: 0.5 diff --git a/Assets/Animations/Monster/FireSmall/FireSmall.prefab b/Assets/Animations/Monster/FireSmall/FireSmall.prefab index bdbcc725..831c9da4 100644 --- a/Assets/Animations/Monster/FireSmall/FireSmall.prefab +++ b/Assets/Animations/Monster/FireSmall/FireSmall.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -154,7 +156,7 @@ MonoBehaviour: health: 8 baseAttack: 5 isKilled: 0 - MinionName: + MinionName: Flame target: {fileID: 0} chaseRadius: 5 attackRadius: 0.5 @@ -201,7 +203,7 @@ MonoBehaviour: path: [] --- !u!95 &4177423996048265966 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -214,6 +216,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 diff --git a/Assets/Animations/Monster/Klackon/Klackon.prefab b/Assets/Animations/Monster/Klackon/Klackon.prefab index 6f083682..a42a92d9 100644 --- a/Assets/Animations/Monster/Klackon/Klackon.prefab +++ b/Assets/Animations/Monster/Klackon/Klackon.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.099894, y: -0.4531536, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &-5786105701557159930 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -195,7 +198,7 @@ MonoBehaviour: health: 10 baseAttack: 6 isKilled: 0 - MinionName: + MinionName: Klackon target: {fileID: 0} chaseRadius: 5 attackRadius: 0.5 diff --git a/Assets/Animations/Monster/Mask/Mask.prefab b/Assets/Animations/Monster/Mask/Mask.prefab index 15840363..36628c00 100644 --- a/Assets/Animations/Monster/Mask/Mask.prefab +++ b/Assets/Animations/Monster/Mask/Mask.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.9135627, y: -3.112205, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &-5511078705462848272 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -195,7 +198,7 @@ MonoBehaviour: health: 9 baseAttack: 5 isKilled: 0 - MinionName: + MinionName: Mask target: {fileID: 0} chaseRadius: 4 attackRadius: 0.5 diff --git a/Assets/Animations/Monster/Mushroom/Mushroom.prefab b/Assets/Animations/Monster/Mushroom/Mushroom.prefab index 6ad73dbe..6e14e53a 100644 --- a/Assets/Animations/Monster/Mushroom/Mushroom.prefab +++ b/Assets/Animations/Monster/Mushroom/Mushroom.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &1119590322399632647 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -195,7 +198,7 @@ MonoBehaviour: health: 12 baseAttack: 5.5 isKilled: 0 - MinionName: + MinionName: Mushroom path: [] currentPoint: 0 currentGoal: {fileID: 0} diff --git a/Assets/Animations/Monster/Skull/Skull.prefab b/Assets/Animations/Monster/Skull/Skull.prefab index ef0b4f60..a12e2d25 100644 --- a/Assets/Animations/Monster/Skull/Skull.prefab +++ b/Assets/Animations/Monster/Skull/Skull.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.144212, y: -2.6247122, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &6504153931694277906 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -173,7 +176,7 @@ MonoBehaviour: health: 18 baseAttack: 4 isKilled: 0 - MinionName: + MinionName: Skull target: {fileID: 0} chaseRadius: 4 attackRadius: 0.4 diff --git a/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab b/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab index 87c089ef..cb7125ea 100644 --- a/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab +++ b/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab @@ -34,6 +34,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -49,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,7 +93,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &1119590322399632647 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +106,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -195,7 +198,7 @@ MonoBehaviour: health: 9 baseAttack: 4.5 isKilled: 0 - MinionName: + MinionName: EarthSmall path: [] currentPoint: 0 currentGoal: {fileID: 0} diff --git a/Assets/OpenSettingsOnESCPress.cs b/Assets/OpenSettingsOnESCPress.cs index fdfdfd75..66c86ec4 100644 --- a/Assets/OpenSettingsOnESCPress.cs +++ b/Assets/OpenSettingsOnESCPress.cs @@ -13,8 +13,8 @@ public class OpenSettingsOnESCPress : MonoBehaviour void Update() { - KeyCode keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings")); - if (Input.GetKeyUp(keyToSettings)) + //KeyCode keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings")); + if (Input.GetKeyUp(KeyCode.Escape)) { if ((SettingsMainPanel.active == false) && (SettingsPanel.active == false) && (SoundsPanel.active == false) && (ControlsPanel.active == false) && (LanguagePanel.active == false)) { diff --git a/Assets/Scenes/Catacombs.unity b/Assets/Scenes/Catacombs.unity index c93b9097..6fd7b6a1 100644 --- a/Assets/Scenes/Catacombs.unity +++ b/Assets/Scenes/Catacombs.unity @@ -155,6 +155,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -659.28564, y: -370.71426, z: 0} m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 286215656} m_RootOrder: 0 @@ -170,6 +171,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -236,6 +238,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 809230141} - {fileID: 655468482} @@ -277,6 +280,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337149901} m_RootOrder: 3 @@ -449,6 +453,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1873963897} m_RootOrder: 2 @@ -617,6 +622,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 3 @@ -664,6 +670,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1590806309} m_RootOrder: 0 @@ -832,6 +839,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 7.36, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 1 @@ -926,6 +934,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337149901} m_RootOrder: 2 @@ -1003,6 +1012,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.45, y: -8.22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 5 @@ -1033,6 +1043,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1555562466} - {fileID: 199810537} @@ -1071,6 +1082,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 48463740} m_Father: {fileID: 2104115633} @@ -1146,6 +1158,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321112481} m_RootOrder: 0 @@ -1194,6 +1207,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1475557202} m_RootOrder: 0 @@ -1356,6 +1370,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 308038388} - {fileID: 1560868854} @@ -1462,6 +1477,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1494,6 +1510,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1872802748} - {fileID: 2142684861} @@ -1573,6 +1590,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676315066} m_RootOrder: 2 @@ -1648,6 +1666,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443125922} m_RootOrder: 0 @@ -1663,6 +1682,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10749,6 +10769,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -10840,6 +10861,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1.48, y: 1.48, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 922665671} m_RootOrder: 0 @@ -10995,6 +11017,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1802590641} m_RootOrder: 1 @@ -11075,6 +11098,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443125922} m_RootOrder: 1 @@ -11090,6 +11114,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13864,6 +13889,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 2 @@ -13922,6 +13948,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.929867, y: 14.708788, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 286103255} - {fileID: 566985336} @@ -13962,6 +13989,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560234013} m_RootOrder: 1 @@ -14367,6 +14395,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1044274175} m_Father: {fileID: 1094955537} @@ -14404,6 +14433,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 5 @@ -14449,6 +14479,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 2 @@ -14525,6 +14556,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1414550739} - {fileID: 1372366485} @@ -14657,6 +14689,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2103202255} m_RootOrder: 0 @@ -14749,6 +14782,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 542687112} - {fileID: 1447267197} @@ -14804,6 +14838,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 852779020} m_RootOrder: 0 @@ -14903,6 +14938,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676315066} m_RootOrder: 0 @@ -15103,6 +15139,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 4 @@ -15195,6 +15232,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2096156761} m_RootOrder: 2 @@ -15282,6 +15320,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560234013} m_RootOrder: 3 @@ -15505,6 +15544,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560234013} m_RootOrder: 0 @@ -15618,6 +15658,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1562526899} m_RootOrder: 0 @@ -15693,6 +15734,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2096156761} m_RootOrder: 0 @@ -15847,6 +15889,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.45, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 0 @@ -15879,6 +15922,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 570435097} m_Father: {fileID: 1537009611} @@ -16099,6 +16143,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1467027545} - {fileID: 321112481} @@ -16150,6 +16195,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -16182,6 +16228,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -16276,6 +16323,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 366805452} - {fileID: 1519075568} @@ -16344,6 +16392,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 13 @@ -16376,6 +16425,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1052797815} m_RootOrder: 0 @@ -16456,6 +16506,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1590806309} m_RootOrder: 1 @@ -16644,6 +16695,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443125922} m_RootOrder: 2 @@ -16659,6 +16711,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -49549,6 +49602,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2096156761} m_RootOrder: 3 @@ -49773,6 +49827,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 7.36, y: 7.36, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 2 @@ -49804,6 +49859,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321112481} m_RootOrder: 4 @@ -49967,6 +50023,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447873359} m_RootOrder: 0 @@ -50041,6 +50098,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 934145151} - {fileID: 2019051569} @@ -50145,6 +50203,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1387529180} m_RootOrder: 0 @@ -50295,6 +50354,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.9589837} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1565855736} - {fileID: 2075437072} @@ -50398,6 +50458,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019051569} m_RootOrder: 0 @@ -50471,6 +50532,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 7.45, y: -8.22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 3 @@ -50617,6 +50679,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1614746956} - {fileID: 1762716938} @@ -50759,6 +50822,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676315066} m_RootOrder: 1 @@ -50838,6 +50902,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321112481} m_RootOrder: 2 @@ -50941,6 +51006,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676315066} m_RootOrder: 3 @@ -51020,6 +51086,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1590806309} m_RootOrder: 3 @@ -51213,6 +51280,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321112481} m_RootOrder: 3 @@ -51266,6 +51334,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560234013} m_RootOrder: 2 @@ -51485,6 +51554,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1537009611} m_RootOrder: 1 @@ -51564,6 +51634,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 1 @@ -51639,6 +51710,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1074120399} m_Father: {fileID: 1802590641} @@ -51739,6 +51811,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 20, z: 60} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -51942,6 +52015,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 0 @@ -52091,6 +52165,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 351610902} - {fileID: 407612202} @@ -52131,6 +52206,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1590806309} m_RootOrder: 2 @@ -52324,6 +52400,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4530646, y: -3.8489263, z: 4.197498} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -52422,6 +52499,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 6 @@ -52499,6 +52577,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 0 @@ -52640,6 +52719,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 317014144} - {fileID: 2021738495} @@ -52722,6 +52802,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1475557202} m_RootOrder: 2 @@ -52888,6 +52969,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 922665671} m_RootOrder: 1 @@ -53033,6 +53115,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9500031, y: 0.20000178, z: 4.8} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1849206081} - {fileID: 1348390129} @@ -53155,6 +53238,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 713226932} - {fileID: 431601324} @@ -53196,6 +53280,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321112481} m_RootOrder: 1 @@ -53238,6 +53323,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 725206834} m_Father: {fileID: 1052797815} @@ -53276,6 +53362,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1094955537} m_RootOrder: 0 @@ -53351,6 +53438,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443125922} m_RootOrder: 3 @@ -53366,6 +53454,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -53516,6 +53605,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1873963897} m_RootOrder: 3 @@ -53680,6 +53770,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 141600212} - {fileID: 948322515} @@ -53759,6 +53850,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 6 @@ -53836,6 +53928,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1127174150} m_RootOrder: 0 @@ -54008,6 +54101,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2104115633} m_RootOrder: 2 @@ -54153,6 +54247,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 857141515} m_RootOrder: 4 @@ -54221,6 +54316,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 591513750} - {fileID: 1136302501} @@ -54405,6 +54501,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1127174150} m_RootOrder: 2 @@ -54572,6 +54669,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -54610,6 +54708,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1127174150} m_RootOrder: 1 @@ -54707,6 +54806,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1475557202} m_RootOrder: 3 @@ -54876,6 +54976,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1802590641} m_RootOrder: 0 @@ -55085,6 +55186,7 @@ MonoBehaviour: - {fileID: 281735110} - {fileID: 1108941934} killedMinions: 0 + associatedChest: {fileID: 0} --- !u!4 &1797967006 Transform: m_ObjectHideFlags: 0 @@ -55095,6 +55197,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 833322047} - {fileID: 215490326} @@ -55133,6 +55236,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9499999, y: 0.2, z: 4.799999} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1777565460} - {fileID: 405730991} @@ -55269,6 +55373,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1837678899} m_RootOrder: 0 @@ -55363,6 +55468,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1816368506} m_Father: {fileID: 1537009611} @@ -55465,6 +55571,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1537009611} m_RootOrder: 0 @@ -55547,6 +55654,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337149901} m_RootOrder: 0 @@ -55709,6 +55817,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2131617879} - {fileID: 1880106645} @@ -55791,6 +55900,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1873963897} m_RootOrder: 1 @@ -55955,6 +56065,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 5 @@ -56030,6 +56141,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2075437072} m_RootOrder: 0 @@ -56105,6 +56217,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443125922} m_RootOrder: 4 @@ -56120,6 +56233,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -56842,6 +56956,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.54219836, y: -6.3745008, z: -0.053804293} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 @@ -56879,6 +56994,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2096156761} m_RootOrder: 1 @@ -57038,6 +57154,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -3.5, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -57125,6 +57242,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1104999883} m_Father: {fileID: 1052797815} @@ -57167,6 +57285,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1475557202} m_RootOrder: 1 @@ -57545,6 +57664,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560234013} m_RootOrder: 4 @@ -57621,6 +57741,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 524799963} m_RootOrder: 3 @@ -57711,6 +57832,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1950286028} m_Father: {fileID: 1094955537} @@ -57804,6 +57926,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.45, y: 8.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1797967006} m_RootOrder: 4 @@ -57836,6 +57959,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 784642466} - {fileID: 1980931167} @@ -57915,6 +58039,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2104115633} m_RootOrder: 0 @@ -57994,6 +58119,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.34999996, y: 0.19999997, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 559084182} m_Father: {fileID: 922665671} @@ -58070,6 +58196,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2098727640} - {fileID: 286215656} @@ -58151,6 +58278,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1873963897} m_RootOrder: 0 @@ -58313,6 +58441,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -58348,6 +58477,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337149901} m_RootOrder: 1 diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index b4fe0e71..3bedb433 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -1605,7 +1605,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &228588812 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Pathway.unity b/Assets/Scenes/Pathway.unity index b22df2f2..8d5dd1ae 100644 --- a/Assets/Scenes/Pathway.unity +++ b/Assets/Scenes/Pathway.unity @@ -113816,7 +113816,6 @@ Tilemap: serializedVersion: 2 m_TileIndex: 0 m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 @@ -113832,13 +113831,6 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: 67, y: 70, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: 68, y: 70, z: 0} diff --git a/Assets/Scripts/CamerFollow.cs b/Assets/Scripts/CamerFollow.cs index 0e07a25b..e3be4ec4 100644 --- a/Assets/Scripts/CamerFollow.cs +++ b/Assets/Scripts/CamerFollow.cs @@ -18,6 +18,7 @@ public class CamerFollow : MonoBehaviour void Start() { playerTransform = GameObject.FindGameObjectWithTag("Player").transform; + PlayerPrefs.SetInt("drunk", 0); } void LateUpdate() diff --git a/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs b/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs index 3bced169..a1030dcf 100644 --- a/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs +++ b/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs @@ -226,6 +226,11 @@ public class FollowingEnemy : Enemy // drop item process gameObject.GetComponent().Drop(); + + if(gameObject.GetComponent() != null) + { + gameObject.GetComponent().MarkAsKilled(); + } } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 0e47b079..61a308e3 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -148,6 +148,62 @@ public class Player : MonoBehaviour lvlUp = true; maxExp = 200; + // Add points and refresh view (if opened) + SkillsPointsManger.Instance.AddFreePoints(2); + SkillsPointsManger.Instance.UpdatePanelView(); + } + } + else if (lvl == 4) + { + maxExp = 200; + if (exp >= maxExp) + { + lvl = 5; + lvlUp = true; + maxExp = 300; + + // Add points and refresh view (if opened) + SkillsPointsManger.Instance.AddFreePoints(2); + SkillsPointsManger.Instance.UpdatePanelView(); + } + } + else if (lvl == 5) + { + maxExp = 300; + if (exp >= maxExp) + { + lvl = 6; + lvlUp = true; + maxExp = 450; + + // Add points and refresh view (if opened) + SkillsPointsManger.Instance.AddFreePoints(2); + SkillsPointsManger.Instance.UpdatePanelView(); + } + } + else if (lvl == 6) + { + maxExp = 450; + if (exp >= maxExp) + { + lvl = 7; + lvlUp = true; + maxExp = 550; + + // Add points and refresh view (if opened) + SkillsPointsManger.Instance.AddFreePoints(2); + SkillsPointsManger.Instance.UpdatePanelView(); + } + } + else if (lvl == 7) + { + maxExp = 550; + if (exp >= maxExp) + { + lvl = 8; + lvlUp = true; + maxExp = 700; + // Add points and refresh view (if opened) SkillsPointsManger.Instance.AddFreePoints(2); SkillsPointsManger.Instance.UpdatePanelView(); diff --git a/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs b/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs index c188d558..009f66fd 100644 --- a/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs +++ b/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs @@ -12,7 +12,7 @@ public class ChestController : MonoBehaviour private void OnTriggerStay2D(Collider2D collision) { - if (collision.tag == "Player") + if (collision.tag == "Player" && !gameObject.GetComponentInParent().IsLocked) { ChestUIManager.Instance.CurrentChestName = gameObject.transform.parent.name; } diff --git a/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs b/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs index 7a77a9d9..c93b8129 100644 --- a/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using UnityEngine; +using System.Collections; class PotionEffectsManager : ItemEffectsManager { @@ -54,7 +55,7 @@ class PotionEffectsManager : ItemEffectsManager } else if(item.name == "Beer") { - GameObject.FindObjectOfType().Drink(); + Drink(); } else if(item.name == "Crab Venom") { @@ -66,6 +67,18 @@ class PotionEffectsManager : ItemEffectsManager } } + public void Drink() + { + PlayerPrefs.SetInt("drunk", 1); + StartCoroutine(SoberUp()); + } + + public IEnumerator SoberUp() + { + yield return new WaitForSecondsRealtime(6); + PlayerPrefs.SetInt("drunk", 2); + } + // use below function in one above - depending on the condition public void HealthBigPotion() { diff --git a/Assets/Scripts/REFACTORING/Application/Tools/CounterRespowner.cs b/Assets/Scripts/REFACTORING/Application/Tools/CounterRespowner.cs index 5c4693df..8753992b 100644 --- a/Assets/Scripts/REFACTORING/Application/Tools/CounterRespowner.cs +++ b/Assets/Scripts/REFACTORING/Application/Tools/CounterRespowner.cs @@ -22,13 +22,24 @@ class CounterRespowner : MonoBehaviour private IEnumerator coroutine; + public GameObject associatedChest; public void Start() { + } public void Update() { + if(associatedChest == null) + { + associatedChest = GameObject.FindGameObjectWithTag("ChestCollection").transform.Find("Prize Chest")?.gameObject; + + if(associatedChest != null) + associatedChest.GetComponent().Lock(); + } + + if(Respown && Counter > 0) { Respown = false; @@ -42,8 +53,11 @@ class CounterRespowner : MonoBehaviour } StartCoroutine(coroutine); - } + + if (Counter <= 0 && killedMinions >= 30) + associatedChest.GetComponent().Unlock(); + } // najpier 10 @@ -95,7 +109,7 @@ class CounterRespowner : MonoBehaviour return; } - var newMinion = GameObject.Instantiate(minion, coord, Quaternion.identity, sceneGui.transform); + var newMinion = Instantiate(minion, coord, Quaternion.identity, sceneGui.transform); newMinion.name = minion.name; // newMinion.transform.SetParent(sceneGui.transform); diff --git a/Assets/Scripts/REFACTORING/Application/Tools/RespownTrigger.cs b/Assets/Scripts/REFACTORING/Application/Tools/RespownTrigger.cs index c9982a64..6ca6024a 100644 --- a/Assets/Scripts/REFACTORING/Application/Tools/RespownTrigger.cs +++ b/Assets/Scripts/REFACTORING/Application/Tools/RespownTrigger.cs @@ -19,12 +19,6 @@ class RespownTrigger : MonoBehaviour public void Update() { - if(gameObject.GetComponent().isKilled == 1 && !wasKilled) - { - wasKilled = true; - - MarkAsKilled(); - } } public void SetParentRespowner(GameObject parentRespowner) @@ -34,7 +28,10 @@ class RespownTrigger : MonoBehaviour public void MarkAsKilled() { + wasKilled = true; + CoreRespowner.GetComponent().killedMinions += 1; + CoreRespowner.GetComponent().Respown = true; } } diff --git a/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs index 235339bc..424df416 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs @@ -89,6 +89,11 @@ public class ChestUIManager : UIBaseManager public override bool ClosePanel() { + if (CurrentChestName == null || CurrentChestName == "") + { + return false; + } + base.ClosePanel(); ChestContentUIManager.Instance.DynamicPanel = null; diff --git a/Assets/Scripts/REFACTORING/Models/Chest/ChestWrapper.cs b/Assets/Scripts/REFACTORING/Models/Chest/ChestWrapper.cs index 8fdb7cd5..c36cb2aa 100644 --- a/Assets/Scripts/REFACTORING/Models/Chest/ChestWrapper.cs +++ b/Assets/Scripts/REFACTORING/Models/Chest/ChestWrapper.cs @@ -10,5 +10,18 @@ class ChestWrapper : MonoBehaviour { [SerializeField] public Chest Chest; + + [SerializeField] + public bool IsLocked = false; + + public void Unlock() + { + IsLocked = false; + } + + public void Lock() + { + IsLocked = true; + } } diff --git a/Scriptum.sln b/Scriptum.sln index 13d86e2b..59166d3c 100644 --- a/Scriptum.sln +++ b/Scriptum.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7cc02776-5953-02f0-1d58-e2f51d95c564}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7627C07C-5359-F002-1D58-E2F51D95C564}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.Build.0 = Release|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index c5234111..fc6e8a9c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb - flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0