From ce019b2dd26acd47ccc4468fce614ad337c76deb Mon Sep 17 00:00:00 2001 From: KrolMel Date: Sat, 1 Oct 2022 19:28:26 +0200 Subject: [PATCH] Fixed loading of player position and health --- Assembly-CSharp.csproj | 444 +++++++++--------- Assets/Scenes/CaveEntrance.unity | 5 +- Assets/Scenes/Main Menu.unity | 55 ++- Assets/Scenes/WizardHouse.unity | 30 +- Assets/Scripts/DoorBehaviour.cs | 4 +- Assets/Scripts/Player.cs | 15 +- Assets/Scripts/PlayerPosition.cs | 21 +- Assets/Scripts/SaveController.cs | 10 +- .../MainCharacter/MainCharacterManager.cs | 21 +- .../SceneManager/OnMapAppearanceMethod.cs | 6 +- ProjectSettings/EditorBuildSettings.asset | 3 + UserSettings/EditorUserSettings.asset | 38 +- 12 files changed, 360 insertions(+), 292 deletions(-) diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 8ea0a76b..e68799df 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,7 +2,7 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + E:\unity\2020.3.32f1\Editor\Data\Tools\RoslynScripts unity_csc.bat @@ -66,6 +66,7 @@ + @@ -88,9 +89,11 @@ + + @@ -98,6 +101,7 @@ + @@ -143,661 +147,661 @@ - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll + E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll + E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll - C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll + E:/unity/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 + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + E:/unity/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + E:/unity/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + E:/unity/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + E:/unity/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index 699b3780..f728c29c 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -121610,13 +121610,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7edafbad889ba34e9aae593d927c3a5, type: 3} m_Name: m_EditorClassIdentifier: - SceneName: SampleScene SaveController: {fileID: 1193017321} gateway: id: 0 currentMapName: coords: {x: 0.55, y: -10.48, z: 0} - nextMapName: + nextMapName: SampleScene respawnCoords: {x: 0, y: -4.5, z: 10} --- !u!50 &1193017323 Rigidbody2D: @@ -241909,7 +241908,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1956597451 GameObject: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 7fde2471..ee591208 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -465,7 +465,7 @@ Transform: m_Children: - {fileID: 1197977279} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &236333182 GameObject: @@ -548,7 +548,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &455923085 GameObject: @@ -1013,7 +1013,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &840091552 GameObject: @@ -1191,7 +1191,7 @@ Transform: - {fileID: 502516634} - {fileID: 1617351646} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &947524692 GameObject: @@ -3314,7 +3314,50 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1349177707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1349177713} + - component: {fileID: 1349177712} + m_Layer: 0 + m_Name: LocalSceneManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1349177712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1349177707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fbd4e55be86a9d49adcb35c89ee9c18, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1349177713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1349177707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.8525665, y: -0.1126967, z: -140.81984} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1401167276 GameObject: @@ -3791,7 +3834,7 @@ RectTransform: - {fileID: 1698788397} - {fileID: 947524693} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index 8749f2b5..6b8ccb95 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -6257,8 +6257,8 @@ Tilemap: - first: {x: -4, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 12 - m_TileSpriteIndex: 12 + m_TileIndex: 47 + m_TileSpriteIndex: 47 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -11390,7 +11390,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: da383c2f3c858f648b0ea1978e2e53e5, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: f6252232d3fee7f4ebc60ee7c27ba15c, type: 2} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 5fcc48248eaefa64083147d616b74cf6, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: d60deea39cbacb84cb43d4832ceee472, type: 2} @@ -11460,7 +11460,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: ed57b6c49be8dc54496b24de697f034e, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: a96046bd0e597b04e81de7da09475939, type: 2} - - m_RefCount: 208 + - m_RefCount: 209 m_Data: {fileID: 11400000, guid: 8c3ddee63bc5db14db29c992ee3723b7, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 364e56335ffaba04db82a77397ef1e4b, type: 2} @@ -11521,7 +11521,7 @@ Tilemap: m_Data: {fileID: 5355178473153844191, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} - m_RefCount: 2 m_Data: {fileID: -6889525732167300019, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 5448701232674691143, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 2 m_Data: {fileID: 7906761992817383644, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -11591,7 +11591,7 @@ Tilemap: m_Data: {fileID: -1788624317762918301, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 5 m_Data: {fileID: 3723452489768439648, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 208 + - m_RefCount: 209 m_Data: {fileID: 6995023442814134182, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 2 m_Data: {fileID: -4630882437799061053, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -19442,6 +19442,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -4, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 88 + m_TileSpriteIndex: 88 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 2, y: -4, z: 0} second: serializedVersion: 2 @@ -20430,6 +20440,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: 578de64a5055c8c4eaa1bf7e257b38df, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 8c3ddee63bc5db14db29c992ee3723b7, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 5fcc48248eaefa64083147d616b74cf6, type: 2} m_TileSpriteArray: - m_RefCount: 2 m_Data: {fileID: -5859393367572712838, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -20607,8 +20619,10 @@ Tilemap: m_Data: {fileID: 4147549122123511578, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: 6995023442814134182, guid: e7698f36d680635418599dd2745a3e61, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 5448701232674691143, guid: e7698f36d680635418599dd2745a3e61, type: 3} m_TileMatrixArray: - - m_RefCount: 145 + - m_RefCount: 146 m_Data: e00: 1 e01: 0 @@ -20627,7 +20641,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 145 + - m_RefCount: 146 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 diff --git a/Assets/Scripts/DoorBehaviour.cs b/Assets/Scripts/DoorBehaviour.cs index 45134e0d..db65726a 100644 --- a/Assets/Scripts/DoorBehaviour.cs +++ b/Assets/Scripts/DoorBehaviour.cs @@ -6,7 +6,6 @@ using UnityEngine.SceneManagement; public class DoorBehaviour : MonoBehaviour { public static DoorBehaviour Instance; - public string SceneName = "SampleScene"; public GameObject SaveController; @@ -52,7 +51,8 @@ public class DoorBehaviour : MonoBehaviour SaveController.GetComponent().SaveItems(); SaveController.GetComponent().SaveQuests(); SaveController.GetComponent().SaveInventory(); + SaveController.GetComponent().SaveHealth(); // 2. Change scene - SceneManager.LoadScene(this.SceneName); + SceneManager.LoadScene(gateway.nextMapName); } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 1aff1518..68c3dcd4 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -17,7 +17,7 @@ public class Player : MonoBehaviour public ParticleSystem dmgParticleSystem; public FloatValue maxHealth; - public float currentHealth; + public float currentHealth=10; public HealthBar healthBar; private static bool attackSword; private bool attackFist; @@ -48,28 +48,24 @@ public class Player : MonoBehaviour { Panel = GameObject.FindObjectsOfType(true).Where(sr => sr.gameObject.name == "YouDied").ToArray()[0]; healthBar = (HealthBar)FindObjectOfType(); - int continued = PlayerPrefs.GetInt("continued"); - if (continued == 1) + if (OnMapAppearanceMethod.Gateway == OnMapAppearanceMethodEnum.NewGame) { - currentHealth = PlayerPrefs.GetFloat("health-S"); + currentHealth = PlayerPrefs.GetFloat("health"); } else { - currentHealth = PlayerPrefs.GetFloat("health"); + currentHealth = PlayerPrefs.GetFloat("health-S"); } rb = gameObject.GetComponent(); myAnimator = GetComponent(); healthBar.SetMaxHealth(maxHealth.initialValue); healthBar.SetHealth(currentHealth); walkSpeed = 4f; - currentHealth = 10; } - public void TakeDamage(float damage) { currentHealth = currentHealth - damage; - Debug.Log(currentHealth); healthBar.SetHealth(currentHealth); var em = dmgParticleSystem.emission; @@ -81,19 +77,16 @@ public class Player : MonoBehaviour { Panel.SetActive(true); walkSpeed = 0f; - } } IEnumerator Timer() { - yield return new WaitForSeconds(0.2f); var em = dmgParticleSystem.emission; em.enabled = false; } - private void HandleAttacks() { if (attackSword) diff --git a/Assets/Scripts/PlayerPosition.cs b/Assets/Scripts/PlayerPosition.cs index 17658df4..15075c4a 100644 --- a/Assets/Scripts/PlayerPosition.cs +++ b/Assets/Scripts/PlayerPosition.cs @@ -12,16 +12,16 @@ public class PlayerPosition : MonoBehaviour y = transform.position.y; z = transform.position.z; - PlayerPrefs.SetFloat("x", x); - PlayerPrefs.SetFloat("y", y); - PlayerPrefs.SetFloat("z", z); + PlayerPrefs.SetFloat("player.position.x", x); + PlayerPrefs.SetFloat("player.position.y", y); + PlayerPrefs.SetFloat("player.position.z", z); } public void LoadPosition() { - x = PlayerPrefs.GetFloat("x"); - y = PlayerPrefs.GetFloat("y"); - z = PlayerPrefs.GetFloat("z"); + x = PlayerPrefs.GetFloat("player.position.x"); + y = PlayerPrefs.GetFloat("player.position.y"); + z = PlayerPrefs.GetFloat("player.position.z"); Vector3 LoadPosition = new Vector3(x, y, z); transform.position = LoadPosition; @@ -29,18 +29,11 @@ public class PlayerPosition : MonoBehaviour void Start() { - if (PlayerPrefs.GetInt("continued") == 1) + if (OnMapAppearanceMethod.Gateway == OnMapAppearanceMethodEnum.LoadGame) { LoadPosition(); - StartCoroutine(ChangeContinueValue()); } } - private IEnumerator ChangeContinueValue() - { - yield return new WaitForSeconds(0.2f); - PlayerPrefs.SetInt("continued", 0); - - } } diff --git a/Assets/Scripts/SaveController.cs b/Assets/Scripts/SaveController.cs index 2b502261..532c2ccc 100644 --- a/Assets/Scripts/SaveController.cs +++ b/Assets/Scripts/SaveController.cs @@ -13,10 +13,16 @@ public class SaveController : MonoBehaviour public void LoadScene() { + OnMapAppearanceMethod.Gateway = OnMapAppearanceMethodEnum.LoadGame; + string sceneToGoTo = PlayerPrefs.GetString("SceneSaved"); SceneManager.LoadScene(sceneToGoTo); - int continued = 1; - PlayerPrefs.SetInt("continued", continued); + } + + public void SaveHealth() + { + var player = GameObject.FindGameObjectWithTag("Player"); + player.GetComponent().SaveCheckpoint(); } public void SaveItems() diff --git a/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs b/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs index 299b8830..184d3bc6 100644 --- a/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs +++ b/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs @@ -67,6 +67,15 @@ public class MainCharacterManager : MonoBehaviour return new Vector3(x, y, z); } + case OnMapAppearanceMethodEnum.LoadGame: + { + // TODO change for loading from a file instead of Prefabs + var x = PlayerPrefs.GetFloat("gateway.respawnCoords.x"); + var y = PlayerPrefs.GetFloat("gateway.respawnCoords.y"); + var z = PlayerPrefs.GetFloat("gateway.respawnCoords.z"); + + return new Vector3(x, y, z); + } default: { return DefaultPlayerMapPosition(); @@ -79,13 +88,13 @@ public class MainCharacterManager : MonoBehaviour switch (SceneManager.GetActiveScene().name) { case "CaveEntrance": - { - return new Vector3(0.5f, -37, 10); - } + { + return new Vector3(0.5f, -37, 10); + } default: - { - return avatar.transform.position; - } + { + return avatar.transform.position; + } } } diff --git a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs index eae1fa3e..a9dbcaa6 100644 --- a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs +++ b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs @@ -17,7 +17,11 @@ public class OnMapAppearanceMethod : MonoBehaviour void Awake() { - Gateway = OnMapAppearanceMethodEnum.NewGame; + if(Gateway == null) + { + Gateway = OnMapAppearanceMethodEnum.NewGame; + } + } } \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index aa0d86d0..7754242e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -29,4 +29,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/Scenes/WizardHouse.unity + guid: fb10b35d89fbea345ad2f675310245c5 m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9ff34371..aa6170cf 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb - flags: 0 - RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25 flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb - flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a123df6f23b34f1a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c72111f19352f223d667d6d051c3de5f5353fe7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0