From 2e38bfd35b84838e188da08ee91298556adb9e38 Mon Sep 17 00:00:00 2001 From: Alicja Date: Tue, 17 Jan 2023 00:26:37 +0100 Subject: [PATCH] Bug fix --- Assembly-CSharp-Editor.csproj | 76 +++++++++---------- Assembly-CSharp.csproj | 63 +++++++-------- Assets/Scenes/BossFightLabirynthCave.unity | 2 +- Assets/Scenes/Catacombs.unity | 2 +- Assets/Scenes/CaveEntrance.unity | 2 +- Assets/Scenes/Cementary.unity | 2 +- Assets/Scenes/Dungeon.unity | 2 +- Assets/Scenes/FirstLabirynthCave.unity | 2 +- Assets/Scenes/FirstVillage.unity | 2 +- Assets/Scenes/ForestWay.unity | 2 +- Assets/Scenes/InnVillage.unity | 2 +- Assets/Scenes/OutsideWizardsHouse.unity | 2 +- Assets/Scenes/Pathway.unity | 2 +- Assets/Scenes/SampleScene.unity | 28 +++---- Assets/Scenes/SecondLabirynthCave.unity | 2 +- Assets/Scenes/TheCave.unity | 4 +- Assets/Scenes/WizardHouse.unity | 2 +- .../Scripts/REFACTORING/Story/ForestWay.meta | 8 ++ UserSettings/EditorUserSettings.asset | 38 +++++----- 19 files changed, 128 insertions(+), 115 deletions(-) create mode 100644 Assets/Scripts/REFACTORING/Story/ForestWay.meta diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 710ed8a0..6ddebd9a 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -277,22 +277,22 @@ 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:/Users/alicj/OneDrive/Desktop/xxx/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:/Users/alicj/OneDrive/Desktop/xxx/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:/Users/alicj/OneDrive/Desktop/xxx/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:/Users/alicj/OneDrive/Desktop/xxx/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:/Users/alicj/OneDrive/Desktop/xxx/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:/Users/alicj/OneDrive/Desktop/xxx/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,100 +643,100 @@ 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:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ef14eed8..efa644c6 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -95,6 +95,7 @@ + @@ -584,7 +585,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:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -932,94 +933,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:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/xxx/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Scenes/BossFightLabirynthCave.unity b/Assets/Scenes/BossFightLabirynthCave.unity index b0c49aa8..b6dc2a84 100644 --- a/Assets/Scenes/BossFightLabirynthCave.unity +++ b/Assets/Scenes/BossFightLabirynthCave.unity @@ -30071,7 +30071,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &990280671 Transform: diff --git a/Assets/Scenes/Catacombs.unity b/Assets/Scenes/Catacombs.unity index ad02b631..a340131b 100644 --- a/Assets/Scenes/Catacombs.unity +++ b/Assets/Scenes/Catacombs.unity @@ -18767,7 +18767,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &887617290 Transform: diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index f2b5f061..87fd6751 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -205932,7 +205932,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1405136713 Transform: diff --git a/Assets/Scenes/Cementary.unity b/Assets/Scenes/Cementary.unity index 4c45304c..91ad5d3d 100644 --- a/Assets/Scenes/Cementary.unity +++ b/Assets/Scenes/Cementary.unity @@ -240201,7 +240201,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &2134413279 Transform: diff --git a/Assets/Scenes/Dungeon.unity b/Assets/Scenes/Dungeon.unity index cce714a8..5254a0dc 100644 --- a/Assets/Scenes/Dungeon.unity +++ b/Assets/Scenes/Dungeon.unity @@ -2970,7 +2970,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &401176150 Transform: diff --git a/Assets/Scenes/FirstLabirynthCave.unity b/Assets/Scenes/FirstLabirynthCave.unity index 48921b16..a7c02e18 100644 --- a/Assets/Scenes/FirstLabirynthCave.unity +++ b/Assets/Scenes/FirstLabirynthCave.unity @@ -32052,7 +32052,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1619576028 Transform: diff --git a/Assets/Scenes/FirstVillage.unity b/Assets/Scenes/FirstVillage.unity index 262ff948..06a3ed3c 100644 --- a/Assets/Scenes/FirstVillage.unity +++ b/Assets/Scenes/FirstVillage.unity @@ -368526,7 +368526,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1135692803 Transform: diff --git a/Assets/Scenes/ForestWay.unity b/Assets/Scenes/ForestWay.unity index b0136100..179b7877 100644 --- a/Assets/Scenes/ForestWay.unity +++ b/Assets/Scenes/ForestWay.unity @@ -195613,7 +195613,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1405136713 Transform: diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index d692a0d2..bca080e6 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -855,7 +855,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &155263508 Transform: diff --git a/Assets/Scenes/OutsideWizardsHouse.unity b/Assets/Scenes/OutsideWizardsHouse.unity index 595f7a9e..7064bb21 100644 --- a/Assets/Scenes/OutsideWizardsHouse.unity +++ b/Assets/Scenes/OutsideWizardsHouse.unity @@ -168899,7 +168899,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &542382488 Transform: diff --git a/Assets/Scenes/Pathway.unity b/Assets/Scenes/Pathway.unity index dbe59607..0790dd7f 100644 --- a/Assets/Scenes/Pathway.unity +++ b/Assets/Scenes/Pathway.unity @@ -75278,7 +75278,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &903399238 Transform: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9fe9fc37..3768f80b 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -447,7 +447,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.5 enemyName: bat1 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 6 baseAttack: 4 isKilled: 0 @@ -1657,7 +1657,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.5 enemyName: skeleton0 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 0 baseAttack: 5 isKilled: 0 @@ -1720,7 +1720,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.2 enemyName: Skeleton - maxHealth: {fileID: 0} + maxHealth: 0 health: 15 baseAttack: 5 isKilled: 0 @@ -2175,7 +2175,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.5 enemyName: bat3 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 6 baseAttack: 4 isKilled: 0 @@ -4188,7 +4188,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.5 enemyName: bat0 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 6 baseAttack: 4 isKilled: 0 @@ -23038,7 +23038,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: slime0 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 0 baseAttack: 2 isKilled: 0 @@ -23175,7 +23175,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: Sime2 - maxHealth: {fileID: 0} + maxHealth: 0 health: 9 baseAttack: 3.5 isKilled: 0 @@ -28414,7 +28414,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 2.5 enemyName: bat2 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 6 baseAttack: 4 isKilled: 0 @@ -55132,7 +55132,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: slime0 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 0 baseAttack: 3.5 isKilled: 0 @@ -55173,7 +55173,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: Slime0 - maxHealth: {fileID: 0} + maxHealth: 0 health: 9 baseAttack: 3.5 isKilled: 0 @@ -55425,7 +55425,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: Slime1 - maxHealth: {fileID: 0} + maxHealth: 0 health: 9 baseAttack: 3.5 isKilled: 0 @@ -55541,7 +55541,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 1.5 enemyName: slime1 - maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} + maxHealth: 0 health: 0 baseAttack: 3.5 isKilled: 0 @@ -69647,6 +69647,8 @@ MonoBehaviour: walkSpeed: 4 Panel: {fileID: 0} dmgParticleSystem: {fileID: 0} + speedy: 300 + temp1: {x: 0, y: 0, z: 0} healthBar: {fileID: 0} lvlUp: 0 test: 0 @@ -178572,7 +178574,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1969780559 Transform: diff --git a/Assets/Scenes/SecondLabirynthCave.unity b/Assets/Scenes/SecondLabirynthCave.unity index 67532a43..b2d3d5bc 100644 --- a/Assets/Scenes/SecondLabirynthCave.unity +++ b/Assets/Scenes/SecondLabirynthCave.unity @@ -71630,7 +71630,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &2070383947 Transform: diff --git a/Assets/Scenes/TheCave.unity b/Assets/Scenes/TheCave.unity index 54653717..9d8c4b01 100644 --- a/Assets/Scenes/TheCave.unity +++ b/Assets/Scenes/TheCave.unity @@ -70814,6 +70814,8 @@ MonoBehaviour: walkSpeed: 4 Panel: {fileID: 0} dmgParticleSystem: {fileID: 0} + speedy: 300 + temp1: {x: 0, y: 0, z: 0} healthBar: {fileID: 0} lvlUp: 0 test: 0 @@ -209947,7 +209949,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1969780559 Transform: diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index b251e253..280f375f 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -42488,7 +42488,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 + m_sendNavigationEvents: 0 m_DragThreshold: 10 --- !u!4 &1823465499 Transform: diff --git a/Assets/Scripts/REFACTORING/Story/ForestWay.meta b/Assets/Scripts/REFACTORING/Story/ForestWay.meta new file mode 100644 index 00000000..6ceb31a0 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Story/ForestWay.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7960aaa2d2db6e438becf0d03e4caf0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b5ec1823..8000eca8 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323 + value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 + value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 + value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c6b181334193c2966333e243d04 + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b + value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d flags: 0 vcSharedLogLevel: value: 0d5e400f0650