From 5a5fa8a04a51171b3dd11ad80e1ba988fe433f22 Mon Sep 17 00:00:00 2001 From: Alicja Date: Sat, 7 Jan 2023 19:58:08 +0100 Subject: [PATCH] Minor changes (cherry picked from commit 8e504d04364c0983e67fcccfa0eb09af2949002f) --- Assembly-CSharp-Editor.csproj | 94 +++++++++---------- Assembly-CSharp.csproj | 77 +++++++-------- Assets/OpenSettingsOnESCPress.cs | 4 +- Assets/Scenes/InnVillage.unity | 2 +- Assets/Scripts/CamerFollow.cs | 1 + .../Item/Effects/PotionEffectsManager.cs | 15 ++- Scriptum.sln | 20 ++-- UserSettings/EditorUserSettings.asset | 30 +++--- 8 files changed, 124 insertions(+), 119 deletions(-) diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 79b88239..710ed8a0 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/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/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/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/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/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/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/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/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 48fc790b..83aec578 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 @@ -571,7 +566,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/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -919,94 +914,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/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/OpenSettingsOnESCPress.cs b/Assets/OpenSettingsOnESCPress.cs index fdfdfd75..66c86ec4 100644 --- a/Assets/OpenSettingsOnESCPress.cs +++ b/Assets/OpenSettingsOnESCPress.cs @@ -13,8 +13,8 @@ public class OpenSettingsOnESCPress : MonoBehaviour void Update() { - KeyCode keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings")); - if (Input.GetKeyUp(keyToSettings)) + //KeyCode keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings")); + if (Input.GetKeyUp(KeyCode.Escape)) { if ((SettingsMainPanel.active == false) && (SettingsPanel.active == false) && (SoundsPanel.active == false) && (ControlsPanel.active == false) && (LanguagePanel.active == false)) { diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index b4fe0e71..3bedb433 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -1605,7 +1605,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &228588812 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CamerFollow.cs b/Assets/Scripts/CamerFollow.cs index 0e07a25b..e3be4ec4 100644 --- a/Assets/Scripts/CamerFollow.cs +++ b/Assets/Scripts/CamerFollow.cs @@ -18,6 +18,7 @@ public class CamerFollow : MonoBehaviour void Start() { playerTransform = GameObject.FindGameObjectWithTag("Player").transform; + PlayerPrefs.SetInt("drunk", 0); } void LateUpdate() diff --git a/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs b/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs index 7a77a9d9..c93b8129 100644 --- a/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Item/Effects/PotionEffectsManager.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using UnityEngine; +using System.Collections; class PotionEffectsManager : ItemEffectsManager { @@ -54,7 +55,7 @@ class PotionEffectsManager : ItemEffectsManager } else if(item.name == "Beer") { - GameObject.FindObjectOfType().Drink(); + Drink(); } else if(item.name == "Crab Venom") { @@ -66,6 +67,18 @@ class PotionEffectsManager : ItemEffectsManager } } + public void Drink() + { + PlayerPrefs.SetInt("drunk", 1); + StartCoroutine(SoberUp()); + } + + public IEnumerator SoberUp() + { + yield return new WaitForSecondsRealtime(6); + PlayerPrefs.SetInt("drunk", 2); + } + // use below function in one above - depending on the condition public void HealthBigPotion() { 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 c5234111..fc6e8a9c 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: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb - flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0