From 70faab2f325f28f4bdf2416ca1032c1fc9ecfec4 Mon Sep 17 00:00:00 2001 From: Alicja Date: Mon, 2 Jan 2023 15:02:08 +0100 Subject: [PATCH] Added interactive fireplace in the inn --- Assembly-CSharp-Editor.csproj | 94 ++++---- Assembly-CSharp.csproj | 77 +++--- .../House - Objects/fireplace.png.meta | 16 +- .../House - Objects/fireplace1.png | Bin 0 -> 27625 bytes .../House - Objects/fireplace1.png.meta | 108 +++++++++ Assets/Scenes/InnVillage.unity | 219 +++++++++++++++++- Assets/Scenes/WizardHouse.unity | 24 ++ Assets/SwitchSprite.cs | 12 +- Scriptum.sln | 20 +- UserSettings/EditorUserSettings.asset | 26 +-- 10 files changed, 462 insertions(+), 134 deletions(-) create mode 100644 Assets/Scene Sprites/House - Objects/fireplace1.png create mode 100644 Assets/Scene Sprites/House - Objects/fireplace1.png.meta 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 0000000000000000000000000000000000000000..4afa6d888718ce980ff65fa9ad2808c743da77f6 GIT binary patch literal 27625 zcmeHvbzGH8x9}#UyPGWy(%nddbP9sfEe#TibgHBvf=DABDoRTTA|OgDEh!*~AfSNo z?ExR#4*qi z-`jUb-@{-$RsQ-$Ub+@Oa5oQETZhXwa4$bM8@P?HgDni^JDPvbDTPKXG2_sRv=Oxd z$pr8IqCNVBrluQF)>Xw~0*=w83`uth*W8*vO5;ShEe0M|tQ>4r1cpyP@~M4%sm$K;+o^|Z$RSaZ)I=_1m6?nM1$9?M)KEu?xz{ZCopH>2!=&xU#-W-`O*%%Ao z-90cr_>P|PY~<5njrM-5I%EIH-qq84m)P20EcpLy{~tzU+v_F#7}ZptTne-=G(LhRuB;`lSO_Gf{C zFYGf3zgul@9X8fa?es{tcP1B=Petzf-QFRsNFSGbx)z&lF!lABTlDsI>Sq!%dzKgu&i zYd*T&>C>50hx_^78l~oaoM#koMrUNI^$;D%g?u3s|J>R-l}Ur+9LUp5;=a;qE@yel zs5<^!Varnr6AX20yI?f=IQADWvBGp`Y~%SJ=o_cgc{@$^w_bJNOmLNG!cVOtVjdba zqE-uS@2Vw`;qtMxzpd}Vo}XgqU&ZfOT$^&isRX&bPq(`~+0ewP(U@9lYh10Oaci;+ z|3(VzmE};Hw*YnMRlIUZ-<|1GRz0EvJ&$UP?a~8AX>P0=`z0HkHwk!0C9(FnCGMin zSil$^D~;UJoSvrC>K7|JQ@K?ZpG~f(lUMetC9aoU_*$?k6L^STLe^A5Hg#?(e08Mw z^ThCV?$4dM_OFa8KX{n8r>6u3#aK;-yeRe{e-Hos+SJIZR>>1Z`IWM_tk^sh4}I8fQ! zz^IR{?H;{)TPXIG-|I=w!F1hJcGF?ukHTxc;i}J2TgF#v9+&pq-x)VAH`|#LuXm0J zylO#2(S=b)y1=j4TKvR~)x2`I*YmOSNZOQVtsh3jnB#KED>*u1T#1x<*$*118IS7B zsG08CJx=ZZ!Y)v$i@Y1k-e`44BKHxs8hYXdDxaGZHG3~>(HA1sO69|1tHm+(m%|ME zFT8tVjK@d+FcFihdUe^TN1gj?jglGmlQ{DY%MbTi3zJ=!cP~AS@g`4M`RKNBQJ6Yd z5Pvokr#0iM({^rI)!L{}riq_}^!WAOuJ+Em-M-joZZ#nZHt>u`DOT!VfzR*L_(=>; zpmk5^r7iNmW@4CP^cuhoZEmdkbhjTKBL6AWi;>YWgpXP*%Xcolwthn{p?-hXl}skS zyodevi?maQ)HPKoHRs2OTki&#oq4x=YqLg^H&)4U!c$kmdf&{9EYYRo(ZSdqrjl?b zFP}%Zv**WJVkbU6?tV^Gg4XeB(vCXptX+{m^TwEYe>(EP^EX=RWEg!0wQu0jS1K42 zZBP>B6vA3IlgKjI*yqCS9f>ERVUbR!xo0o57GSnkg$;-3={~;e($D{JJ94^yl{YR* z(dsjru?YE+$c}VbDd{IvQXY;gLmkbVukz`io}%}}z4#`RM8rz;mWskcPeVMn1o3Y2 zU8FHpwm^lp4udUSD?`+jNv_FJX8cr|R*|TWu{Qf2f zg_-P;ippAcKAv4%<*b;_JAJ#Dt-*!`4gZIgDka9d+$m?TY%B|ZoqHZGDSck8^Lgq5 zdyucT-wjjx!twbYj8+)toyX#}T+8%7ivn{9!ChnEA zI*=x|izwY0)d=MczLk1WKDSl5J4@7So?)bU&)^d>>B~~QHxb@5HZh0wsWPZqrk?(v zTe`_f##n7y&ECnY-wC^+~#cTnb#Cpv%l~ zcl<*%U5`4(HMz7(nv{peG1_KK`X$}dIi_T*~_(cPr-Dq;GmDcHQ-bdJONWX zyj~Zqgmq}NuiYsZ;0?D66FR-oa7fbfF2Usbb>uH`JgSn1^SjUGu!U!qKQMKqzYckG zT~5k$C*Vw767Nk+I=S}`1y5)5BWry=^P;uh(<;BIC^Y2uM*-8`G;U5AU&96773qkM zN%pv?$4X)}>w#2lM5yc&POz0Yk#IL1ibvzqJIiYXBX^$Srl{aQjIN^-=%@3;n93@X z;z!emzwP88!B3*glE6fgO9iqe2wAP5mW~jq}oGF!`{C z9GZ@8&h2bTRG$gXP-WRw&SAd!r@Lpd{nC^a391TGQR4O;-$(I$Uzkd!LC%jCrsKB5 zx*?Ao`bkA{V^ilLj~(WU;U_lam)*SNFB7EL(}I-OLvJuNV^xe5M`Yi9Le1t|IZg1* zo7N@4q&|GQo)neath>rxa@^~*z_2V=?BP0KuTAa8l?Oaas zU~RW%r6&)g3a4p3rPnF<7c4%OVieu~xLrymODNvE;#O}GnT%G;IY^1rM|anXB;I(x zmN(;Ut|4`Gg#8W^9o6oj(YjN@mYRzGQ39ZoWhfMDhlyAVklWE{yfAno(uDLGE?I<(>OR(TnAJQWX9*fJFC(1o@7|mLFmm{$ zrC7rZ&JgBEzGX!nWn3yP7vH(#ULhqQcDbgUh5p=|q0VW(!lWU2*VgtS33~&jJ8Ibn zmajt#qmfx!-K8>+8$M!IJj1pa+NA;7= ztYAeFLk5gFPU3A#;eZ^+dgl-fyPh6)=@Ec3&+-@=K{(FLlrfu;*g#A-6p)RVX^P~GGwL4 zuN2o{=&!ve%C~;(UDm-%ffN`{{Ni+c_+oTWu%<71$n%6XZQR%0xkOiVF4=Wja>plO z7M2phc#>5wnBq`$nKw~VN9~(!y!d|c(9NLi>PiIs&TG`9Z0;U5L1J=lFE!6chNWU? z>p>4xG^er{FTGP#xRIaYYh|8Akb3jV=3H!-rq=py80vh&)o0mFGXs)64-35}raQi1 z*U!DLV8kb*REKk`#^I@UqVjcfQtH@iUT2ZL{h)-rwQ#DqK15ZmNn(D2EdetffChSH$jo8Wv|rn90W6 zZhPgeQ~4+=)pz#pGX_n~by2#+58>VKUxjlkV6lFdNM+d99+D-$b}zE@^xbUa?nz+=Sq*u3^y|)L%FmzjJ?FA(=g6B3$KO%3Xu|e>=QT{K8!@U{&!mp&YKaa*8z{nq z?ci4ppxL^>-s>x@bX~B=y>)u&{5FTHvW==Ua&sOR2VL`<2INscO&zJXH^@y235IEi z3%oOw^EJOVHYK9H&!?rt(UE$fT*l}r0UN!Lhh&AKp=f8%Hu$<@g73kH`vJ+r)(t`r zL_{nSd2a`*KQz}5!*G=ga%Q0$;}%SyNc(D9D*sVgyZO73arUQJJiK->xQN73*qerw z_n4Dros=|PLrDTcZxz2ro)YMxNW3=d_rB=7M>_E{rLOAAil7q5ko&bbiQoHQ>Gpgx zmhvKbBTJQ-Fek%%olgt3|Dx~B$F%RgS@1Q6=?khaRm^w^thTD|2vNelX_;cPc=4GbK8 z8o`JXUm`<6HZC%utwM^gw~gAQ8dFF8q&S;xkeP_PWY~)KFz5JaW-zl9U1Fo?P#Kdy z2cbERYmeqtShwx7qZ60ft9+zk3T9xq=yv^_+k+gO2y~VPC+le|tRZEKhiNPYiCOEF zoZ|f&%$m1RaPWyaJ~X@2(QA66);fRjeR1F&k0m{(RWHC}=SM0-P2|hGP}`1zU-8QK z3=0-5Psc5%h6`K*k}D!jeflfZ(^ol$_G0iYBHankq7un=Qryh-r(lbTGi+o?)e9en zujhEMHY=8r6hv;xCw(S0m0l1d6Jl;|T!{8t(hKe4;1073%g~Pd_~Op3)my0%WL@@j z&dDui9#}UhmEv}CUo-i@^I76VxM-%6-~n5?2`e}BikxOh;^!8ubwci|xOwr%FcWCa zVV}l(s2TUc5%+Y@*OcN>pL(<1M?$6ZV>!1jg&Tgk+mY2JK1^pxvP=H1t5DheKCGz! zO%%3j_GlEk=Z2j`Zfem5Yiiku7uaEETiS@ZHPp!QLOMdD<`O+pUtrwqaBJUuuhViZ zzF^ta(!dg!^sOo zRTy)us?YU0Mf_SYv;;B>$?W8MTX#)52s)j1Pw{*c?%h_ zQZKs=^2T~rS>!ebp&xd3EywMaM{;!W`Nh42GjruPF}9hnh+aYzj2FQxi6 z-u2>&tZ@Sw+GxtWf<`@anaVYFbJPo}>Y~24Stv?^tly^tcnIL{& z1qt4g`+9iJKa92mzXrE)cu$)yx~qSoo2uPN>LylQR#nNJREk2g+u`UMDAF-eqFNpV z*1@9ZWbdNq$TkX0yD?U*7g;ol@ICVES`bqulYxWE(ZzKmXoSj7{JluMpTAl9#~?qU3H%Ow8DP!GUQZzEQ_vqync9mRN7IaV3 zH%GR38Q_bowY^9#!Ez{QmVv_Pl?+GdlT7;O;Sx79fUNs^KXwk1cICZLkMxGYwCd>9|iaHz)dn{S<_ZpXRy0#Mo z=^R_#dMa4QF~1_~Dxp2{_ivZ}@M+b{wgCOi%_|igTgr05Djhc;=SHwbT}YUj)<#-U zyh)Ht!IJ!BhsA}!F2vh@>l}XZZViFqsH$LrsNazAQ-vzWeoYDYFt);hu)ShR78v1n zt11_DvDr%`a>~-|UVMjBAL#`t5>!?BpP9HN!9v$7HM5?uvwVvXZu6*&lSfv~*V0*^ znBrs(s8#EDDN_`gj*cBC-MS34U8y> zqPIn5ZBP8Hr=-2le!S^&CxJ!9CWLMU=arB_nXXgpV+_&P^20cP+ZP?49421mKXaI7hLQ04;RuUJ%v==tx~9fbxk;6 z5BFYJ3oAU<^V*nbfcf5#^ZQDx2aLo1%`bPe5DyEbtBqT(4M#1sp?IdJ_8~TBw%&O= zyI%4UBp0_;>@fZO3w!7dF1}xVU*;0f7?a9HW%{_vG;9yRtjMtZl7_f~Y9HPDGVM{T zv{-UQ9D|&0TSYlmUXqqk$3!7HUT*zq@$5skG!laX0_^=7{Dh#(MBT5|C$#)T8p~u! z5-;4g-LWg9x@!_bcSiz`f!%6m?tJkTOjS3bP~`nN-flBl13DBZyv?WKF2t{rP1ngx z@mo`~xbZnZWm6rVx$IgkK{#^pmRO$mwGH1JvA6ML_ohY0CP&V;QRovJ6v^k_ z-2(e5`d^kDSCLFpsm^X%`36l!44f|(zm0Vk`CV&6NTEZ4SNAp0s+7#sA7kah5uZcIw;RkeJ%4L)?`z=6gf=mj>s(>Vz{4 z`on`%hP=%^nl{&Zxi01R*saDF-F#wjI4I2Q{^C@&p@>k(E*kGD`}9&RMpwvX6oGQq zLU$F(>MQCIU2kfLS8G`A?vxA1otGZ$Dzxt8+%SBYZfwoziubaIK`U*j8C&B3=ai6U zt9zg!7EiQzEjK->TE&IFvmRHS`Fu^r9}@a<7#d*2 z{fwbh876ia9=6e^(EMgEI5poK7ruONsDVP3ALXIH*j+ITeMd)CqNu3W;7H2SQEmDD z1!Lra4`-&M7Z`FD^%yx`Smwy0-#K%}9N!81w7zsv^^d@Vaz=xO=-yic7D(#@?i;TN!t& z{j`tmK*ug|u7Vl{@}uyTnsWPGyOF{*%~Q`ym@vzd&e>F2@D@Z#DgNVNAQj6|V8(t6NLWXzOEYHaDkkA25F- zjKM6eWsb86-#VoHaE|VpUzX2ODJIH$q=w#Ag^9mBCQu-Wd z4<+9oI+XeuIyWg#X+P2$&RY9cOI7!J--L7jdbEtjH=mcc@4sySe&+cGy=Cf{`{!?} z76~=mF|LZN*y9n+s53Ssc+cLUkLb4%_wFzVA|ZRwCFSFCS_=eCHSIAOT(MfIjNKM0 z4G=DH^h@pwKj<4)NnStec}YkwAwI3~eziNsjJ&@6gVM`7@*4WA_(^kBa*vd=da8v7 zbJ<|Kt*^J=dOpT3CMK_t#$b|SVmI8&(xQ$oqUmQC4_)GTWtxP$s-f8O)K)dwnq_5C z11Wl}#4)#XXUDYmAa(`EDkeR^HG%nDf>(SAAOh9?$iKFC1rP zB!wD_gY-*y3guP&d}rE2z1QZ!g4c4fSt?5ZBVmnVH@CQa5d`{A{r(KoNhb*T1=QQDTu z8I;?Iwze!!5s22b-6ed`H0#D1k$xj%Bz<8>Rw#Y2LQ}7BEIpZD*`DbhcXwXngQEL3 zMjAb#)9g`w>G>Ja;suE#>&+!XeFod~{-|o7@8BWDiEsH&%kvisghW5xrAibavT|6w zASH+so$gqIoIW{Nd$X=_SpwcsKbBd>vU*r#S(W6kMVQxJB4{R^tU`(Mh5Nqo)$6C7 zlC*GJIARif9_XX)S^0WT*>IIJi;~aANH*RqXDCcHpTpdAb!9@It-6q~KtHBOfnf zS!k+^zp^8YE}d^xe8=Kdc~uWxut)L86TViNnNPTArHs6D4c2+Hw^c54$a`a%YH>G>3otwn(~6R*fwOT(xS5bZ|b^bBgGv7QDQsi-((l@%_tBV znxadXC4F>Sx_>@{t(fQ$6ITUcQd}OFIGB1QotLaj)X#3=`RZFq))Ai>(ci$qqA=Cc zADE3MZdda%5W?zyMa<6XV3y%ilypN~E>Y`2$b;A^^Y0cr6Z0QDdyF5HN~2RptOq(+ zX=m%)f}1VnUN?w(j&g(IVwx-YR#n=)vEuU!G-j}S)7B-1RvI>ox&~QZtLa~G@8Qw8 z*z?@U#Ec8Gt2k8_G|6bBkn3VAduRQe`{i5Bjr}u9S2;3FvZf10nmvn42aJ1lLJIq)57UgiM0nPo*a|6Ax zN3Qh;g`p;mH6n^kJ%%Gl2Xv=PR>C&VDM#Y89x|cgI z$kl^wrlH4rmV-!Gc~O+0)6qxGQFW{UkI%W3|Dg{9)>*X~v-@NbOa0%@@6{D9vSWW< zVqhPon2)h~zfj>|qF2AAYDZapvB%qwSuk2AY)K2RM}8T30}boJ+_}^5-1Ht^P|zP( z%hycgvj}El9$v6_EK3`;e>eTzxsEo`x-o0$qdVb)x}3C;hv9PeLHbJu-=Cu#6o(@# zM|sO;5`1nB97>78t5!JhwxIu}*Ta`XXWF*Kq`lO&2e%H{?zCeToa*f$xW74*l3j=T zR_?ox!xW1>BV9FdY_}u5sH2oQCeal%`eKx1M_cK_YpHS*t$w|k->+n>%PT(K>RM7| zjUsSb>#V_Sc6+rR-KCnXC93r4o~hR75V!N2T$r+1c6x2`;*D88{Q)ZkUfvM_C`kIz zm{SY`T6WF}fqh~(Fp2yf?iMDAa-89zy^m*LN2RmmXt*e6{9Vjwl*rG7XMT)AbB?4^ zJ>PBGUUqBQD=}cMC}rD&)O)V#)+K*;*oEF@DMOShah9uF;>*>I3)a>5l?}0xS_{$n z33~h%9t02E5ep(wwv5tD_ccXjc~dYwNvgv@NIIyl{Fu0XKi@MX_lt1wo!8M%Jf3u3 zL~nV(9T_@URL&*B|CleP>jvj(HP{8}9*o|NN^=rd0T?1R?1h|J@ZvZWVTl8MMK9G9 z3yp|Fj8@SI>#S;rT!e}9BHs>lP?{CAcoc*mo@F4iw#>@VzXx+P;L;7R8;5V18D#Tu z)jpXTe2|8;YrY)kT)=?qbZOAB=u$xuKa)qwV-I=dH-<99gBbi?AGBE+#=44;`9ccH z1v+bUkbHCfOFKEXZs~ss7M4+;dF?ReFJNsL7ML0I&dM+suOo;~Z%xQs<$*KpDswct zCAF6Cz@T67_BO+iXqL2UTe{-C)b$`X{A|3f@am}LAobJdovoebp7#$U-SW+Ki;6}Y zeX4n%fx$~=A;jAvqM0pIe`ltC8fixJj4^S`8LAi0$TBWcv{&*USk>V@Tp`W*`g$+( z*$vj$%2DFn4}_h(@`Zg3hq4VFNWBYE(_{!p&|VeYoiKD0zy8ttquhoT>%)-I0>9WZ zxfiEYncoVAPSxVwqfgCAFT`x>?7!k1`=R-4@AFX2;CN!Gq81FbNABUvegeL@ovhIo zbUdGN_1#>Z#cr?RdaV|Z_G}?yv zwL+JuEcr6byK}K&l(Dq4x5ZUs@LCC$f?AlS%?-X(nCanSWa^y}zuL%`e>%%v|4RMU zme<_VFTMB;T%6%e!*@A+$45Rqd5?I=o=ddh>p(cT(X3G9(BZ{G5qKM$tlOKf>caU{ zxz%aaJ>_6=qB?TP_!N57!S}LT_xF%$9NW+;(87G3W5)SX+FVHos+LeavT&+>)r~Yi zNutF>eL%k0;VWS>IyPvm5M4h~QpDdN9miBh>v!r#LIGz!6|Rxf-SRAF@d0-IttZwQ zM0<3!1~M7FMW}1CWI2H-SEN$5)1((~sgy9z3=zt1RbBCpeuleUwzf6GQIngNR@wKE zDnz5YwIuGf-=1Jw<8|r*2U3E(M-f^2Bc}V#4h` z3O?Y?U=~V>8wXyB6Y{YAaLrD;(bvc}%dk0a{sx}j$`^h^;-R9D>q6*pD<3!do0$2m z8>qSy8q#Wu{l{wfDl&I*`&$w|2c$OJUCW$cG4=Eicc&OaGZR#rad8oS`R?*vBi)VoNAYy_OYtul6OXlL|)!335Z;n(8xMUM?n%I4xp^{ZT?aa*(^f zSX_R#4>{GQl76`Tbe+a_B^3s_P4V`;_&I@PH!%*ay^PmWH*oYzgV5EbuD)0?>Oxt} zpR{~wrLACMZlb)mwr$Q?PO=$2YbPwV*`~qgsHaSqaG8Ut5=&gLfxN?v+MiL(pnU4{ zT!WXA$kevKXDxN`7ynu1@qRf+cGQv=0urCz4mrum6k5(%hwZg&ls*x=joe-F$bdk2 zxUmV(!~y1h+VWMK|Mv4(yn@)$HQ~ISfB<4Vq?9`x7oRWseMZInawP@TY;jkG{ARx; zZYl|7MuIUq6E>#8O*ey8P9YISan}Z}rou;+AM}M9EfVVM0=`ERbvyEGXNeR$s0|iN zq2YRYxoCd35vVEZS0%~rfH@e(72uCLHJIXVMUPW+)NS)VCg&ew_?&`z4%wV#Ag3*D z0UnXtLF8QO6Ox;Rll~IUG$=|DwJjo?p}`rH#wn}3vP46>oUh5u-`Z)B`+(}xV3|`Z zamI_0m*HiM^A(rnke5OkV}-wITpXocj*A%>=^^JA78M)6U0k_*R~trAj<@Q6X(jau zZb@BOod3DKFBte(!mcD1;Y%fO99$5HhG%3@{$f()igzYlk>44B~Hu)k-Js2iBV|scvuk2-^JgXyLhPYG^ zP7%{h;WOTE9d8yhPIZ1WMM-pA`j%K?KWNwBtN(02R*@bK8(Q+s>-}=~8fyxdvO0FL z={t!rZIU9jyAqbXXF@VwtlCpn1k7bkG7RaFF$J|7cncN2&cnP_j~7vFNoD{`&9uU= zFer~*)xCzk5chibT4JeVs_^!@u6b^nkA7HjCYq;T@(Y!8X4n_+gBszC*>>9{`DxG-qjrQgRgXl{GP1V?# zZ>eJ=U$k5;7OSb?Ud$4hYVd&fyI)QSf)yM3cykWvGvOcwR*1GJE-{@SR(1#yx%D+H z&zsv|70W?{R9kpgi=HQV$B-6N3wyD>!0@54zC`L`Kof2p22vqAYi_7JsuU-!5w)Ui zJBoQgi@VSwY4FSw8VBv1#U?$I`y%9$BAk(Uk06_7eaOO` z{9q-MU3aUBh)@tu+};k!CuG>rN#q^*5QEnsQ&`!R8AlKN+O)w_kI&|azQD>g%_AOk z+uYxC1^2#|q$D!vmNiIYUG>qM!1#o?$T8I{CEz9 zBMKQU={dqzEAU-nD(bQ{$7yL@m_HajiZz+x8|?6zD^|g8>iO(ks<|~(!WJ8%@kt>Tin@k`rCxQ0Jmg&>)9o7@u(-W+ng|_#(AtghAWp|FViMo)>TnicVgqT4WJ>c zHd3IULwSh&T^U_FJ~OgVzh8irb8jh8{d`8b;PM4UDx>;{xo9*DhyV3>sf&Q>MrpRzVBNvE=KU*lj4^ z3cAA^6|Eww>CH-ls&np5Z)rwze%t_@t$jM>k+kCHRdlUd8{3LeO%3|QJ5;=PQat#~ zW4)WtCoklFhxuAHyuKl7ApANs)PnrALP=!I>1iqccT7duY3!}F3R_L$&hZQ>UNi9P zcsKa`gg3rc8eQlXFnBA@FN>DJ9B+u#JsF#kSW8N`)1(Mz2cEK_oRoFgM_Eh zanD-p2?@U6B3vHaHHYFlYSF8rVEZI@w7L9&M_+Th>@7kdBnD#T)R@55<+EdMm(obiWC4;HF`&Mj< zT5T^R6t2-KzhTe{NVsbK{!Z*dDw`_(Vet6HeuGhA3nTH;V)5sO@~lO&F)th88*1KF z246N-gz=WU72Z2ujrTQOT+On7ks-|TNKLF-U z%}+(eFW?Ppzoq-C5ti%7t9P;L>SN+E{MgiDA%=_I92Z}3xduvvU|cD$AM9~0mi2OY zHIWiGI;U`$qO`Yx4d~1 zJ+5`>oqnYH21UVW!V{wkY2}jdyA6!D%)7svkIZqx)pi15dbBvGsdsK`z+gz>4)XHa zs`B#CkM|Kj*}oT%Af?i#O%kr9m(Re3cZI;cQ`@@=&N0JQW`v5JU-qUr^rhNima2T> z%nVx%8O^?Nsd$a(%JMV^Mu-f&oLe)7TX!ZvHCyo}Io+q(hO2m=CeSfnap=9euX=Wf z6Y=Y?=-T~a3g2*iWH}0D70ZJAJ)E}hjm>rjHN45^jVA*F4OQ4van_@sZ>o!M&fw0x z(@wRY6qxDzWtY_}5<#b82eUsHPbK{o|*&VuPKZ))Wxk_ow+TnT`g_6 zeVyG9e{BJSNy_-TSy(yQc)=}g>>OOA7(UfMV}LtYOEH`m(%{u_lee*VQ1SP$(eu~T zxAJ$g60>HIk;anr6-N+ow(+un`#N8C@f7!!VmP8Jj%Wig4+H!N#mh;G!AL_JF7N7L z0~h2LWcJ;91;S&=R z#ba~X#u>rO6CpO=A7oZm)zJPq z1K7~c!P)I-7Q$P9!1Qvk{TGsfkt2JY)C4j8C*8l);|LjnrJ*6N;A-U!#8Xv}Vn9H+ ztsShz6_f--_{2o{MMU|8`S=utWQ9eQM1>Xj`IN*Ih4^?CPfS;J@$|BAv9f`tJ0Pa> z3)@;)iSP<@+4A!VaR~|uS#wzkTJv&Q3)%8niHTT>@$&PZAfe^qfCy!a%YP*azl|WT zsEwEm1Dqj_PzPa73lQE20!L&Kb`_WRu(9xR_0V^9y)4B5 zgo1;aKZi9CS!iwHWuai^*C~$tB1yDq<;OWi4baWcf$xp02iD zJ{BG}vUUhNB5Z|7iX&UW*?zc+{g3!Q_BOx|2$ON~@^Sq%8NVRO3tnMsD@zL@EHJ#?07gIn0?Kc&>G$7Ys`AIe0wIBL(>sX&*5QYxPb$`hz(s`6 z-;wiQ;{IC-0KtKkK^TDoLS}st{YW85K%fLr4)*@n7zis+j+CTCG*(U>_5aD&zoh^W z9xA}X@a0+9G(w=0N#~+pDTb2G5Du7urL%JkS9P5!9Wc@C&vIU06Pk? zf6DmBynjo9qXa|{0xJrzC=lw{!URA2kbEb{K&U|;fM`H?f4Ba}3W)9_|A_VDM6T;R zRs>iTQU($d2nE_;3@8io1mJ@L@(9rSr{y2#Kqq49v;UF6%b1%-A=338?Z^Ym%e%1S zl?EXeB6&dpo`GY+j+9UmJx*W{RvEO92qS|Jlg?O*i~o9{A5jhOqvBHnM*w1ffmn|K&#ZkIvxQ21bXpA2xq(WME?g zg_q&@1Pa{&pbZU-fi~D1K*&IfgB$_{%m@3*Ke-e9?IZ>l84`L1Sm(#r|9B$+|y-wROc_i_>s%mp;SSqRYlC*=ZF?|d3~fX9(BP9Q_HA#Xym0+c^^0054xj35j#_?;NQnV9(uDwwh) z11vv(5=Ps(iO8E@bHNzoO(^Dp5D;xJ4w844f(mAWpaF!3Xo9id%TF1880qBrpA-P` z3r&FPlM_@(_h19>ClMfo#E4>IqHrX@3xrabFZ+%z^)Lh@C`o?`j(Cg$76EYS2Ucek zz=uiyusjg{BZ4NN4e|miU@nm1Bn{|30pa{f0bnKY7zA1YAOesw0KPuC37dsYB4U^C zXE+@#g9vLvg&S%h>XU5%hWfzrpa9{)&JIVcNGBD5c!CEn^*A=(h$NxlGfBp0IoFGC3O03dLZ$nOk5AGj61ynuMJ zws5qhg1HbQ&;|wSgZ9aBF))t!FJ_PF{_-}!0|nyuvqr#xJinJec>qj+1c#6zB2fQi z4UGY1K>Qxp$8GTatA7mp)&H~50OMbk-(`aEekuUAXt2wHWe-~VAf*2vYDgxq&j4AW z@>2l-23-ZePBJLl&@KXWE13=VcFZ{hE``=a(c;{#p0-GJe(0}QHPQ@6A6$2tovmp|>m$?Dsyvfs!38Z_p7M;Da_e%z^Qf zOW$9?pt(nUPHa;DcNzZpB>PVaK$d_61jNDN4iX3m2u_+HCLsa-ASl2`SP%#d6%e}s z2IfG@o}3F{VEp9c7>FlC1JFC7`x9{7_>%&^yB?qc81%XnFb40!z!LlO8i{xZ0C1pp z#lkSKA^v*33g(==AOD;OX#co<{VN`TKU9uo`!75IkRb~KtN*kf!b*_U!1(cz``2au zD0CoB|3wYxLRU_p%<)a@*FylvBaqdBX8_M*1^!69$>tFVs{4=!2$tU9?S!V0R_;6mdoGy zL2}hC0!(z+k$fjsBLMw_GGO^UVuTPF6hQo#(U1G?j~IvGz-qvnfKewZV!1;s#Ryf7 z=KkqT{Ly=1L@4~g5uIHBc^`n30g3@*LG-~B3BcpnP{&asidZeXk2xHDqe9PxKo6|D zKi`49K`7dw#J4VE`o|AOs44fdX0O$i=_8^a$Z^d>x0$@go&5 z4dM&hKoP*}2nGN@%JFj~gc0-BVW_|o(2*L3c=mEc5RnH2h>Q5qB^|M100PI!bgTem zvDBGg&uSpzf42twjiFz?{Ky+%@gtr;cmtZpuV@ioK;T1)fw@N>fB?W7zwW6}vLb2( zL9kqctK9>H*8iIY`tb<#Knx`KQ9+zefnwlH1ces31|S11pb!D=ljUf_4*-M%x}Xh` z_kXGYTEEkWXrGh;z#tg`{+~Pm5P<7|#X$jy1Gy7|0XP&wu>XM&0`#EG5QeZQ5bPvR zNCtp+BpYZT3XtK*1IOKC0BC~)6vzYc0daS7((&d4%{Z>1lj}dN|48jP?;sf94P=1i z0kVMtgonye5*z>MK{)`rVDj-f<<}3IfEU1K0$E9P|M;QrKNTLD2SVs*nMCk~_5o1%wCi z;}!6T#ZR7~2V_4=;^U#?ZzyCy4G4e&YG5H~>=^Ty0JLiT)B2CB78X5yN1Up$nif?)2f_p7Q@cAy!UI=AZ6L(ZM})!%e86ODYxn4L zlHvU4?=WhD 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