diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 710ed8a0..4f7abe60 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -2,8 +2,10 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts - unity_csc.bat + <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package + <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package + true + Debug @@ -11,7 +13,8 @@ 10.0.20506 2.0 - {7627C07C-5359-F002-1D58-E2F51D95C564} + {7cc02776-5953-02f0-1d58-e2f51d95c564} + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Properties Assembly-CSharp-Editor @@ -27,8 +30,9 @@ 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 @@ -36,8 +40,9 @@ Temp\bin\Release\ prompt 4 - 0169 + False + False true @@ -273,26 +278,29 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEditor.Graphs.dll + + C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.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.Newtonsoft.Json.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/Unity.Plastic.Antlr3.Runtime.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/unityplastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll + C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + C:/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 @@ -643,107 +651,106 @@ 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:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} + {e0f48af5-6d3e-b154-523d-8f755dc8e665} Assembly-CSharp - false diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a51de84a..11808763 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,8 +2,10 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts - unity_csc.bat + <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package + <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package + true + Debug @@ -11,7 +13,8 @@ 10.0.20506 2.0 - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} + {e0f48af5-6d3e-b154-523d-8f755dc8e665} + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Properties Assembly-CSharp @@ -27,8 +30,9 @@ 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 @@ -36,8 +40,9 @@ Temp\bin\Release\ prompt 4 - 0169 + False + False true @@ -131,6 +136,7 @@ + @@ -575,7 +581,7 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -923,94 +929,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/Fire/Fire.cs b/Assets/Animations/Fire/Fire.cs index 89ccfef8..eb5e27a2 100644 --- a/Assets/Animations/Fire/Fire.cs +++ b/Assets/Animations/Fire/Fire.cs @@ -9,14 +9,28 @@ public class Fire : MonoBehaviour float maxFlickerIntensity = 1.0f; float flickerSpeed = 4.9f; private HardLight2D firelight; + private HardLight2D[] lights; private GameObject fire; private int randomizer = 0; // Start is called before the first frame update void Start() { - firelight = FindObjectOfType(); - fire = GameObject.Find("Fire"); + + lights = FindObjectsOfType(); + List finalList = new List(); + string nameToLookFor = "LightFire"; + + for(var i = 0; i < lights.Length; i++) + { + if(lights[i].name == nameToLookFor) + { + finalList.Add(lights[i]); + } + } + firelight = finalList[0]; + + //firelight = FindObjectOfType(); StartCoroutine( ChangeRange()); } diff --git a/Assets/Animations/Portal.meta b/Assets/Animations/Portal.meta new file mode 100644 index 00000000..282ca517 --- /dev/null +++ b/Assets/Animations/Portal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ab219ba65b3fee49b7ac13978c70ff2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Portal/Green Portal Sprite Sheet.png b/Assets/Animations/Portal/Green Portal Sprite Sheet.png new file mode 100644 index 00000000..e1f6c5e5 Binary files /dev/null and b/Assets/Animations/Portal/Green Portal Sprite Sheet.png differ diff --git a/Assets/Animations/Portal/Green Portal Sprite Sheet.png.meta b/Assets/Animations/Portal/Green Portal Sprite Sheet.png.meta new file mode 100644 index 00000000..8e9c1851 --- /dev/null +++ b/Assets/Animations/Portal/Green Portal Sprite Sheet.png.meta @@ -0,0 +1,528 @@ +fileFormatVersion: 2 +guid: 81c1e556f37ff7d498815a51751db9e3 +TextureImporter: + internalIDToNameTable: + - first: + 213: -2719994208978545080 + second: Green Portal Sprite Sheet_0 + - first: + 213: 4394573487689358311 + second: Green Portal Sprite Sheet_1 + - first: + 213: -2285153152877451226 + second: Green Portal Sprite Sheet_2 + - first: + 213: 8165007364133127476 + second: Green Portal Sprite Sheet_3 + - first: + 213: -6852767344712249715 + second: Green Portal Sprite Sheet_4 + - first: + 213: -4848553832261993613 + second: Green Portal Sprite Sheet_5 + - first: + 213: 1943393458402971858 + second: Green Portal Sprite Sheet_6 + - first: + 213: 2502851955874185411 + second: Green Portal Sprite Sheet_7 + - first: + 213: 824154499171795023 + second: Green Portal Sprite Sheet_8 + - first: + 213: -6141282753041911926 + second: Green Portal Sprite Sheet_9 + - first: + 213: -7114761891093729983 + second: Green Portal Sprite Sheet_10 + - first: + 213: -2036634387726229738 + second: Green Portal Sprite Sheet_11 + - first: + 213: -7546389005682541580 + second: Green Portal Sprite Sheet_12 + - first: + 213: -5536896186241417835 + second: Green Portal Sprite Sheet_13 + - first: + 213: -3343418601671857258 + second: Green Portal Sprite Sheet_14 + - first: + 213: 5996213593317683434 + second: Green Portal Sprite Sheet_15 + - first: + 213: 6605544101886951558 + second: Green Portal Sprite Sheet_16 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Green Portal Sprite Sheet_0 + rect: + serializedVersion: 2 + x: 12 + y: 96 + width: 30 + height: 82 + alignment: 9 + pivot: {x: 0.6765848, y: 0.7368821} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 846d6b69da3a04ad0800000000000000 + internalID: -2719994208978545080 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_1 + rect: + serializedVersion: 2 + x: 87 + y: 135 + width: 19 + height: 41 + alignment: 9 + pivot: {x: 0.49972293, y: 0.51179135} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7ebd219bd49acfc30800000000000000 + internalID: 4394573487689358311 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_2 + rect: + serializedVersion: 2 + x: 150 + y: 135 + width: 25 + height: 43 + alignment: 9 + pivot: {x: 0.39930603, y: 0.4709125} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 628206190518940e0800000000000000 + internalID: -2285153152877451226 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_3 + rect: + serializedVersion: 2 + x: 210 + y: 135 + width: 30 + height: 41 + alignment: 9 + pivot: {x: 0.46636504, y: 0.49397576} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4358a9700feef4170800000000000000 + internalID: 8165007364133127476 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_4 + rect: + serializedVersion: 2 + x: 275 + y: 135 + width: 25 + height: 42 + alignment: 9 + pivot: {x: 0.52963865, y: 0.488238} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d8e8702586416e0a0800000000000000 + internalID: -6852767344712249715 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_5 + rect: + serializedVersion: 2 + x: 333 + y: 132 + width: 28 + height: 44 + alignment: 9 + pivot: {x: 0.69707817, y: 0.5168405} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 37b3aa17af976bcb0800000000000000 + internalID: -4848553832261993613 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_6 + rect: + serializedVersion: 2 + x: 405 + y: 135 + width: 17 + height: 40 + alignment: 9 + pivot: {x: 0.61871874, y: 0.4996914} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2d05deacd0258fa10800000000000000 + internalID: 1943393458402971858 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_7 + rect: + serializedVersion: 2 + x: 467 + y: 135 + width: 19 + height: 41 + alignment: 9 + pivot: {x: 0.6832757, y: 0.5000007} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3c0c54bd79aebb220800000000000000 + internalID: 2502851955874185411 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_8 + rect: + serializedVersion: 2 + x: 81 + y: 91 + width: 91 + height: 8 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f40cc23862cff6b00800000000000000 + internalID: 824154499171795023 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_9 + rect: + serializedVersion: 2 + x: 209 + y: 30 + width: 163 + height: 84 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a8f24bfbfd7c5caa0800000000000000 + internalID: -6141282753041911926 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_10 + rect: + serializedVersion: 2 + x: 214 + y: 85 + width: 17 + height: 17 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 14d2fd371c9434d90800000000000000 + internalID: -7114761891093729983 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_11 + rect: + serializedVersion: 2 + x: 281 + y: 77 + width: 13 + height: 34 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 61f9b3e90db6cb3e0800000000000000 + internalID: -2036634387726229738 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_12 + rect: + serializedVersion: 2 + x: 409 + y: 71 + width: 13 + height: 40 + alignment: 9 + pivot: {x: 0.5350905, y: 0.49999982} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4fbf06b8e27d54790800000000000000 + internalID: -7546389005682541580 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_13 + rect: + serializedVersion: 2 + x: 473 + y: 72 + width: 13 + height: 41 + alignment: 9 + pivot: {x: 0.5526358, y: 0.50556314} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 59d7ddc114ef823b0800000000000000 + internalID: -5536896186241417835 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_14 + rect: + serializedVersion: 2 + x: 12 + y: 13 + width: 29 + height: 35 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 69b6ae7fe7ac991d0800000000000000 + internalID: -3343418601671857258 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_15 + rect: + serializedVersion: 2 + x: 83 + y: 21 + width: 26 + height: 17 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ae0b11b6e74d63350800000000000000 + internalID: 5996213593317683434 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Green Portal Sprite Sheet_16 + rect: + serializedVersion: 2 + x: 145 + y: 27 + width: 27 + height: 8 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 680062dec5b9bab50800000000000000 + internalID: 6605544101886951558 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Portal/New Animation 1.anim b/Assets/Animations/Portal/New Animation 1.anim new file mode 100644 index 00000000..2fa64403 --- /dev/null +++ b/Assets/Animations/Portal/New Animation 1.anim @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation 1 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4394573487689358311, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.083333336 + value: {fileID: -2285153152877451226, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.16666667 + value: {fileID: 8165007364133127476, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.25 + value: {fileID: -6852767344712249715, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.33333334 + value: {fileID: -4848553832261993613, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.41666666 + value: {fileID: 1943393458402971858, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - time: 0.5 + value: {fileID: 2502851955874185411, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4394573487689358311, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: -2285153152877451226, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: 8165007364133127476, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: -6852767344712249715, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: -4848553832261993613, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: 1943393458402971858, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + - {fileID: 2502851955874185411, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5833333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Portal/New Animation 1.anim.meta b/Assets/Animations/Portal/New Animation 1.anim.meta new file mode 100644 index 00000000..e9bbdba8 --- /dev/null +++ b/Assets/Animations/Portal/New Animation 1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59c28e69d93cf9d4cbb3cc9d30853207 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Portal/Portal.controller b/Assets/Animations/Portal/Portal.controller new file mode 100644 index 00000000..2b022281 --- /dev/null +++ b/Assets/Animations/Portal/Portal.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6076907732768367869 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation 1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 59c28e69d93cf9d4cbb3cc9d30853207, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-598534371690728527 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6076907732768367869} + m_Position: {x: 300, y: 60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6076907732768367869} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Portal + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -598534371690728527} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animations/Portal/Portal.controller.meta b/Assets/Animations/Portal/Portal.controller.meta new file mode 100644 index 00000000..ac13954b --- /dev/null +++ b/Assets/Animations/Portal/Portal.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d604470a1d97d84fa58a8af0030546e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/Water.prefab b/Assets/Palettes/Water.prefab index 0c7d138d..96252b44 100644 --- a/Assets/Palettes/Water.prefab +++ b/Assets/Palettes/Water.prefab @@ -281,6 +281,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 20, y: -29, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 462 + m_TileSpriteIndex: 462 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -1, y: -28, z: 0} second: serializedVersion: 2 @@ -3191,6 +3201,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -5, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 463 + m_TileSpriteIndex: 463 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 463 + m_TileSpriteIndex: 463 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -1, y: -8, z: 0} second: serializedVersion: 2 @@ -5587,6 +5617,10 @@ Tilemap: m_Data: {fileID: 11400000, guid: 2e97116909ed2f944803ae543475c947, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: aa1d513d675086e489899c6be98aeee1, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 0bd400519d67ac445b48b519a273e0c4, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 7cd610c48e9e9e34484b04ef2f212fd4, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: -8929257334587973569, guid: 6593ab27aa1b24b47a34584964b2c5ad, type: 3} @@ -6512,8 +6546,12 @@ Tilemap: m_Data: {fileID: -2113599768307928106, guid: 6593ab27aa1b24b47a34584964b2c5ad, type: 3} - m_RefCount: 1 m_Data: {fileID: 4760597475302811503, guid: 6593ab27aa1b24b47a34584964b2c5ad, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3832754618602560763, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -7730296357592156854, guid: 3a08fefc7df696140a7a44798f351457, type: 3} m_TileMatrixArray: - - m_RefCount: 462 + - m_RefCount: 465 m_Data: e00: 1 e01: 0 @@ -6532,13 +6570,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 462 + - m_RefCount: 465 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -1, y: -30, z: 0} - m_Size: {x: 38, y: 31, z: 1} + m_Origin: {x: -5, y: -30, z: 0} + m_Size: {x: 42, y: 31, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -6650,7 +6688,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &5728502201950056929 +--- !u!114 &6370008164669940627 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller b/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller new file mode 100644 index 00000000..9bcf5f7b --- /dev/null +++ b/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller @@ -0,0 +1,317 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5806975412209012471 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5154281723833786323} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-3621334542891261866 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3123819037744566438} + m_Position: {x: 420, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5154281723833786323} + m_Position: {x: 420, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -439700991718221505} + m_Position: {x: 800, y: -20, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3123819037744566438} +--- !u!1102 &-3123819037744566438 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WizardIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2030680816099414090} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 955446ad3a4db2b4780f05c45d05c5c8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2030680816099414090 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5154281723833786323} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &-1264004586810225053 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: b900c5133de323a46a58498a00abc987, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 3233cd06998b20547adc8836d0a3f51a, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 442fd2520a0fbc045b9cf62740455d3e, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: e778166e384c02c4692152085cd99b63, type: 2} + m_Threshold: 1 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + m_BlendParameter: moveXWizard + m_BlendParameterY: moveYWizard + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1102 &-439700991718221505 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WizardFrontIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5806975412209012471} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 90f3fe0e624b43c44b515016d52dfbae, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EscapingWizardController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isRunning + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: moveXWizard + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: moveYWizard + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: TurnBack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: TurnFront + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3621334542891261866} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &3234619281913491369 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: TurnFront + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: isRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3123819037744566438} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3909964258867045483 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isRunning + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: TurnFront + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -439700991718221505} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5154281723833786323 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3234619281913491369} + - {fileID: 3909964258867045483} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -1264004586810225053} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller.meta b/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller.meta new file mode 100644 index 00000000..1c35182f --- /dev/null +++ b/Assets/Resources/NPC/Dungeon/EscapingWizardController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 297686d7f5022ff47b3adda4dfdc1386 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/NPC/Dungeon/Wizard.prefab b/Assets/Resources/NPC/Dungeon/Wizard.prefab index c8abac30..8b792d24 100644 --- a/Assets/Resources/NPC/Dungeon/Wizard.prefab +++ b/Assets/Resources/NPC/Dungeon/Wizard.prefab @@ -33,7 +33,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.9412931, y: -2.068871, z: 133.20683} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1699783724360580876} m_Father: {fileID: 0} @@ -50,7 +49,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -130,7 +128,7 @@ CircleCollider2D: m_Radius: 1.5 --- !u!95 &1190203389089447339 Animator: - serializedVersion: 4 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -138,12 +136,11 @@ Animator: m_GameObject: {fileID: 4759712171538235754} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7d09ffbc6c0aa7c409b8da27c69433bd, type: 2} + m_Controller: {fileID: 9100000, guid: 297686d7f5022ff47b3adda4dfdc1386, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -174,7 +171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d622984048644f87804ad1a3f20aa23a, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1 + speed: 4 currentPosition: GCost: 0 hCost: 0 @@ -230,7 +227,6 @@ 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: 4759712171538235753} m_RootOrder: 0 diff --git a/Assets/Resources/Objects/Dungeon/Door.prefab b/Assets/Resources/Objects/Dungeon/Door.prefab index 8705d86c..b16e1f29 100644 --- a/Assets/Resources/Objects/Dungeon/Door.prefab +++ b/Assets/Resources/Objects/Dungeon/Door.prefab @@ -13,6 +13,8 @@ GameObject: - component: {fileID: 5514110702475440543} - component: {fileID: 5514110702475440542} - component: {fileID: 5514110702475440541} + - component: {fileID: 1401431901890015548} + - component: {fileID: -8812260458895579843} m_Layer: 0 m_Name: Door m_TagString: SceneTransition @@ -30,7 +32,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.55, y: -10.48, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -51,10 +52,10 @@ BoxCollider2D: m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 + pivot: {x: 0.5526358, y: 0.50556314} + oldSize: {x: 0.8125, y: 2.5625} + newSize: {x: 0.8125, y: 2.5625} + adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 @@ -113,3 +114,74 @@ MonoBehaviour: coords: {x: 0, y: 0, z: 0} nextMapName: respawnCoords: {x: 0, y: 0, z: 0} + isEnabled: 1 +--- !u!212 &1401431901890015548 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514110702475440540} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -5536896186241417835, guid: 81c1e556f37ff7d498815a51751db9e3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 2.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &-8812260458895579843 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514110702475440540} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4d604470a1d97d84fa58a8af0030546e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scenes/Dungeon.unity b/Assets/Scenes/Dungeon.unity index 01d1b18f..b1ec5469 100644 --- a/Assets/Scenes/Dungeon.unity +++ b/Assets/Scenes/Dungeon.unity @@ -166,10 +166,9 @@ 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: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4624750 GameObject: @@ -200,7 +199,6 @@ 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: 483861600} m_RootOrder: 1 @@ -295,7 +293,6 @@ 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: 808358029} m_RootOrder: 1 @@ -371,7 +368,6 @@ 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: 808358029} m_RootOrder: 6 @@ -445,7 +441,6 @@ 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: 1770800308} m_Father: {fileID: 522654026} @@ -485,7 +480,6 @@ 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: 1418782410} m_RootOrder: 0 @@ -580,7 +574,6 @@ 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: 1716094060} m_Father: {fileID: 1905172366} @@ -657,7 +650,6 @@ 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: 334774872} m_RootOrder: 0 @@ -736,7 +728,6 @@ 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: 1040617736} m_RootOrder: 2 @@ -940,7 +931,6 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -988,7 +978,6 @@ 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: 1796128697} m_RootOrder: 0 @@ -1025,7 +1014,6 @@ 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: 1040617736} m_RootOrder: 1 @@ -1406,7 +1394,6 @@ 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: 483861600} m_RootOrder: 0 @@ -1514,7 +1501,6 @@ 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: 1996715177} m_RootOrder: 3 @@ -1558,10 +1544,9 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4602706, y: -0.8430535, z: -2.7875266} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &304507412 GameObject: @@ -1590,7 +1575,6 @@ 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: 1996715177} m_RootOrder: 2 @@ -1639,7 +1623,6 @@ 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: 1905172366} m_RootOrder: 2 @@ -1785,7 +1768,6 @@ 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: 1748038136} m_RootOrder: 2 @@ -1863,7 +1845,6 @@ 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: 132078413} m_Father: {fileID: 2090937614} @@ -1903,7 +1884,6 @@ 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: 1541947224} m_RootOrder: 0 @@ -2000,7 +1980,6 @@ 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 @@ -2033,10 +2012,9 @@ 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: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &444470085 GameObject: @@ -2065,7 +2043,6 @@ 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: 1264747588} m_RootOrder: 2 @@ -2120,7 +2097,6 @@ 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: 225255867} - {fileID: 4624751} @@ -2204,7 +2180,6 @@ 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: 624775551} m_RootOrder: 1 @@ -2369,7 +2344,6 @@ 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: 1093151101} m_RootOrder: 1 @@ -2445,7 +2419,6 @@ 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: 781142004} m_RootOrder: 1 @@ -2497,6 +2470,187 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 499102352} m_CullTransparentMesh: 1 +--- !u!1 &518695119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 2325419190843056100, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + m_PrefabInstance: {fileID: 1602428654} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 518695124} + - component: {fileID: 518695123} + - component: {fileID: 518695122} + - component: {fileID: 518695121} + - component: {fileID: 518695125} + - component: {fileID: 518695120} + m_Layer: 0 + m_Name: Fire + m_TagString: Fire + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &518695120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bbac356cbeeb02448e529b4f2d9c604, type: 3} + m_Name: + m_EditorClassIdentifier: + inRange: 0 + timerDmg: 0 + waitTime: 1 + firstAttack: 0 + baseAttack: 1 + isPanelEnabled: 1 + other: {fileID: 4869648843286970700, guid: 4cb7163e44af59f4c9350005c199db3c, type: 3} +--- !u!60 &518695121 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.0017950442, y: -0.027981564} + - {x: -0.022274017, y: -0.035844803} + - {x: -0.03, y: -0.046974257} + - {x: -0.08032608, y: -0.12541008} + - {x: -0.03, y: -0.16} + - {x: 0.07, y: -0.16} + - {x: 0.085190125, y: -0.1035057} + - {x: 0.03921417, y: -0.021693036} + - - {x: -0.02, y: 0.01} + - {x: -0.02, y: -0.01} + - {x: -0.01, y: -0.03} + - {x: 0.02, y: -0.03} + - {x: 0.04, y: -0.02} + - {x: 0.04, y: 0.01} + - {x: 0.02, y: 0.03} + - {x: 0, y: 0.03} +--- !u!95 &518695122 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: -7926363800651249591, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + m_PrefabInstance: {fileID: 1602428654} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f83320568db09104ab270d53cc7d8cc7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &518695123 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: -7258073531322448921, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + m_PrefabInstance: {fileID: 1602428654} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1000 + m_Sprite: {fileID: 4268471932424394617, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &518695124 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + m_PrefabInstance: {fileID: 1602428654} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 48.29, y: 19.57, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &518695125 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518695119} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0121154785, y: -0.069028735} + serializedVersion: 2 + m_Radius: 0.9026489 --- !u!1 &522654025 GameObject: m_ObjectHideFlags: 0 @@ -2524,7 +2678,6 @@ 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: 1646078026} - {fileID: 31195028} @@ -2631,7 +2784,6 @@ 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: 1748038136} m_RootOrder: 3 @@ -2799,7 +2951,6 @@ 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: 624775551} m_RootOrder: 3 @@ -2964,7 +3115,6 @@ 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: 781142004} m_RootOrder: 0 @@ -3044,7 +3194,6 @@ 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: 957299441} - {fileID: 491776650} @@ -3124,7 +3273,6 @@ 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: 1267064734} m_RootOrder: 2 @@ -3210,6 +3358,7 @@ MonoBehaviour: SoundsPanel: {fileID: 483861599} ControlsPanel: {fileID: 1748038135} LanguagePanel: {fileID: 1267064733} + keyToSettings: 0 --- !u!4 &668793711 Transform: m_ObjectHideFlags: 0 @@ -3220,10 +3369,9 @@ 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: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &735700017 GameObject: @@ -3253,7 +3401,6 @@ 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: 1093151101} m_RootOrder: 0 @@ -3328,7 +3475,6 @@ 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: 1996715177} m_RootOrder: 4 @@ -3378,7 +3524,6 @@ 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: 560049660} - {fileID: 499102353} @@ -3459,7 +3604,6 @@ 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: 1129352213} - {fileID: 14133962} @@ -3585,7 +3729,6 @@ 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: 1264747588} m_RootOrder: 3 @@ -3634,7 +3777,6 @@ 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: 1040617736} m_RootOrder: 0 @@ -3802,7 +3944,6 @@ 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: 483861600} m_RootOrder: 2 @@ -3965,7 +4106,6 @@ 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: 1291439344} m_Father: {fileID: 522654026} @@ -4005,7 +4145,6 @@ 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: 1264747588} m_RootOrder: 6 @@ -4081,7 +4220,6 @@ 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: 624775551} m_RootOrder: 0 @@ -4246,7 +4384,6 @@ 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: 1225890638} m_RootOrder: 0 @@ -4322,7 +4459,6 @@ 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: 1093151101} m_RootOrder: 3 @@ -4402,7 +4538,6 @@ 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: 1916304665} m_Father: {fileID: 1565023044} @@ -4505,7 +4640,6 @@ 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: 867840329} - {fileID: 181424155} @@ -4585,7 +4719,6 @@ 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: 1905172366} m_RootOrder: 0 @@ -4665,7 +4798,6 @@ 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: 1973338816} m_Father: {fileID: 781142004} @@ -4769,7 +4901,6 @@ 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: 735700018} - {fileID: 494192043} @@ -4893,7 +5024,6 @@ 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: 1264747588} m_RootOrder: 5 @@ -4939,7 +5069,6 @@ 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: 808358029} m_RootOrder: 0 @@ -5055,7 +5184,6 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5103,7 +5231,6 @@ 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: 1796128697} m_RootOrder: 1 @@ -5152,7 +5279,6 @@ 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: 1242086767} - {fileID: 1475672432} @@ -5231,10 +5357,9 @@ 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: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1192878256 MonoBehaviour: @@ -5252,6 +5377,170 @@ MonoBehaviour: TeleportModel: {fileID: 5514110702475440540, guid: 091334681d4a75c47981ce6090486fe2, type: 3} Wizard: {fileID: 4759712171538235754, guid: 7f803b5686b9a2c4e91914bd68e6a21c, type: 3} IsBuilded: 0 +--- !u!43 &1195942613 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 12 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 5 + localAABB: + m_Center: {x: 0.000000059604645, y: -0.000000029802322, z: 0} + m_Extent: {x: 0.14618988, y: 0.07149695, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200000002000300000003000400000004000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 5 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 160 + _typelessdata: f0c782330000e0b2000000000000000000000000000080bf0000003f0000003fd1b2153e026d92bd000000000000000000000000000080bf0000803f00000000c9b215be026d92bd000000000000000000000000000080bf0000000000000000c9b215befa6c923d000000000000000000000000000080bf000000000000803fd1b2153efa6c923d000000000000000000000000000080bf0000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.000000059604645, y: -0.000000029802322, z: 0} + m_Extent: {x: 0.14618988, y: 0.07149695, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1211278092 GameObject: m_ObjectHideFlags: 0 @@ -5285,7 +5574,6 @@ 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: 1601901296} m_RootOrder: 1 @@ -5689,7 +5977,6 @@ 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: 808358029} m_RootOrder: 3 @@ -5780,7 +6067,6 @@ 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: 964663168} m_Father: {fileID: 2090937614} @@ -5821,7 +6107,6 @@ 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: 1181057641} m_RootOrder: 0 @@ -6017,7 +6302,6 @@ 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: 1456785047} - {fileID: 1996715177} @@ -6060,7 +6344,6 @@ 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: 1267064734} m_RootOrder: 3 @@ -6225,7 +6508,6 @@ 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: 1911584408} - {fileID: 2122949050} @@ -6305,7 +6587,6 @@ 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: 1565023044} m_RootOrder: 1 @@ -6357,6 +6638,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1277686271} m_CullTransparentMesh: 1 +--- !u!43 &1282615905 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 12 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 5 + localAABB: + m_Center: {x: -0.00000047683716, y: -0.00000035762787, z: 0} + m_Extent: {x: 6.538223, y: 3.2163715, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200000002000300000003000400000004000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 5 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 160 + _typelessdata: 985cdcb460b4deb4000000000000000000000000000080bf0000003f0000003f1e39d1400ad94dc0000000000000000000000000000080bf0000803f000000002039d1c00ad94dc0000000000000000000000000000080bf00000000000000002039d1c007d94d40000000000000000000000000000080bf000000000000803f1e39d14007d94d40000000000000000000000000000080bf0000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -0.00000047683716, y: -0.00000035762787, z: 0} + m_Extent: {x: 6.538223, y: 3.2163715, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1289433670 GameObject: m_ObjectHideFlags: 0 @@ -6388,7 +6833,6 @@ 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: 1601901296} m_RootOrder: 3 @@ -6553,7 +6997,6 @@ 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: 902494061} m_RootOrder: 0 @@ -6632,7 +7075,6 @@ 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: 1601901296} m_RootOrder: 2 @@ -6821,10 +7263,9 @@ 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: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1376403512 GameObject: @@ -6854,7 +7295,6 @@ 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: 1748038136} m_RootOrder: 0 @@ -6933,7 +7373,6 @@ 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: 1996715177} m_RootOrder: 0 @@ -6979,7 +7418,6 @@ 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: 57266923} m_Father: {fileID: 1694683861} @@ -7056,7 +7494,6 @@ 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: 1748038136} m_RootOrder: 1 @@ -7138,7 +7575,6 @@ 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: 1694683861} m_RootOrder: 1 @@ -7290,7 +7726,6 @@ 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: 1264747588} m_RootOrder: 0 @@ -7449,7 +7884,6 @@ 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: 1181057641} m_RootOrder: 2 @@ -7617,7 +8051,6 @@ 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: 1181057641} m_RootOrder: 1 @@ -7875,11 +8308,158 @@ 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: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1509454833 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + m_PrefabInstance: {fileID: 1534575988} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1509454834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509454833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e810f44247dd5f459eeb0c986cb49a1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1509454835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509454833} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b852f4c11744f74d93a7c35435bb4eb, type: 3} + m_Name: + m_EditorClassIdentifier: + drunk: 0 + max: 0 + duration: 0 + speed: 10 + temp: {x: 0, y: 0, z: 0} +--- !u!1001 &1534575988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1278962375649610277, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 2108726057} + - target: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Name + value: LightWizard + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_TagString + value: WizardLight + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610282, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.x + value: 1.0706273 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.y + value: 2.1763654 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.x + value: 20.5717 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.y + value: 18.5905 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2206011458181915920, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Range + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.r + value: 0.036265016 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: position.x + value: 20.5717 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: position.y + value: 18.5905 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: SortingOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2206011458181915920, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} --- !u!1 &1541947223 GameObject: m_ObjectHideFlags: 0 @@ -7908,7 +8488,6 @@ 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: 377875803} m_Father: {fileID: 781142004} @@ -8011,7 +8590,6 @@ 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: 1736649079} - {fileID: 1277686272} @@ -8093,7 +8671,6 @@ 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: 624775551} m_RootOrder: 2 @@ -8261,7 +8838,6 @@ 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: 1040617736} m_RootOrder: 3 @@ -8464,7 +9040,6 @@ 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: 1709325308} - {fileID: 1211278093} @@ -8479,6 +9054,91 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1602428654 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -7258073531322448921, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_Size.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7258073531322448921, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_Size.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7258073531322448921, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_SortingOrder + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: -7258073531322448921, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2325419190843056100, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 2325419190843056100, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_TagString + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalPosition.x + value: 48.29 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalPosition.y + value: 19.57 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272536312603104991, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6d1c13bd6ad11234fb788060d29dafe9, type: 3} --- !u!1 &1611344279 GameObject: m_ObjectHideFlags: 0 @@ -8507,7 +9167,6 @@ 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: 808358029} m_RootOrder: 5 @@ -8583,7 +9242,6 @@ 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: 522654026} m_RootOrder: 0 @@ -8659,7 +9317,6 @@ 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: 1093151101} m_RootOrder: 2 @@ -8735,7 +9392,6 @@ 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: 1601901296} m_RootOrder: 4 @@ -8793,7 +9449,7 @@ PrefabInstance: - target: {fileID: 1278962375649610277, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2068040588} + objectReference: {fileID: 1282615905} - target: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} propertyPath: m_Name value: Light2D @@ -8982,7 +9638,6 @@ 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: 2064245294} - {fileID: 1440549415} @@ -9000,7 +9655,7 @@ RectTransform: - {fileID: 781142004} - {fileID: 1418782410} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9037,7 +9692,6 @@ 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: 1601901296} m_RootOrder: 0 @@ -9145,7 +9799,6 @@ 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: 81642010} m_RootOrder: 0 @@ -9161,7 +9814,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9230,7 +9882,6 @@ 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: 1565023044} m_RootOrder: 0 @@ -9310,7 +9961,6 @@ 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: 1376403513} - {fileID: 1427275921} @@ -9390,7 +10040,6 @@ 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: 31195028} m_RootOrder: 0 @@ -9490,13 +10139,183 @@ 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: 178967050} - {fileID: 1177818051} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1837640399 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1278962375649610277, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1195942613} + - target: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Name + value: LightFire + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610282, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610282, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610282, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610282, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.x + value: 13.680837 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.y + value: 27.97322 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.x + value: 48.33 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.y + value: 19.5 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1278962375649610283, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2206011458181915920, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Range + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.g + value: 0.43632773 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: position.x + value: 48.34 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: position.y + value: 19.51 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: TransformIsDirty + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: ContactFilter.useLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: filteringSettings.useLayerMask + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: optimizationSettings.ChooseMainCamera + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: optimizationSettings.CalculateOnlyOnce + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133201526527734124, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + propertyPath: optimizationSettings.OptimizedRaycasting + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2206011458181915920, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} +--- !u!1 &1837640400 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1278962375649610280, guid: d95da88540d2d6e44a0c4c40c581b24a, type: 3} + m_PrefabInstance: {fileID: 1837640399} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1837640401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837640400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 469a1d836de07a74cbd302239e2053ba, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1855564284 GameObject: m_ObjectHideFlags: 0 @@ -9525,7 +10344,6 @@ 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: 1264747588} m_RootOrder: 4 @@ -9573,7 +10391,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_RootOrder - value: 11 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_LocalPosition.x @@ -9619,6 +10437,14 @@ PrefabInstance: propertyPath: tilemap value: objectReference: {fileID: 178967048} + - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} + propertyPath: mapSize.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} + propertyPath: mapSize.y + value: 200 + objectReference: {fileID: 0} - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: showIndividualNodes value: 0 @@ -9658,7 +10484,6 @@ 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: 808358029} m_RootOrder: 4 @@ -9751,7 +10576,6 @@ 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: 1053620184} - {fileID: 81642010} @@ -9833,7 +10657,6 @@ 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: 1267064734} m_RootOrder: 0 @@ -10019,7 +10842,6 @@ 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: 1016877332} m_RootOrder: 0 @@ -10114,7 +10936,6 @@ 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: 2090937614} m_RootOrder: 0 @@ -10191,7 +11012,6 @@ 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: 1083387085} m_RootOrder: 0 @@ -10284,7 +11104,6 @@ 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: 1391592551} - {fileID: 2024318767} @@ -10322,7 +11141,6 @@ 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: 808358029} m_RootOrder: 2 @@ -10397,7 +11215,6 @@ 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: 1996715177} m_RootOrder: 1 @@ -10442,7 +11259,6 @@ 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: 1181057641} m_RootOrder: 3 @@ -10516,10 +11332,9 @@ 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: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2064245293 GameObject: @@ -10551,7 +11366,6 @@ 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: 1694683861} m_RootOrder: 0 @@ -10669,7 +11483,109 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064245293} m_CullTransparentMesh: 1 ---- !u!43 &2068040588 +--- !u!1 &2090937613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2090937614} + - component: {fileID: 2090937615} + m_Layer: 5 + m_Name: SoundVolumeSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2090937614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090937613} + 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_Children: + - {fileID: 1969411483} + - {fileID: 1225890638} + - {fileID: 334774872} + m_Father: {fileID: 483861600} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 67} + m_SizeDelta: {x: 200, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2090937615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090937613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 132078414} + m_FillRect: {fileID: 964663168} + m_HandleRect: {fileID: 132078413} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SaveSoundSettings, Assembly-CSharp + m_MethodName: SaveVolumeButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!43 &2108726057 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10833,109 +11749,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &2090937613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2090937614} - - component: {fileID: 2090937615} - m_Layer: 5 - m_Name: SoundVolumeSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2090937614 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090937613} - 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: 1969411483} - - {fileID: 1225890638} - - {fileID: 334774872} - m_Father: {fileID: 483861600} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 67} - m_SizeDelta: {x: 200, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2090937615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090937613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 132078414} - m_FillRect: {fileID: 964663168} - m_HandleRect: {fileID: 132078413} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveSoundSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &2122949049 GameObject: m_ObjectHideFlags: 0 @@ -10967,7 +11780,6 @@ 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: 1267064734} m_RootOrder: 1 diff --git a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs index a0406c55..b5a46b96 100644 --- a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs +++ b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs @@ -12,8 +12,8 @@ public class AStarPathfindingAgent : MonoBehaviour public bool isChasing; private Animator myAnim; - private float moveX; - private float moveY; + private float moveX, moveXWizard; + private float moveY, moveYWizard; public Vector3 point; @@ -43,7 +43,7 @@ public class AStarPathfindingAgent : MonoBehaviour public void FindPath() { var player = FindObjectOfType().gameObject; - + Debug.Log("Findign Path"); point = player.transform.position; FindPoint(); @@ -53,6 +53,7 @@ public class AStarPathfindingAgent : MonoBehaviour { Pathfinder.FindPath(transform.position, point, this); } + public void ControlAnim() { @@ -109,8 +110,10 @@ public class AStarPathfindingAgent : MonoBehaviour myAnim.SetBool("Left", false); } - //moveX = path[targetIndex].worldPosition.x - current.x; - //moveY = path[targetIndex].worldPosition.y - current.y; + moveXWizard = path[targetIndex].worldPosition.x - current.x; + moveYWizard = path[targetIndex].worldPosition.y - current.y; + myAnim.SetFloat("moveYWizard", moveYWizard); + myAnim.SetFloat("moveXWizard", moveXWizard); moveX = point.x - current.x; moveY = point.y - current.y; myAnim.SetFloat("Yinfo", moveY); diff --git a/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset b/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset index 0c157743..b0f5ec98 100644 --- a/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset +++ b/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset @@ -14,12 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: Tiles: - {fileID: 11400000, guid: bcef03bfe6d889f458c051fcda77d968, type: 2} - - {fileID: 11400000, guid: d42493bc02d957348b2fa86903567280, type: 2} - - {fileID: 11400000, guid: de0fda329382efd4282ae71a2102f4d3, type: 2} - - {fileID: 11400000, guid: 358aa35606523e7448ae0830831f6d72, type: 2} - - {fileID: 11400000, guid: deda5f47600755b4483b220e3c1ff87e, type: 2} - - {fileID: 11400000, guid: 7fd161cc7577108489aca90fb9db6ed1, type: 2} - - {fileID: 11400000, guid: 2e196d2a440526e4495cf2ae03a1da5c, type: 2} - - {fileID: 11400000, guid: 5d8974c1ff1a1ee4db297f3cc42015b3, type: 2} - - {fileID: 11400000, guid: ca1a2a4d015bc0e44b2f7ed4e8a19b0e, type: 2} + - {fileID: 11400000, guid: d71e206419fbe4c4aa6787f74226c30a, type: 2} + - {fileID: 11400000, guid: 94ebdd7e7cf39e841a93596879fe58d5, type: 2} walkable: 1 diff --git a/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs b/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs index 12f775aa..0fd48ade 100644 --- a/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs +++ b/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs @@ -32,7 +32,7 @@ public class TileMapGenerator : MonoBehaviour List fillers = new List(); - for (int i = 0; i < 70; i++) + for (int i = 0; i < 60; i++) { FloodFill filler = new FloodFill(map, 1, new Vector2Int(Random.Range(0, 70), Random.Range(0, 70))); fillers.Add(filler); @@ -74,7 +74,7 @@ public class TileMapGenerator : MonoBehaviour GraphNode playerPosStart = graph.graphNodes[Random.Range(0, graph.graphNodes.Count)]; Vector2Int startPos = playerPosStart.positions.ElementAt(Random.Range(0, playerPosStart.positions.Count)); - Vector3 startPosOfPlayer = default; + Vector3 possiblePos = default; foreach (var filler in fillers) { int id = filler.id; @@ -83,8 +83,8 @@ public class TileMapGenerator : MonoBehaviour if (id == 1) { ground.SetTile(new Vector3Int(pos.x,pos.y,0), ground1); - startPosOfPlayer = new Vector3Int(pos.x, pos.y, 0); - availablePos.Add(startPosOfPlayer); + possiblePos = new Vector3Int(pos.x, pos.y, 0); + availablePos.Add(possiblePos); } else if (id == 2) { @@ -112,7 +112,7 @@ public class TileMapGenerator : MonoBehaviour GameObject Player = GameObject.FindWithTag("Player"); Player.transform.position = randomCoordsForStanding(); - + //randomCoordsForStanding(); return true; @@ -121,14 +121,14 @@ public class TileMapGenerator : MonoBehaviour public Vector3 randomCoordsForStanding() { - Tile test = new Tile(); + //Tile test = new Tile(); while (true) { int bound = availablePos.Count; int randomVal; randomVal = Random.Range(0, bound); - return availablePos[randomVal]; + return availablePos[randomVal] + new Vector3( 0.5f, 0.5f, 0f); } diff --git a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs index 542a40ba..0d8becb7 100644 --- a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs +++ b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs @@ -25,6 +25,13 @@ public class DungeonManager : MonoBehaviour public GameObject Wizard; public bool IsBuilded = false; + + public static bool hasTeleported; + + public static void SetTeleported() + { + hasTeleported = true; + } public void Awake() { @@ -41,7 +48,7 @@ public class DungeonManager : MonoBehaviour public void Start() { - + hasTeleported = false; } public void Update() @@ -133,7 +140,7 @@ public class DungeonManager : MonoBehaviour public void BuildWizard() { Vector3 teleportCoords; - + Debug.Log("creating wizard!!!!!!!!!!!"); do { teleportCoords = GameObject.FindObjectOfType().gameObject.GetComponent().randomCoordsForStanding(); diff --git a/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs b/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs index 2d68066f..03db120e 100644 --- a/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs +++ b/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs @@ -8,7 +8,8 @@ using UnityEngine; [RequireComponent(typeof(NPC))] class EscapingWizard : MonoBehaviour { - + private HardLight2D wizardlight; + private HardLight2D[] lights; private Rigidbody2D myRigidbody; public Animator anim; @@ -22,6 +23,7 @@ class EscapingWizard : MonoBehaviour public AStarPathfindingAgent agent; public bool isDuringEscaping = false; // var is setted by trigger range + public float escapingRadius = 6f; // radious where Wizard start escaping if player is in @@ -33,7 +35,6 @@ class EscapingWizard : MonoBehaviour private void Start() { - } private void Update() @@ -63,18 +64,29 @@ class EscapingWizard : MonoBehaviour anim.SetFloat("Yinfo", dir.y); } - agent.point = targetPosition.position; - agent.FindPoint(); + agent.point = targetPosition.position; + StopAllCoroutines(); + //Debug.Log("FOLLOWINGPATH STARTED"); + agent.FindPoint(); + //agent.FindPath(); StartCoroutine(agent.FollowPath()); + } else { - anim.SetBool("isRunning", false); + //anim.SetBool("isRunning", false); gameObject.GetComponent().State = NPCStateEnum.Pending; } } + private void OnDrawGizmos() + { + Gizmos.color = Color.magenta; + Gizmos.DrawWireSphere(transform.position,escapingRadius); + } + + public bool IsInEscapingRadious() { if (Vector2.Distance(GameObject.FindGameObjectWithTag("Player").transform.position, transform.position) >= escapingRadius) @@ -87,6 +99,8 @@ class EscapingWizard : MonoBehaviour { if(collision.collider.tag == "SceneTransition") { + DungeonManager.SetTeleported(); + Destroy(gameObject); } } diff --git a/Assets/Sprites/NPCs/WizardDown.anim b/Assets/Sprites/NPCs/WizardDown.anim index b741542f..91577121 100644 --- a/Assets/Sprites/NPCs/WizardDown.anim +++ b/Assets/Sprites/NPCs/WizardDown.anim @@ -58,7 +58,7 @@ AnimationClip: m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 m_LoopTime: 1 - m_LoopBlend: 0 + m_LoopBlend: 1 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 diff --git a/Assets/WizardLight.cs b/Assets/WizardLight.cs new file mode 100644 index 00000000..307db224 --- /dev/null +++ b/Assets/WizardLight.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Security.Cryptography; +using UnityEngine; +using Random = UnityEngine.Random; + + +public class WizardLight : MonoBehaviour +{ + + private float range = 0; + float minFlickerIntensity = 0.6f; + float maxFlickerIntensity = 0.8f; + float flickerSpeed = 0.05f; + private HardLight2D wizardlight; + private HardLight2D[] lights; + private GameObject fire; + private int randomizer = 0; + private Transform wizardTransform; + // Start is called before the first frame update + void Start() + { + lights = FindObjectsOfType(); + List finalList = new List(); + string nameToLookFor = "LightWizard"; + + for(var i = 0; i < lights.Length; i++) + { + if(lights[i].name == nameToLookFor) + { + finalList.Add(lights[i]); + } + } + wizardlight = finalList[0]; + + //firelight = FindObjectOfType(); + StartCoroutine( ChangeRange()); + + wizardTransform = GameObject.FindGameObjectWithTag("NPC").transform; + } + + private void Update() + { + StartCoroutine( ChangeRange()); + + wizardTransform = GameObject.FindGameObjectWithTag("NPC").transform; + + if (DungeonManager.hasTeleported) + { + Destroy(gameObject); + wizardlight.enabled = false; + } + } + + void LateUpdate() + { + // we store current camera's position here + Vector3 temp = transform.position; + temp.x = wizardTransform.position.x; + temp.y = wizardTransform.position.y-0.2f; + transform.position = temp; + + } + + IEnumerator ChangeRange() + { + if (randomizer == 0) { + wizardlight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity)); + } + else wizardlight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity)); + + randomizer = Random.Range (0, 1); + yield return new WaitForSeconds(flickerSpeed); + } +} diff --git a/Assets/WizardLight.cs.meta b/Assets/WizardLight.cs.meta new file mode 100644 index 00000000..fced9d49 --- /dev/null +++ b/Assets/WizardLight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e810f44247dd5f459eeb0c986cb49a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/world_173.asset b/Assets/world_173.asset new file mode 100644 index 00000000..6132fe2b --- /dev/null +++ b/Assets/world_173.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: world_173 + m_EditorClassIdentifier: + m_Sprite: {fileID: 3832754618602560763, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/world_173.asset.meta b/Assets/world_173.asset.meta new file mode 100644 index 00000000..f06162f0 --- /dev/null +++ b/Assets/world_173.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bd400519d67ac445b48b519a273e0c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 66ff9c9d..43df8f65 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,6 +19,13 @@ TagManager: - Test - ChestCollection - Manager + - HitboxTop + - HitboxRight + - HitboxBottom + - HitboxLeft + - ItemCollection + - WizardLight + - Fire layers: - Default - TransparentFX diff --git a/Scriptum.sln b/Scriptum.sln index 59166d3c..13d86e2b 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", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7627C07C-5359-F002-1D58-E2F51D95C564}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7cc02776-5953-02f0-1d58-e2f51d95c564}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index cbf1be81..a70981be 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b + flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 + value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 + value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb + value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 flags: 0 vcSharedLogLevel: value: 0d5e400f0650