diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 4aab19ae..beb24fd7 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,8 +2,10 @@ latest - E:\unity\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} + {b0494aed-db4c-301d-622f-0ebc22443d3b} + {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 @@ -58,7 +63,6 @@ - @@ -114,6 +118,7 @@ + @@ -136,661 +141,661 @@ - 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.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.AIModule.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.ARModule.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.AccessibilityModule.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.AndroidJNIModule.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.AnimationModule.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.AssetBundleModule.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.AudioModule.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.ClothModule.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.ClusterInputModule.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.ClusterRendererModule.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.CoreModule.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.CrashReportingModule.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.DSPGraphModule.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.DirectorModule.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.GIModule.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.GameCenterModule.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.GridModule.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.HotReloadModule.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.IMGUIModule.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.ImageConversionModule.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.InputModule.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.InputLegacyModule.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.JSONSerializeModule.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.LocalizationModule.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.ParticleSystemModule.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.PerformanceReportingModule.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.PhysicsModule.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.Physics2DModule.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.ProfilerModule.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.RuntimeInitializeOnLoadManagerInitializerModule.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.ScreenCaptureModule.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.SharedInternalsModule.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.SpriteMaskModule.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.SpriteShapeModule.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.StreamingModule.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.SubstanceModule.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.SubsystemsModule.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.TLSModule.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.TerrainModule.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.TerrainPhysicsModule.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.TextCoreModule.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.TextRenderingModule.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.TilemapModule.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.UIModule.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.UIElementsModule.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.UIElementsNativeModule.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.UNETModule.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.UmbraModule.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.UnityAnalyticsModule.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.UnityConnectModule.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.UnityCurlModule.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.UnityTestProtocolModule.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.UnityWebRequestModule.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.UnityWebRequestAssetBundleModule.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.UnityWebRequestAudioModule.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.UnityWebRequestTextureModule.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.UnityWebRequestWWWModule.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.VFXModule.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.VRModule.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.VehiclesModule.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.VideoModule.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.VirtualTexturingModule.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.WindModule.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/UnityEngine.XRModule.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.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.CoreModule.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.GraphViewModule.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.PackageManagerUIModule.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.SceneTemplateModule.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.UIElementsModule.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.UIElementsSamplesModule.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.UIServiceModule.dll - E:/unity/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll + C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.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/ref/2.0.0/netstandard.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/Microsoft.Win32.Primitives.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.AppContext.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.Concurrent.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.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.NonGeneric.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.Collections.Specialized.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.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.EventBasedAsync.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.Primitives.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.ComponentModel.TypeConverter.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.Console.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.Data.Common.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.Contracts.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.Debug.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.FileVersionInfo.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.Process.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.StackTrace.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.TextWriterTraceListener.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.Tools.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.TraceSource.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.Diagnostics.Tracing.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.Drawing.Primitives.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.Dynamic.Runtime.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.Calendars.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.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.Globalization.Extensions.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.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.Compression.ZipFile.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.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.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.DriveInfo.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.Primitives.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.FileSystem.Watcher.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.IsolatedStorage.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.MemoryMappedFiles.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.Pipes.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.IO.UnmanagedMemoryStream.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.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.Expressions.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.Parallel.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.Linq.Queryable.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.Http.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.NameResolution.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.NetworkInformation.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.Ping.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.Primitives.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.Requests.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.Security.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.Sockets.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.WebHeaderCollection.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.Client.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.Net.WebSockets.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.ObjectModel.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.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.Extensions.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.Reflection.Primitives.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.Reader.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.ResourceManager.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.Resources.Writer.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.CompilerServices.VisualC.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.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.Extensions.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.Handles.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.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.InteropServices.RuntimeInformation.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.Numerics.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.Formatters.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.Json.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.Primitives.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.Runtime.Serialization.Xml.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.Claims.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.Algorithms.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.Csp.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.Encoding.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.Primitives.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.Cryptography.X509Certificates.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.Principal.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.Security.SecureString.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.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.Encoding.Extensions.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.Text.RegularExpressions.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.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.Overlapped.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.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.Tasks.Parallel.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.Thread.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.ThreadPool.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.Threading.Timer.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.ValueTuple.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.ReaderWriter.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.XDocument.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.XmlDocument.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.XmlSerializer.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.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/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.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.Numerics.Vectors.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/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.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/mscorlib.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.ComponentModel.Composition.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.Core.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.Data.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.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.Drawing.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.IO.Compression.FileSystem.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.Net.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.Numerics.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.Runtime.Serialization.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.ServiceModel.Web.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.Transactions.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.Web.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.Windows.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.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.Linq.dll - E:/unity/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.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/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/PsdPlugin.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Timeline.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.TextMeshPro.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/UnityEditor.UI.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Rider.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/UnityEngine.UI.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Mathematics.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - E:/unity/Scriptum/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/MainCharacter/WalkDown.anim b/Assets/Animations/MainCharacter/WalkDown.anim index 551d5029..f6f889af 100644 --- a/Assets/Animations/MainCharacter/WalkDown.anim +++ b/Assets/Animations/MainCharacter/WalkDown.anim @@ -16,51 +16,16 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: walkSpeed - path: - classID: 114 - script: {fileID: 11500000, guid: 840a82f054869244b832426e6b6022bd, type: 3} + m_FloatCurves: [] m_PPtrCurves: - curve: - time: 0 value: {fileID: 5523046169430618816, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} + - time: 0.083333336 + value: {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} - time: 0.16666667 value: {fileID: -5084081418433795573, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} - - time: 0.33333334 + - time: 0.25 value: {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} attribute: m_Sprite path: @@ -80,15 +45,9 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 0 - attribute: 1214965104 - script: {fileID: 11500000, guid: 840a82f054869244b832426e6b6022bd, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: 5523046169430618816, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} + - {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} - {fileID: -5084081418433795573, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} - {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3} m_AnimationClipSettings: @@ -96,7 +55,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -111,44 +70,7 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: walkSpeed - path: - classID: 114 - script: {fileID: 11500000, guid: 840a82f054869244b832426e6b6022bd, type: 3} + m_EditorCurves: [] m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/MainCharacter/mainCh_standing.controller b/Assets/Animations/MainCharacter/mainCh_standing.controller index 43e71d25..6df548a4 100644 --- a/Assets/Animations/MainCharacter/mainCh_standing.controller +++ b/Assets/Animations/MainCharacter/mainCh_standing.controller @@ -83,6 +83,7 @@ AnimatorState: - {fileID: 3178665442510596103} - {fileID: 2663480789015550344} - {fileID: 6170832368830547399} + - {fileID: -1090538232788097389} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -123,6 +124,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5584591500326761062 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5678147287597586547} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-5572165365293705200 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -148,6 +171,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-5309539286856497174 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pickaxe + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4004957397253661201} + 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: 3329150470937821877} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-4984416496896433241 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -217,6 +267,31 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 +--- !u!1101 &-1090538232788097389 +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: pickaxe + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5309539286856497174} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &-1054270578012958368 BlendTree: m_ObjectHideFlags: 1 @@ -315,6 +390,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: pickaxe + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -364,7 +445,7 @@ BlendTree: m_Name: Blend Tree m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 6cb4d0def5e45d141998615e8142eceb, type: 2} + m_Motion: {fileID: 7400000, guid: a0a8926e6a725944e8b47e277ff6676d, type: 2} m_Threshold: 0 m_Position: {x: 0, y: -0.1} m_TimeScale: 1 @@ -380,7 +461,7 @@ BlendTree: m_DirectBlendParameter: moveX m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 7f6d671d2fe52794eb27c45dd79504cb, type: 2} + m_Motion: {fileID: 7400000, guid: 3dabb96e33ecf9f489eb93f9f6364a7d, type: 2} m_Threshold: 0.6666667 m_Position: {x: 0.1, y: 0} m_TimeScale: 1 @@ -388,7 +469,7 @@ BlendTree: m_DirectBlendParameter: moveX m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 3dabb96e33ecf9f489eb93f9f6364a7d, type: 2} + m_Motion: {fileID: 7400000, guid: 26021e5afd59b17458272dae2d451934, type: 2} m_Threshold: 1 m_Position: {x: -0.1, y: 0} m_TimeScale: 1 @@ -452,6 +533,100 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!206 &3329150470937821877 +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: a3e44ee8e3211ce4d98f3319f16dcb72, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: -0.1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: moveX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 61ef15398ff4cd948913a305fda08c83, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: 0, y: 0.1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: moveX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 9ba42780d4675274bbe7f4b88294f20e, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0.1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: moveX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 8bbbdc82e985ba547931d0071e3abbca, type: 2} + m_Threshold: 1 + m_Position: {x: -0.1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: moveX + m_Mirror: 0 + m_BlendParameter: lastMoveX + m_BlendParameterY: lastMoveY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1101 &3975170337474689146 +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: pickaxe + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5309539286856497174} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4004957397253661201 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5678147287597586547} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &5310161437452972708 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -538,6 +713,7 @@ AnimatorState: - {fileID: -5572165365293705200} - {fileID: -5632725443533880303} - {fileID: 5310161437452972708} + - {fileID: 3975170337474689146} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -553,6 +729,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8256309298026870832 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5678147287597586547} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &8289624602891864746 AnimatorState: serializedVersion: 6 @@ -601,6 +799,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8289624602891864746} m_Position: {x: 110, y: -90, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5309539286856497174} + m_Position: {x: 620, y: 300, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animations/MainCharacter/pickaxe_down.anim b/Assets/Animations/MainCharacter/pickaxe_down.anim new file mode 100644 index 00000000..9a853b99 --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_down.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: pickaxe_down + 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: -1563841675569074710, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.083333336 + value: {fileID: -8788202827079679568, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.16666667 + value: {fileID: 7833271494876453194, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.25 + value: {fileID: 4356297052502768563, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.33333334 + value: {fileID: 7833271494876453194, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.41666666 + value: {fileID: -8788202827079679568, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.5 + value: {fileID: -1563841675569074710, guid: 9915fa26fdd629e41884a4197db60582, 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: -1563841675569074710, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -8788202827079679568, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 7833271494876453194, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 4356297052502768563, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 7833271494876453194, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -8788202827079679568, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -1563841675569074710, guid: 9915fa26fdd629e41884a4197db60582, 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: 0 + 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/MainCharacter/pickaxe_down.anim.meta b/Assets/Animations/MainCharacter/pickaxe_down.anim.meta new file mode 100644 index 00000000..91ff1ccc --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3e44ee8e3211ce4d98f3319f16dcb72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/pickaxe_left.anim b/Assets/Animations/MainCharacter/pickaxe_left.anim new file mode 100644 index 00000000..16682d39 --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_left.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: pickaxe_left + 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: -41554462116414324, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.083333336 + value: {fileID: -7695408233002433717, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.16666667 + value: {fileID: 966034927236667945, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.25 + value: {fileID: 7020624776338729465, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.33333334 + value: {fileID: 966034927236667945, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.41666666 + value: {fileID: -7695408233002433717, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.5 + value: {fileID: -41554462116414324, guid: 9915fa26fdd629e41884a4197db60582, 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: -41554462116414324, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -7695408233002433717, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 966034927236667945, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 7020624776338729465, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 966034927236667945, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -7695408233002433717, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -41554462116414324, guid: 9915fa26fdd629e41884a4197db60582, 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: 0 + 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/MainCharacter/pickaxe_left.anim.meta b/Assets/Animations/MainCharacter/pickaxe_left.anim.meta new file mode 100644 index 00000000..aaa97c7d --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bbbdc82e985ba547931d0071e3abbca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/pickaxe_right.anim b/Assets/Animations/MainCharacter/pickaxe_right.anim new file mode 100644 index 00000000..2da07f23 --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_right.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: pickaxe_right + 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: 3681588715624089011, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.083333336 + value: {fileID: 8937907004770158974, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.16666667 + value: {fileID: -4136777282847157910, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.25 + value: {fileID: -6255204392532096608, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.33333334 + value: {fileID: -4136777282847157910, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.41666666 + value: {fileID: 8937907004770158974, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.5 + value: {fileID: 3681588715624089011, guid: 9915fa26fdd629e41884a4197db60582, 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: 3681588715624089011, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 8937907004770158974, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -4136777282847157910, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -6255204392532096608, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -4136777282847157910, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 8937907004770158974, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 3681588715624089011, guid: 9915fa26fdd629e41884a4197db60582, 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: 0 + 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/MainCharacter/pickaxe_right.anim.meta b/Assets/Animations/MainCharacter/pickaxe_right.anim.meta new file mode 100644 index 00000000..428a3296 --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ba42780d4675274bbe7f4b88294f20e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/pickaxe_up.anim b/Assets/Animations/MainCharacter/pickaxe_up.anim new file mode 100644 index 00000000..bac86e29 --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_up.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: pickaxe_up + 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: -1562778695865634955, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.083333336 + value: {fileID: -8370005372693273517, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.16666667 + value: {fileID: 6265470047344320477, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.25 + value: {fileID: 1380336483815737508, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.33333334 + value: {fileID: 6265470047344320477, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.41666666 + value: {fileID: -8370005372693273517, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - time: 0.5 + value: {fileID: -1562778695865634955, guid: 9915fa26fdd629e41884a4197db60582, 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: -1562778695865634955, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -8370005372693273517, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 6265470047344320477, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 1380336483815737508, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: 6265470047344320477, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -8370005372693273517, guid: 9915fa26fdd629e41884a4197db60582, type: 3} + - {fileID: -1562778695865634955, guid: 9915fa26fdd629e41884a4197db60582, 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: 0 + 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/MainCharacter/pickaxe_up.anim.meta b/Assets/Animations/MainCharacter/pickaxe_up.anim.meta new file mode 100644 index 00000000..f103d69f --- /dev/null +++ b/Assets/Animations/MainCharacter/pickaxe_up.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61ef15398ff4cd948913a305fda08c83 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png b/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png new file mode 100644 index 00000000..4da0c9ef Binary files /dev/null and b/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png differ diff --git a/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png.meta b/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png.meta new file mode 100644 index 00000000..1cf1c35f --- /dev/null +++ b/Assets/Character Sprites/Main Character Sprites/animacja postaci z kilofem.png.meta @@ -0,0 +1,492 @@ +fileFormatVersion: 2 +guid: 9915fa26fdd629e41884a4197db60582 +TextureImporter: + internalIDToNameTable: + - first: + 213: -1562778695865634955 + second: animacja postaci z kilofem_0 + - first: + 213: -8370005372693273517 + second: animacja postaci z kilofem_1 + - first: + 213: 6265470047344320477 + second: animacja postaci z kilofem_2 + - first: + 213: 1380336483815737508 + second: animacja postaci z kilofem_3 + - first: + 213: 3681588715624089011 + second: animacja postaci z kilofem_4 + - first: + 213: 8937907004770158974 + second: animacja postaci z kilofem_5 + - first: + 213: -4136777282847157910 + second: animacja postaci z kilofem_6 + - first: + 213: -6255204392532096608 + second: animacja postaci z kilofem_7 + - first: + 213: -41554462116414324 + second: animacja postaci z kilofem_8 + - first: + 213: -7695408233002433717 + second: animacja postaci z kilofem_9 + - first: + 213: 966034927236667945 + second: animacja postaci z kilofem_10 + - first: + 213: 7020624776338729465 + second: animacja postaci z kilofem_11 + - first: + 213: -1563841675569074710 + second: animacja postaci z kilofem_12 + - first: + 213: -8788202827079679568 + second: animacja postaci z kilofem_13 + - first: + 213: 7833271494876453194 + second: animacja postaci z kilofem_14 + - first: + 213: 4356297052502768563 + second: animacja postaci z kilofem_15 + 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: 0 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: animacja postaci z kilofem_0 + rect: + serializedVersion: 2 + x: 124 + y: 223 + width: 26 + height: 29 + alignment: 9 + pivot: {x: 0.32701582, y: 0.5073858} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 57f616a5e05ef4ae0800000000000000 + internalID: -1562778695865634955 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_1 + rect: + serializedVersion: 2 + x: 162 + y: 223 + width: 27 + height: 29 + alignment: 9 + pivot: {x: 0.31638026, y: 0.50358737} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 354a180b574c7db80800000000000000 + internalID: -8370005372693273517 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_2 + rect: + serializedVersion: 2 + x: 201 + y: 222 + width: 28 + height: 29 + alignment: 9 + pivot: {x: 0.30312783, y: 0.5011976} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ddfdecaefcb63f650800000000000000 + internalID: 6265470047344320477 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_3 + rect: + serializedVersion: 2 + x: 243 + y: 222 + width: 25 + height: 33 + alignment: 9 + pivot: {x: 0.34190795, y: 0.43906656} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4a8495cf7b0f72310800000000000000 + internalID: 1380336483815737508 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_4 + rect: + serializedVersion: 2 + x: 124 + y: 170 + width: 17 + height: 29 + alignment: 9 + pivot: {x: 0.323121, y: 0.49715924} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3b54cd35e61a71330800000000000000 + internalID: 3681588715624089011 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_5 + rect: + serializedVersion: 2 + x: 155 + y: 170 + width: 20 + height: 29 + alignment: 9 + pivot: {x: 0.27139053, y: 0.49715924} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e790dc6d013d90c70800000000000000 + internalID: 8937907004770158974 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_6 + rect: + serializedVersion: 2 + x: 187 + y: 170 + width: 21 + height: 29 + alignment: 9 + pivot: {x: 0.26070005, y: 0.4985799} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a615df49af63796c0800000000000000 + internalID: -4136777282847157910 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_7 + rect: + serializedVersion: 2 + x: 220 + y: 170 + width: 21 + height: 29 + alignment: 9 + pivot: {x: 0.26266187, y: 0.49715924} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0a949a91fbc0139a0800000000000000 + internalID: -6255204392532096608 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_8 + rect: + serializedVersion: 2 + x: 215 + y: 134 + width: 17 + height: 28 + alignment: 9 + pivot: {x: 0.67587996, y: 0.48142895} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c8cf7b6df6e5c6ff0800000000000000 + internalID: -41554462116414324 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_9 + rect: + serializedVersion: 2 + x: 181 + y: 133 + width: 20 + height: 29 + alignment: 9 + pivot: {x: 0.724897, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b43064eebfa643590800000000000000 + internalID: -7695408233002433717 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_10 + rect: + serializedVersion: 2 + x: 148 + y: 133 + width: 22 + height: 29 + alignment: 9 + pivot: {x: 0.70326996, y: 0.5008966} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 92adf86e5ab086d00800000000000000 + internalID: 966034927236667945 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_11 + rect: + serializedVersion: 2 + x: 115 + y: 133 + width: 21 + height: 29 + alignment: 9 + pivot: {x: 0.73647344, y: 0.49910343} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9f9e9f689054e6160800000000000000 + internalID: 7020624776338729465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_12 + rect: + serializedVersion: 2 + x: 107 + y: 83 + width: 25 + height: 29 + alignment: 9 + pivot: {x: 0.33907837, y: 0.5006985} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aede0ca184e1c4ae0800000000000000 + internalID: -1563841675569074710 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_13 + rect: + serializedVersion: 2 + x: 138 + y: 83 + width: 27 + height: 29 + alignment: 9 + pivot: {x: 0.31479955, y: 0.50000054} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0b105d537180a0680800000000000000 + internalID: -8788202827079679568 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_14 + rect: + serializedVersion: 2 + x: 168 + y: 83 + width: 28 + height: 29 + alignment: 9 + pivot: {x: 0.30397743, y: 0.5004141} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a49dd411cee55bc60800000000000000 + internalID: 7833271494876453194 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: animacja postaci z kilofem_15 + rect: + serializedVersion: 2 + x: 201 + y: 81 + width: 23 + height: 30 + alignment: 9 + pivot: {x: 0.32556817, y: 0.51756746} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3bb328ea61da47c30800000000000000 + internalID: 4356297052502768563 + 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/Character Sprites/Main Character Sprites/main character 1 draft.png.meta b/Assets/Character Sprites/Main Character Sprites/main character 1 draft.png.meta index f114b5de..5eba0ec2 100644 --- a/Assets/Character Sprites/Main Character Sprites/main character 1 draft.png.meta +++ b/Assets/Character Sprites/Main Character Sprites/main character 1 draft.png.meta @@ -147,7 +147,7 @@ TextureImporter: width: 17 height: 29 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -167,8 +167,8 @@ TextureImporter: y: 109 width: 17 height: 28 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.50247866, y: 0.48043388} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -189,7 +189,7 @@ TextureImporter: width: 17 height: 29 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -210,7 +210,7 @@ TextureImporter: width: 17 height: 28 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -231,7 +231,7 @@ TextureImporter: width: 17 height: 28 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -252,7 +252,7 @@ TextureImporter: width: 14 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -273,7 +273,7 @@ TextureImporter: width: 11 height: 29 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -294,7 +294,7 @@ TextureImporter: width: 12 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -315,7 +315,7 @@ TextureImporter: width: 12 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -336,7 +336,7 @@ TextureImporter: width: 11 height: 29 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -357,7 +357,7 @@ TextureImporter: width: 14 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -377,8 +377,8 @@ TextureImporter: y: 109 width: 17 height: 28 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.5024782, y: 0.48344395} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scripts/Chest/ChestController.cs b/Assets/Scripts/Chest/ChestController.cs index 1467808b..ad4277d5 100644 --- a/Assets/Scripts/Chest/ChestController.cs +++ b/Assets/Scripts/Chest/ChestController.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using GUI_Scripts; using UnityEngine; public class ChestController : BaseWarehouseController @@ -39,9 +40,10 @@ public class ChestController : BaseWarehouseController if (Input.GetKeyDown(KeyCode.I)) { InventoryManager.Instance.OpenPanel(); + EquipmentManager.Instance.OpenPanel(); } } - + } void OnTriggerExit2D(Collider2D collision) diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 5bd3e52a..be3e76bf 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -18,8 +18,11 @@ public class Player : MonoBehaviour public FloatValue maxHealth; public float currentHealth; public HealthBar healthBar; - private bool attackSword; + private static bool attackSword; private bool attackFist; + private static bool pickaxeInUse; + private static bool playerInCollider; + private float timerRegen = 0f; private float timerTick = 0f; @@ -29,7 +32,17 @@ public class Player : MonoBehaviour private bool startRegen = false; private bool canWalk = true; - + + public static void putPlayerInCollider() + { + playerInCollider = true; + } + + public static void takePlayerFromCollider() + { + playerInCollider = false; + } + void Start() { int continued = PlayerPrefs.GetInt("continued"); @@ -85,107 +98,116 @@ public class Player : MonoBehaviour { myAnimator.SetTrigger("attackFist"); } + if (pickaxeInUse) + { + myAnimator.SetTrigger("pickaxe"); + } } private void HandleInput() { - if (Input.GetKeyDown(KeyCode.Space)) - { - attackSword = true; - } - if (Input.GetKeyDown(KeyCode.LeftShift)) - { - attackFist = true; - } + if (Input.GetKeyDown(KeyCode.Space)) + { + attackSword = true; + } + if (Input.GetKeyDown(KeyCode.LeftShift)) + { + attackFist = true; + } + if(Input.GetKeyDown(KeyCode.X)) + { + pickaxeInUse = true; + } +} + +private void ResetValues() +{ +attackSword = false; +attackFist = false; +pickaxeInUse = false; +} + +void Update() +{ +//if (canWalk == true) +//{ + + inputHorizontal = Input.GetAxisRaw("Horizontal"); + inputVertical = Input.GetAxisRaw("Vertical"); + + myAnimator.SetFloat("moveX", inputHorizontal * walkSpeed); + myAnimator.SetFloat("moveY", inputVertical * walkSpeed); + if (inputHorizontal != 0) + { + myAnimator.SetFloat("speed", walkSpeed); + } + else if (inputVertical != 0) + { + myAnimator.SetFloat("speed", walkSpeed); + } + else + { + myAnimator.SetFloat("speed", 0); } - private void ResetValues() + if (inputHorizontal == 1 || inputHorizontal == -1 || inputVertical == 1 || inputVertical == -1) { - attackSword = false; - attackFist = false; + myAnimator.SetFloat("lastMoveX", inputHorizontal); + myAnimator.SetFloat("lastMoveY", inputVertical); } - void Update() + timerRegen += Time.deltaTime; + if(timerRegen >= waitRegen) { - //if (canWalk == true) - //{ - - inputHorizontal = Input.GetAxisRaw("Horizontal"); - inputVertical = Input.GetAxisRaw("Vertical"); - - myAnimator.SetFloat("moveX", inputHorizontal * walkSpeed); - myAnimator.SetFloat("moveY", inputVertical * walkSpeed); - if (inputHorizontal != 0) - { - myAnimator.SetFloat("speed", walkSpeed); - } - else if (inputVertical != 0) - { - myAnimator.SetFloat("speed", walkSpeed); - } - else - { - myAnimator.SetFloat("speed", 0); - } - - if (inputHorizontal == 1 || inputHorizontal == -1 || inputVertical == 1 || inputVertical == -1) - { - myAnimator.SetFloat("lastMoveX", inputHorizontal); - myAnimator.SetFloat("lastMoveY", inputVertical); - } - - timerRegen += Time.deltaTime; - if(timerRegen >= waitRegen) - { - startRegen = true; - } - - if (startRegen == true) - { - timerTick += Time.deltaTime; - if(timerTick >= waitTick) - { - if(currentHealth < 10) - { - currentHealth = currentHealth + 1; - healthBar.SetHealth(currentHealth); - timerTick = 0f; - } - } - } - PlayerPrefs.SetFloat("health", currentHealth); - - //} - - HandleInput(); + startRegen = true; } - void FixedUpdate() + if (startRegen == true) { - if(canWalk == true) + timerTick += Time.deltaTime; + if(timerTick >= waitTick) { - if (inputHorizontal != 0 || inputVertical != 0) + if(currentHealth < 10) { - if (inputHorizontal != 0 && inputVertical != 0) - { - inputHorizontal *= speedLimiter; - inputVertical *= speedLimiter; - } - rb.velocity = new Vector2(inputHorizontal * walkSpeed, inputVertical * walkSpeed); - } - else - { - rb.velocity = new Vector2(0f, 0f); + currentHealth = currentHealth + 1; + healthBar.SetHealth(currentHealth); + timerTick = 0f; } } - - HandleAttacks(); - ResetValues(); } + PlayerPrefs.SetFloat("health", currentHealth); - public void SaveCheckpoint() +//} + +HandleInput(); +} + +void FixedUpdate() +{ +if(canWalk == true) +{ + if (inputHorizontal != 0 || inputVertical != 0) { - PlayerPrefs.SetFloat("health-S", currentHealth); + if (inputHorizontal != 0 && inputVertical != 0) + { + inputHorizontal *= speedLimiter; + inputVertical *= speedLimiter; + } + rb.velocity = new Vector2(inputHorizontal * walkSpeed, inputVertical * walkSpeed); } + else + { + rb.velocity = new Vector2(0f, 0f); + } +} + +HandleAttacks(); +ResetValues(); +} + +public void SaveCheckpoint() +{ +PlayerPrefs.SetFloat("health-S", currentHealth); +} }