From f4c3020cfbf76b0dba8ca91b7a808dd9eb450465 Mon Sep 17 00:00:00 2001 From: Jakub Sztuba Date: Fri, 13 Jan 2023 14:11:01 +0100 Subject: [PATCH] Wizard A* escaping improvement --- Assembly-CSharp-Editor.csproj | 97 +- Assembly-CSharp.csproj | 78 +- Assets/Animations/Fire/Fire.cs | 18 +- Assets/Animations/Portal.meta | 8 + .../Portal/Green Portal Sprite Sheet.png | Bin 0 -> 24489 bytes .../Portal/Green Portal Sprite Sheet.png.meta | 528 +++++++ Assets/Animations/Portal/New Animation 1.anim | 86 ++ .../Portal/New Animation 1.anim.meta | 8 + Assets/Animations/Portal/Portal.controller | 72 + .../Animations/Portal/Portal.controller.meta | 8 + Assets/Palettes/Water.prefab | 48 +- .../EscapingWizardController.controller | 317 +++++ .../EscapingWizardController.controller.meta | 8 + Assets/Resources/NPC/Dungeon/Wizard.prefab | 10 +- Assets/Resources/Objects/Dungeon/Door.prefab | 82 +- Assets/Scenes/Dungeon.unity | 1262 ++++++++++++++--- .../Pathfinding/AStarPathfindingAgent.cs | 13 +- .../TileData/Ground - Dungeon.asset | 10 +- .../ProceduralGeneration/TileMapGenerator.cs | 14 +- .../Story/Dungeon/DungeonManager.cs | 11 +- .../Story/Dungeon/Wizard/EscapingWizard.cs | 24 +- Assets/Sprites/NPCs/WizardDown.anim | 2 +- Assets/WizardLight.cs | 76 + Assets/WizardLight.cs.meta | 11 + Assets/world_173.asset | 36 + Assets/world_173.asset.meta | 8 + ProjectSettings/TagManager.asset | 7 + Scriptum.sln | 20 +- UserSettings/EditorUserSettings.asset | 20 +- 29 files changed, 2509 insertions(+), 373 deletions(-) create mode 100644 Assets/Animations/Portal.meta create mode 100644 Assets/Animations/Portal/Green Portal Sprite Sheet.png create mode 100644 Assets/Animations/Portal/Green Portal Sprite Sheet.png.meta create mode 100644 Assets/Animations/Portal/New Animation 1.anim create mode 100644 Assets/Animations/Portal/New Animation 1.anim.meta create mode 100644 Assets/Animations/Portal/Portal.controller create mode 100644 Assets/Animations/Portal/Portal.controller.meta create mode 100644 Assets/Resources/NPC/Dungeon/EscapingWizardController.controller create mode 100644 Assets/Resources/NPC/Dungeon/EscapingWizardController.controller.meta create mode 100644 Assets/WizardLight.cs create mode 100644 Assets/WizardLight.cs.meta create mode 100644 Assets/world_173.asset create mode 100644 Assets/world_173.asset.meta diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 710ed8a0..4f7abe60 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -2,8 +2,10 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts - unity_csc.bat + <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package + <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package + true + Debug @@ -11,7 +13,8 @@ 10.0.20506 2.0 - {7627C07C-5359-F002-1D58-E2F51D95C564} + {7cc02776-5953-02f0-1d58-e2f51d95c564} + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Properties Assembly-CSharp-Editor @@ -27,8 +30,9 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_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 @@ -36,8 +40,9 @@ Temp\bin\Release\ prompt 4 - 0169 + False + False true @@ -273,26 +278,29 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEditor.Graphs.dll + + C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.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.Newtonsoft.Json.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/Unity.Plastic.Antlr3.Runtime.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/unityplastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll + C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + C:/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 @@ -643,107 +651,106 @@ 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:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} + {e0f48af5-6d3e-b154-523d-8f755dc8e665} Assembly-CSharp - false diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a51de84a..11808763 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,8 +2,10 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts - unity_csc.bat + <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package + <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package + true + Debug @@ -11,7 +13,8 @@ 10.0.20506 2.0 - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} + {e0f48af5-6d3e-b154-523d-8f755dc8e665} + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Properties Assembly-CSharp @@ -27,8 +30,9 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 - 0169 + False + False pdbonly @@ -36,8 +40,9 @@ Temp\bin\Release\ prompt 4 - 0169 + False + False true @@ -131,6 +136,7 @@ + @@ -575,7 +581,7 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -923,94 +929,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/Fire/Fire.cs b/Assets/Animations/Fire/Fire.cs index 89ccfef8..eb5e27a2 100644 --- a/Assets/Animations/Fire/Fire.cs +++ b/Assets/Animations/Fire/Fire.cs @@ -9,14 +9,28 @@ public class Fire : MonoBehaviour float maxFlickerIntensity = 1.0f; float flickerSpeed = 4.9f; private HardLight2D firelight; + private HardLight2D[] lights; private GameObject fire; private int randomizer = 0; // Start is called before the first frame update void Start() { - firelight = FindObjectOfType(); - fire = GameObject.Find("Fire"); + + lights = FindObjectsOfType(); + List finalList = new List(); + string nameToLookFor = "LightFire"; + + for(var i = 0; i < lights.Length; i++) + { + if(lights[i].name == nameToLookFor) + { + finalList.Add(lights[i]); + } + } + firelight = finalList[0]; + + //firelight = FindObjectOfType(); StartCoroutine( ChangeRange()); } diff --git a/Assets/Animations/Portal.meta b/Assets/Animations/Portal.meta new file mode 100644 index 00000000..282ca517 --- /dev/null +++ b/Assets/Animations/Portal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ab219ba65b3fee49b7ac13978c70ff2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Portal/Green Portal Sprite Sheet.png b/Assets/Animations/Portal/Green Portal Sprite Sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..e1f6c5e59ff22bcf718b268190d5feb6bd8fede6 GIT binary patch literal 24489 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.gameObject; - + Debug.Log("Findign Path"); point = player.transform.position; FindPoint(); @@ -53,6 +53,7 @@ public class AStarPathfindingAgent : MonoBehaviour { Pathfinder.FindPath(transform.position, point, this); } + public void ControlAnim() { @@ -109,8 +110,10 @@ public class AStarPathfindingAgent : MonoBehaviour myAnim.SetBool("Left", false); } - //moveX = path[targetIndex].worldPosition.x - current.x; - //moveY = path[targetIndex].worldPosition.y - current.y; + moveXWizard = path[targetIndex].worldPosition.x - current.x; + moveYWizard = path[targetIndex].worldPosition.y - current.y; + myAnim.SetFloat("moveYWizard", moveYWizard); + myAnim.SetFloat("moveXWizard", moveXWizard); moveX = point.x - current.x; moveY = point.y - current.y; myAnim.SetFloat("Yinfo", moveY); diff --git a/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset b/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset index 0c157743..b0f5ec98 100644 --- a/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset +++ b/Assets/Scripts/Pathfinding/TileData/Ground - Dungeon.asset @@ -14,12 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: Tiles: - {fileID: 11400000, guid: bcef03bfe6d889f458c051fcda77d968, type: 2} - - {fileID: 11400000, guid: d42493bc02d957348b2fa86903567280, type: 2} - - {fileID: 11400000, guid: de0fda329382efd4282ae71a2102f4d3, type: 2} - - {fileID: 11400000, guid: 358aa35606523e7448ae0830831f6d72, type: 2} - - {fileID: 11400000, guid: deda5f47600755b4483b220e3c1ff87e, type: 2} - - {fileID: 11400000, guid: 7fd161cc7577108489aca90fb9db6ed1, type: 2} - - {fileID: 11400000, guid: 2e196d2a440526e4495cf2ae03a1da5c, type: 2} - - {fileID: 11400000, guid: 5d8974c1ff1a1ee4db297f3cc42015b3, type: 2} - - {fileID: 11400000, guid: ca1a2a4d015bc0e44b2f7ed4e8a19b0e, type: 2} + - {fileID: 11400000, guid: d71e206419fbe4c4aa6787f74226c30a, type: 2} + - {fileID: 11400000, guid: 94ebdd7e7cf39e841a93596879fe58d5, type: 2} walkable: 1 diff --git a/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs b/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs index 12f775aa..0fd48ade 100644 --- a/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs +++ b/Assets/Scripts/ProceduralGeneration/TileMapGenerator.cs @@ -32,7 +32,7 @@ public class TileMapGenerator : MonoBehaviour List fillers = new List(); - for (int i = 0; i < 70; i++) + for (int i = 0; i < 60; i++) { FloodFill filler = new FloodFill(map, 1, new Vector2Int(Random.Range(0, 70), Random.Range(0, 70))); fillers.Add(filler); @@ -74,7 +74,7 @@ public class TileMapGenerator : MonoBehaviour GraphNode playerPosStart = graph.graphNodes[Random.Range(0, graph.graphNodes.Count)]; Vector2Int startPos = playerPosStart.positions.ElementAt(Random.Range(0, playerPosStart.positions.Count)); - Vector3 startPosOfPlayer = default; + Vector3 possiblePos = default; foreach (var filler in fillers) { int id = filler.id; @@ -83,8 +83,8 @@ public class TileMapGenerator : MonoBehaviour if (id == 1) { ground.SetTile(new Vector3Int(pos.x,pos.y,0), ground1); - startPosOfPlayer = new Vector3Int(pos.x, pos.y, 0); - availablePos.Add(startPosOfPlayer); + possiblePos = new Vector3Int(pos.x, pos.y, 0); + availablePos.Add(possiblePos); } else if (id == 2) { @@ -112,7 +112,7 @@ public class TileMapGenerator : MonoBehaviour GameObject Player = GameObject.FindWithTag("Player"); Player.transform.position = randomCoordsForStanding(); - + //randomCoordsForStanding(); return true; @@ -121,14 +121,14 @@ public class TileMapGenerator : MonoBehaviour public Vector3 randomCoordsForStanding() { - Tile test = new Tile(); + //Tile test = new Tile(); while (true) { int bound = availablePos.Count; int randomVal; randomVal = Random.Range(0, bound); - return availablePos[randomVal]; + return availablePos[randomVal] + new Vector3( 0.5f, 0.5f, 0f); } diff --git a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs index 542a40ba..0d8becb7 100644 --- a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs +++ b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs @@ -25,6 +25,13 @@ public class DungeonManager : MonoBehaviour public GameObject Wizard; public bool IsBuilded = false; + + public static bool hasTeleported; + + public static void SetTeleported() + { + hasTeleported = true; + } public void Awake() { @@ -41,7 +48,7 @@ public class DungeonManager : MonoBehaviour public void Start() { - + hasTeleported = false; } public void Update() @@ -133,7 +140,7 @@ public class DungeonManager : MonoBehaviour public void BuildWizard() { Vector3 teleportCoords; - + Debug.Log("creating wizard!!!!!!!!!!!"); do { teleportCoords = GameObject.FindObjectOfType().gameObject.GetComponent().randomCoordsForStanding(); diff --git a/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs b/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs index 2d68066f..03db120e 100644 --- a/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs +++ b/Assets/Scripts/REFACTORING/Story/Dungeon/Wizard/EscapingWizard.cs @@ -8,7 +8,8 @@ using UnityEngine; [RequireComponent(typeof(NPC))] class EscapingWizard : MonoBehaviour { - + private HardLight2D wizardlight; + private HardLight2D[] lights; private Rigidbody2D myRigidbody; public Animator anim; @@ -22,6 +23,7 @@ class EscapingWizard : MonoBehaviour public AStarPathfindingAgent agent; public bool isDuringEscaping = false; // var is setted by trigger range + public float escapingRadius = 6f; // radious where Wizard start escaping if player is in @@ -33,7 +35,6 @@ class EscapingWizard : MonoBehaviour private void Start() { - } private void Update() @@ -63,18 +64,29 @@ class EscapingWizard : MonoBehaviour anim.SetFloat("Yinfo", dir.y); } - agent.point = targetPosition.position; - agent.FindPoint(); + agent.point = targetPosition.position; + StopAllCoroutines(); + //Debug.Log("FOLLOWINGPATH STARTED"); + agent.FindPoint(); + //agent.FindPath(); StartCoroutine(agent.FollowPath()); + } else { - anim.SetBool("isRunning", false); + //anim.SetBool("isRunning", false); gameObject.GetComponent().State = NPCStateEnum.Pending; } } + private void OnDrawGizmos() + { + Gizmos.color = Color.magenta; + Gizmos.DrawWireSphere(transform.position,escapingRadius); + } + + public bool IsInEscapingRadious() { if (Vector2.Distance(GameObject.FindGameObjectWithTag("Player").transform.position, transform.position) >= escapingRadius) @@ -87,6 +99,8 @@ class EscapingWizard : MonoBehaviour { if(collision.collider.tag == "SceneTransition") { + DungeonManager.SetTeleported(); + Destroy(gameObject); } } diff --git a/Assets/Sprites/NPCs/WizardDown.anim b/Assets/Sprites/NPCs/WizardDown.anim index b741542f..91577121 100644 --- a/Assets/Sprites/NPCs/WizardDown.anim +++ b/Assets/Sprites/NPCs/WizardDown.anim @@ -58,7 +58,7 @@ AnimationClip: m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 m_LoopTime: 1 - m_LoopBlend: 0 + m_LoopBlend: 1 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 diff --git a/Assets/WizardLight.cs b/Assets/WizardLight.cs new file mode 100644 index 00000000..307db224 --- /dev/null +++ b/Assets/WizardLight.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Security.Cryptography; +using UnityEngine; +using Random = UnityEngine.Random; + + +public class WizardLight : MonoBehaviour +{ + + private float range = 0; + float minFlickerIntensity = 0.6f; + float maxFlickerIntensity = 0.8f; + float flickerSpeed = 0.05f; + private HardLight2D wizardlight; + private HardLight2D[] lights; + private GameObject fire; + private int randomizer = 0; + private Transform wizardTransform; + // Start is called before the first frame update + void Start() + { + lights = FindObjectsOfType(); + List finalList = new List(); + string nameToLookFor = "LightWizard"; + + for(var i = 0; i < lights.Length; i++) + { + if(lights[i].name == nameToLookFor) + { + finalList.Add(lights[i]); + } + } + wizardlight = finalList[0]; + + //firelight = FindObjectOfType(); + StartCoroutine( ChangeRange()); + + wizardTransform = GameObject.FindGameObjectWithTag("NPC").transform; + } + + private void Update() + { + StartCoroutine( ChangeRange()); + + wizardTransform = GameObject.FindGameObjectWithTag("NPC").transform; + + if (DungeonManager.hasTeleported) + { + Destroy(gameObject); + wizardlight.enabled = false; + } + } + + void LateUpdate() + { + // we store current camera's position here + Vector3 temp = transform.position; + temp.x = wizardTransform.position.x; + temp.y = wizardTransform.position.y-0.2f; + transform.position = temp; + + } + + IEnumerator ChangeRange() + { + if (randomizer == 0) { + wizardlight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity)); + } + else wizardlight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity)); + + randomizer = Random.Range (0, 1); + yield return new WaitForSeconds(flickerSpeed); + } +} diff --git a/Assets/WizardLight.cs.meta b/Assets/WizardLight.cs.meta new file mode 100644 index 00000000..fced9d49 --- /dev/null +++ b/Assets/WizardLight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e810f44247dd5f459eeb0c986cb49a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/world_173.asset b/Assets/world_173.asset new file mode 100644 index 00000000..6132fe2b --- /dev/null +++ b/Assets/world_173.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: world_173 + m_EditorClassIdentifier: + m_Sprite: {fileID: 3832754618602560763, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/world_173.asset.meta b/Assets/world_173.asset.meta new file mode 100644 index 00000000..f06162f0 --- /dev/null +++ b/Assets/world_173.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bd400519d67ac445b48b519a273e0c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 66ff9c9d..43df8f65 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,6 +19,13 @@ TagManager: - Test - ChestCollection - Manager + - HitboxTop + - HitboxRight + - HitboxBottom + - HitboxLeft + - ItemCollection + - WizardLight + - Fire layers: - Default - TransparentFX diff --git a/Scriptum.sln b/Scriptum.sln index 59166d3c..13d86e2b 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", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7627C07C-5359-F002-1D58-E2F51D95C564}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7cc02776-5953-02f0-1d58-e2f51d95c564}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index cbf1be81..a70981be 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b + flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 + value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 + value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb + value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 flags: 0 vcSharedLogLevel: value: 0d5e400f0650