diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 79b88239..857393c5 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -2,10 +2,8 @@ latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - + C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -13,8 +11,7 @@ 10.0.20506 2.0 - {7cc02776-5953-02f0-1d58-e2f51d95c564} - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {7627C07C-5359-F002-1D58-E2F51D95C564} Library Properties Assembly-CSharp-Editor @@ -30,9 +27,8 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0 prompt 4 - + 0169 False - False pdbonly @@ -40,9 +36,8 @@ Temp\bin\Release\ prompt 4 - + 0169 False - False true @@ -282,22 +277,22 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll - C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll - C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll - C:/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -648,106 +643,107 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll - {e0f48af5-6d3e-b154-523d-8f755dc8e665} + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} Assembly-CSharp + false diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ff1ce26a..504a9863 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,10 +2,8 @@ latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - + C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -13,8 +11,7 @@ 10.0.20506 2.0 - {e0f48af5-6d3e-b154-523d-8f755dc8e665} - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} Library Properties Assembly-CSharp @@ -30,9 +27,8 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 - + 0169 False - False pdbonly @@ -40,9 +36,8 @@ Temp\bin\Release\ prompt 4 - + 0169 False - False true @@ -527,7 +522,7 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -875,94 +870,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/test/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Scene Sprites/House - Objects/fireplace.png.meta b/Assets/Scene Sprites/House - Objects/fireplace.png.meta index a101b3ea..af925901 100644 --- a/Assets/Scene Sprites/House - Objects/fireplace.png.meta +++ b/Assets/Scene Sprites/House - Objects/fireplace.png.meta @@ -112,12 +112,12 @@ TextureImporter: name: fireplace_0 rect: serializedVersion: 2 - x: 0 - y: 86 + x: 16 + y: 70 width: 48 height: 58 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: [] @@ -138,7 +138,7 @@ TextureImporter: width: 48 height: 58 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: [] @@ -159,7 +159,7 @@ TextureImporter: width: 48 height: 58 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: [] @@ -180,7 +180,7 @@ TextureImporter: width: 48 height: 58 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: [] @@ -201,7 +201,7 @@ TextureImporter: width: 48 height: 58 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: [] @@ -222,7 +222,7 @@ TextureImporter: width: 48 height: 58 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: [] diff --git a/Assets/Scene Sprites/House - Objects/fireplace1.png b/Assets/Scene Sprites/House - Objects/fireplace1.png new file mode 100644 index 00000000..4afa6d88 Binary files /dev/null and b/Assets/Scene Sprites/House - Objects/fireplace1.png differ diff --git a/Assets/Scene Sprites/House - Objects/fireplace1.png.meta b/Assets/Scene Sprites/House - Objects/fireplace1.png.meta new file mode 100644 index 00000000..bdf6cd37 --- /dev/null +++ b/Assets/Scene Sprites/House - Objects/fireplace1.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c4284b1f9876b984cac394ef59405d9f +TextureImporter: + internalIDToNameTable: [] + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index 096be46a..a3130279 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -1041,7 +1041,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1051,7 +1051,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 2 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1061,7 +1061,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 1 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1200,12 +1200,12 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 999761995969321364, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -172694008462474151, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 7102213014884403958, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: 3567225515417545137, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 @@ -1226,10 +1226,10 @@ Tilemap: m_Data: {fileID: -6273525262347030492, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: -7055040228193979920, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -172694008462474151, guid: e7698f36d680635418599dd2745a3e61, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 7102213014884403958, guid: e7698f36d680635418599dd2745a3e61, type: 3} m_TileMatrixArray: - m_RefCount: 13 m_Data: @@ -1810,6 +1810,180 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &254153938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 254153939} + - component: {fileID: 254153943} + - component: {fileID: 254153942} + - component: {fileID: 254153941} + - component: {fileID: 254153940} + m_Layer: 0 + m_Name: chimney + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &254153939 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254153938} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.174, y: 4.917, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2096268659} + m_RootOrder: 29 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &254153940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254153938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa5b04c7bac39de43a8625bf7364749f, type: 3} + m_Name: + m_EditorClassIdentifier: + inRange: 0 + sprites: + - {fileID: 5698017828174702254, guid: e153eb354738d8f4cbe8435acc224c94, type: 3} + - {fileID: 21300000, guid: c4284b1f9876b984cac394ef59405d9f, type: 3} + current: 0 +--- !u!60 &254153941 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254153938} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3, y: 3.625} + newSize: {x: 3, y: 3.625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -1.1503415, y: -0.9352989} + - {x: -1.3829403, y: -0.9686098} + - {x: -1.4200039, y: -0.96778774} + - {x: -1.6785734, y: -0.9671316} + - {x: -1.6076814, y: -0.98531437} + - {x: -1.5727895, y: -1.8488941} + - {x: -1.3866498, y: -2.2773643} + - {x: -0.6431186, y: -2.570743} + - {x: -0.24164486, y: -2.640307} + - {x: 0.35356736, y: -2.6131825} + - {x: 0.85588646, y: -2.5523667} + - {x: 1.2405653, y: -2.4142766} + - {x: 1.5654583, y: -1.9187093} + - {x: 1.5836558, y: -1.9187093} + - {x: 1.6091843, y: -0.9423528} + - {x: 0.5316322, y: -0.971694} +--- !u!60 &254153942 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254153938} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3, y: 3.625} + newSize: {x: 3, y: 3.625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.79944134, y: -0.23107529} + - {x: -1.3187151, y: -0.23882675} + - {x: -1.3067877, y: -1.5033607} + - {x: 1.2681456, y: -1.6064072} + - {x: 1.2573466, y: -0.23466301} + - {x: 0.74999976, y: -0.31347752} +--- !u!212 &254153943 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254153938} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: 21300000, guid: c4284b1f9876b984cac394ef59405d9f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 3.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &263844091 GameObject: m_ObjectHideFlags: 0 @@ -2108,6 +2282,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 630262873} + keybindMenu: {fileID: 0} --- !u!114 &287941594 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2409,6 +2584,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 228588811} + keybindMenu: {fileID: 0} --- !u!114 &312774222 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2879,6 +3055,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1820105106} + keybindMenu: {fileID: 0} --- !u!114 &435143835 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20887,6 +21064,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1946214773} + keybindMenu: {fileID: 0} --- !u!114 &871527955 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21563,6 +21741,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1899406335} + keybindMenu: {fileID: 0} --- !u!114 &1021636890 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22994,6 +23173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 0} + keybindMenu: {fileID: 0} --- !u!114 &1213437782 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23324,6 +23504,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1946214773} + keybindMenu: {fileID: 0} --- !u!114 &1230984955 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23661,6 +23842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1899406335} + keybindMenu: {fileID: 0} --- !u!114 &1275118728 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23889,6 +24071,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1820105106} + keybindMenu: {fileID: 0} --- !u!114 &1320684246 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24242,6 +24425,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 0} + keybindMenu: {fileID: 0} --- !u!114 &1368000837 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24461,6 +24645,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1899406335} + keybindMenu: {fileID: 0} --- !u!114 &1382225128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24683,6 +24868,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1608355680} + keybindMenu: {fileID: 0} --- !u!114 &1382919691 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24793,6 +24979,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 630262873} + keybindMenu: {fileID: 0} --- !u!114 &1418513961 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25322,6 +25509,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1608355680} + keybindMenu: {fileID: 0} --- !u!114 &1470860480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25634,6 +25822,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7b852f4c11744f74d93a7c35435bb4eb, type: 3} m_Name: m_EditorClassIdentifier: + drunk: 0 + max: 0 + duration: 0 + speed: 10 + temp: {x: 0, y: 0, z: 0} --- !u!81 &1510671360 AudioListener: m_ObjectHideFlags: 0 @@ -26681,6 +26874,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 228588811} + keybindMenu: {fileID: 0} --- !u!114 &1631746952 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27994,6 +28188,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1899406335} + keybindMenu: {fileID: 0} --- !u!114 &1816694443 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29365,6 +29560,7 @@ Transform: - {fileID: 437961818} - {fileID: 1446355165} - {fileID: 515630087} + - {fileID: 254153939} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29435,6 +29631,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 713544293} + keybindMenu: {fileID: 0} --- !u!114 &2132145655 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index 91e79ef1..7a3773d4 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -24732,6 +24732,8 @@ MonoBehaviour: inRange: 0 sprites: - {fileID: 3555795224932194294, guid: e153eb354738d8f4cbe8435acc224c94, type: 3} + - {fileID: 4113829005332862926, guid: 2e7f8051f8d173f45a0a877753dc2a6d, type: 3} + current: 0 --- !u!60 &536387130 PolygonCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/SwitchSprite.cs b/Assets/SwitchSprite.cs index b400c9c1..1660682b 100644 --- a/Assets/SwitchSprite.cs +++ b/Assets/SwitchSprite.cs @@ -7,6 +7,7 @@ public class SwitchSprite : MonoBehaviour public bool inRange = false; public Sprite[] sprites; private List availableSprites = new List(); + public int current; // Start is called before the first frame update void Start() @@ -38,12 +39,19 @@ public class SwitchSprite : MonoBehaviour void Update() { - if(inRange == true) + if (inRange == true) { - if(Input.GetKeyDown(KeyCode.E)) + if (Input.GetKeyDown(KeyCode.E) && current != 1) { GetComponent().sprite = sprites[0]; + current = 1; } + else if (Input.GetKeyDown(KeyCode.E) && current == 1) + { + GetComponent().sprite = sprites[1]; + current = 0; + } + } } } diff --git a/Scriptum.sln b/Scriptum.sln index 13d86e2b..59166d3c 100644 --- a/Scriptum.sln +++ b/Scriptum.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7cc02776-5953-02f0-1d58-e2f51d95c564}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7627C07C-5359-F002-1D58-E2F51D95C564}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.Build.0 = Release|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 5dceda1b..ffa59c6b 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 - flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a123df6f23b34f1a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-5: value: 200b1b3316501b4842040d290521103419001626232922236202182ac0e93a3cf1a817faf43f2b2f7631ec390a3b4f2afc031d12 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0