Merge branch 'master' into melania-dev

This commit is contained in:
KrolMel 2023-01-10 21:45:22 +01:00
commit 104b638ee6
56 changed files with 12595 additions and 849 deletions

View File

@ -2,8 +2,10 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath> <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>
<CscToolExe>unity_csc.bat</CscToolExe> <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
<CodeAnalysisRuleSet></CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -11,7 +13,8 @@
<ProductVersion>10.0.20506</ProductVersion> <ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<ProjectGuid>{7627C07C-5359-F002-1D58-E2F51D95C564}</ProjectGuid> <ProjectGuid>{7cc02776-5953-02f0-1d58-e2f51d95c564}</ProjectGuid>
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp-Editor</AssemblyName> <AssemblyName>Assembly-CSharp-Editor</AssemblyName>
@ -27,8 +30,9 @@
<DefineConstants>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</DefineConstants> <DefineConstants>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</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn></NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -36,8 +40,9 @@
<OutputPath>Temp\bin\Release\</OutputPath> <OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn></NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NoConfig>true</NoConfig> <NoConfig>true</NoConfig>
@ -273,26 +278,29 @@
<Reference Include="UnityEditor.Graphs"> <Reference Include="UnityEditor.Graphs">
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.WebGL.Extensions">
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.WindowsStandalone.Extensions"> <Reference Include="UnityEditor.WindowsStandalone.Extensions">
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Plastic.Newtonsoft.Json"> <Reference Include="Unity.Plastic.Newtonsoft.Json">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll</HintPath> <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Plastic.Antlr3.Runtime"> <Reference Include="Unity.Plastic.Antlr3.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="unityplastic"> <Reference Include="unityplastic">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll</HintPath> <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4netPlastic"> <Reference Include="log4netPlastic">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll</HintPath> <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll</HintPath>
</Reference> </Reference>
<Reference Include="HardLight2D"> <Reference Include="HardLight2D">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath> <HintPath>C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
</Reference> </Reference>
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath> <HintPath>C:/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="mscorlib"> <Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@ -643,107 +651,106 @@
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.TestRunner"> <Reference Include="UnityEngine.TestRunner">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.TestRunner"> <Reference Include="UnityEditor.TestRunner">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Editor"> <Reference Include="Unity.2D.Animation.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEngineBridge.001"> <Reference Include="Unity.InternalAPIEngineBridge.001">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VSCode.Editor"> <Reference Include="Unity.VSCode.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.PixelPerfect"> <Reference Include="Unity.2D.PixelPerfect">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Tilemap.Editor"> <Reference Include="Unity.2D.Tilemap.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="PsdPlugin"> <Reference Include="PsdPlugin">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro.Editor"> <Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VisualStudio.Editor"> <Reference Include="Unity.VisualStudio.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline"> <Reference Include="Unity.Timeline">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro"> <Reference Include="Unity.TextMeshPro">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Editor"> <Reference Include="Unity.2D.IK.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Sprite.Editor"> <Reference Include="Unity.2D.Sprite.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Psdimporter.Editor"> <Reference Include="Unity.2D.Psdimporter.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Path.Editor"> <Reference Include="Unity.2D.Path.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEditorBridge.001"> <Reference Include="Unity.InternalAPIEditorBridge.001">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.UI"> <Reference Include="UnityEditor.UI">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.PlasticSCM.Editor"> <Reference Include="Unity.PlasticSCM.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Rider.Editor"> <Reference Include="Unity.Rider.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.UI"> <Reference Include="UnityEngine.UI">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics"> <Reference Include="Unity.Mathematics">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Runtime"> <Reference Include="Unity.2D.IK.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Triangle.Runtime"> <Reference Include="Unity.2D.Animation.Triangle.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Runtime"> <Reference Include="Unity.2D.Animation.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.PixelPerfect.Editor"> <Reference Include="Unity.2D.PixelPerfect.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline.Editor"> <Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics.Editor"> <Reference Include="Unity.Mathematics.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Common.Runtime"> <Reference Include="Unity.2D.Common.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.SpriteShape.Editor"> <Reference Include="Unity.2D.SpriteShape.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Common.Editor"> <Reference Include="Unity.2D.Common.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.SpriteShape.Runtime"> <Reference Include="Unity.2D.SpriteShape.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="Assembly-CSharp.csproj"> <ProjectReference Include="Assembly-CSharp.csproj">
<Project>{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}</Project> <Project>{e0f48af5-6d3e-b154-523d-8f755dc8e665}</Project>
<Name>Assembly-CSharp</Name> <Name>Assembly-CSharp</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -2,8 +2,10 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath> <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>
<CscToolExe>unity_csc.bat</CscToolExe> <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
<CodeAnalysisRuleSet></CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -11,7 +13,8 @@
<ProductVersion>10.0.20506</ProductVersion> <ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<ProjectGuid>{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}</ProjectGuid> <ProjectGuid>{e0f48af5-6d3e-b154-523d-8f755dc8e665}</ProjectGuid>
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp</AssemblyName> <AssemblyName>Assembly-CSharp</AssemblyName>
@ -27,8 +30,9 @@
<DefineConstants>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</DefineConstants> <DefineConstants>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</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn></NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -36,8 +40,9 @@
<OutputPath>Temp\bin\Release\</OutputPath> <OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn></NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NoConfig>true</NoConfig> <NoConfig>true</NoConfig>
@ -90,6 +95,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\TaskDifficultyEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\TaskDifficultyEnum.cs" />
<Compile Include="Assets\_\Stuff\GridPathfinding\GridPathfinding.cs" /> <Compile Include="Assets\_\Stuff\GridPathfinding\GridPathfinding.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\MultiDialogue.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\MultiDialogue.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Story\Dungeon\EntryEventObserver.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UIWarehouseManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UIWarehouseManager.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\LanguageDetector\LanguageDetector.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\LanguageDetector\LanguageDetector.cs" />
<Compile Include="Assets\OpenSettingsOnESCPress.cs" /> <Compile Include="Assets\OpenSettingsOnESCPress.cs" />
@ -208,6 +214,7 @@
<Compile Include="Assets\Scripts\Door\TriggerDoor.cs" /> <Compile Include="Assets\Scripts\Door\TriggerDoor.cs" />
<Compile Include="Assets\Scripts\ProceduralGeneration\GraphNode.cs" /> <Compile Include="Assets\Scripts\ProceduralGeneration\GraphNode.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\AccountBalance\PanelCashController.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\AccountBalance\PanelCashController.cs" />
<Compile Include="Assets\UpdateControls.cs" />
<Compile Include="Assets\HardLight2D\Demo\DemoScripts\Speen.cs" /> <Compile Include="Assets\HardLight2D\Demo\DemoScripts\Speen.cs" />
<Compile Include="Assets\Scripts\SceneManager\OnMapAppearanceMethod.cs" /> <Compile Include="Assets\Scripts\SceneManager\OnMapAppearanceMethod.cs" />
<Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCQuest.cs" /> <Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCQuest.cs" />
@ -245,6 +252,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Application\UI\Panel\EquipmentPanelController.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\UI\Panel\EquipmentPanelController.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Save\MultiDialogue\MultiDialogueDataLoader.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Save\MultiDialogue\MultiDialogueDataLoader.cs" />
<Compile Include="Assets\ParticleDisable.cs" /> <Compile Include="Assets\ParticleDisable.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Story\Dungeon\DungeonManager.cs" />
<Compile Include="Assets\HardLight2D\Demo\DemoScripts\PolyWobbler.cs" /> <Compile Include="Assets\HardLight2D\Demo\DemoScripts\PolyWobbler.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Shared\PrefabAssetModel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Shared\PrefabAssetModel.cs" />
<Compile Include="Assets\Scripts\Door\DetectionZone.cs" /> <Compile Include="Assets\Scripts\Door\DetectionZone.cs" />
@ -252,6 +260,7 @@
<Compile Include="Assets\NPCType.cs" /> <Compile Include="Assets\NPCType.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Enum\MissionTypeEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Enum\MissionTypeEnum.cs" />
<Compile Include="Assets\Scripts\Enemies&apos; Scprits\FollowingEnemy.cs" /> <Compile Include="Assets\Scripts\Enemies&apos; Scprits\FollowingEnemy.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Story\Dungeon\Wizard\EscapingWizard.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\EquipmentPanelSlotsTypeEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\EquipmentPanelSlotsTypeEnum.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\AbstractPanel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\AbstractPanel.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Item\Effects\PotionEffectsManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Item\Effects\PotionEffectsManager.cs" />
@ -285,6 +294,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Condition\Subject\CollectRequiredSubject.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Condition\Subject\CollectRequiredSubject.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Mission\MissionData.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Mission\MissionData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Model\MissionStepModel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Model\MissionStepModel.cs" />
<Compile Include="Assets\Animations\Fire\Fire.cs" />
<Compile Include="Assets\Scripts\Enemies&apos; Scprits\PatrollingEnemy.cs" /> <Compile Include="Assets\Scripts\Enemies&apos; Scprits\PatrollingEnemy.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\NPC\NPC.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\NPC\NPC.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Story\Thugs\ThugNPCFollowing.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Story\Thugs\ThugNPCFollowing.cs" />
@ -566,7 +576,7 @@
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll</HintPath>
</Reference> </Reference>
<Reference Include="HardLight2D"> <Reference Include="HardLight2D">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath> <HintPath>C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
</Reference> </Reference>
<Reference Include="netstandard"> <Reference Include="netstandard">
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
@ -914,94 +924,94 @@
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath> <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Editor"> <Reference Include="Unity.2D.Animation.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEngineBridge.001"> <Reference Include="Unity.InternalAPIEngineBridge.001">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VSCode.Editor"> <Reference Include="Unity.VSCode.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.PixelPerfect"> <Reference Include="Unity.2D.PixelPerfect">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Tilemap.Editor"> <Reference Include="Unity.2D.Tilemap.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="PsdPlugin"> <Reference Include="PsdPlugin">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro.Editor"> <Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VisualStudio.Editor"> <Reference Include="Unity.VisualStudio.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline"> <Reference Include="Unity.Timeline">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro"> <Reference Include="Unity.TextMeshPro">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Editor"> <Reference Include="Unity.2D.IK.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Sprite.Editor"> <Reference Include="Unity.2D.Sprite.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Psdimporter.Editor"> <Reference Include="Unity.2D.Psdimporter.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Path.Editor"> <Reference Include="Unity.2D.Path.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEditorBridge.001"> <Reference Include="Unity.InternalAPIEditorBridge.001">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.UI"> <Reference Include="UnityEditor.UI">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.PlasticSCM.Editor"> <Reference Include="Unity.PlasticSCM.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Rider.Editor"> <Reference Include="Unity.Rider.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.UI"> <Reference Include="UnityEngine.UI">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics"> <Reference Include="Unity.Mathematics">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Runtime"> <Reference Include="Unity.2D.IK.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Triangle.Runtime"> <Reference Include="Unity.2D.Animation.Triangle.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Animation.Runtime"> <Reference Include="Unity.2D.Animation.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.PixelPerfect.Editor"> <Reference Include="Unity.2D.PixelPerfect.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline.Editor"> <Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics.Editor"> <Reference Include="Unity.Mathematics.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Common.Runtime"> <Reference Include="Unity.2D.Common.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.SpriteShape.Editor"> <Reference Include="Unity.2D.SpriteShape.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Common.Editor"> <Reference Include="Unity.2D.Common.Editor">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.SpriteShape.Runtime"> <Reference Include="Unity.2D.SpriteShape.Runtime">
<HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath> <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8a6364752f113ea44beb244152b31372
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fire
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 4268471932424394617, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- time: 0.083333336
value: {fileID: -3438796335496917445, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- time: 0.16666667
value: {fileID: 466498994544540999, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- time: 0.25
value: {fileID: 4328626103302227732, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 4268471932424394617, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- {fileID: -3438796335496917445, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- {fileID: 466498994544540999, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
- {fileID: 4328626103302227732, guid: 813d71ef063a3984384ab7e19f7677e5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 99719379c3b43934cbccc3d388c9caba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,39 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Fire : MonoBehaviour
{
private float range = 0;
float minFlickerIntensity = 0.5f;
float maxFlickerIntensity = 1.0f;
float flickerSpeed = 4.9f;
private HardLight2D firelight;
private GameObject fire;
private int randomizer = 0;
// Start is called before the first frame update
void Start()
{
firelight = FindObjectOfType<HardLight2D>();
fire = GameObject.Find("Fire");
StartCoroutine( ChangeRange());
}
// Update is called once per frame
void Update()
{
StartCoroutine( ChangeRange());
}
IEnumerator ChangeRange()
{
if (randomizer == 0) {
firelight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity));
}
else firelight.Intensity = (Random.Range (minFlickerIntensity, maxFlickerIntensity));
randomizer = Random.Range (0, 1);
yield return new WaitForSeconds(flickerSpeed);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 469a1d836de07a74cbd302239e2053ba
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-7695636587662364842
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6441872249265300746}
m_Position: {x: 356.00928, y: 95.754425, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 6441872249265300746}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FireController
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -7695636587662364842}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &6441872249265300746
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fire
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 99719379c3b43934cbccc3d388c9caba, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f83320568db09104ab270d53cc7d8cc7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

View File

@ -0,0 +1,204 @@
fileFormatVersion: 2
guid: 813d71ef063a3984384ab7e19f7677e5
TextureImporter:
internalIDToNameTable:
- first:
213: 4268471932424394617
second: campfire_16x16_0
- first:
213: -3438796335496917445
second: campfire_16x16_1
- first:
213: 466498994544540999
second: campfire_16x16_2
- first:
213: 4328626103302227732
second: campfire_16x16_3
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: campfire_16x16_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 97791e17b98ac3b30800000000000000
internalID: 4268471932424394617
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: campfire_16x16_1
rect:
serializedVersion: 2
x: 16
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b3e8acfc3f0f640d0800000000000000
internalID: -3438796335496917445
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: campfire_16x16_2
rect:
serializedVersion: 2
x: 32
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 74d77e92d56597600800000000000000
internalID: 466498994544540999
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: campfire_16x16_3
rect:
serializedVersion: 2
x: 48
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 41700d4c18e521c30800000000000000
internalID: 4328626103302227732
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -6,19 +7,23 @@ public class DisplayExpStatus : MonoBehaviour
{ {
public GameObject expText; public GameObject expText;
public static KeyCode keyToExp;
private void Start()
{
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if (Input.GetKeyDown(keyToExp))
if (Input.GetKeyDown(KeyCode.Tab))
{ {
expText.SetActive(true); expText.SetActive(true);
} }
if (Input.GetKeyUp(KeyCode.Tab)) if (Input.GetKeyUp(keyToExp))
{ {
expText.SetActive(false); expText.SetActive(false);
} }
} }
} }

View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -7,17 +8,23 @@ public class DisplayHealthStatus : MonoBehaviour
{ {
public GameObject healthText; public GameObject healthText;
public static KeyCode keyToHealth;
private void Start()
{
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if (Input.GetKeyDown(KeyCode.Tab))
if (Input.GetKeyDown(keyToHealth))
{ {
healthText.SetActive(true); healthText.SetActive(true);
} }
if (Input.GetKeyUp(KeyCode.Tab)) if (Input.GetKeyUp(keyToHealth))
{ {
healthText.SetActive(false); healthText.SetActive(false);
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 672c563e08d4dcc4f82a2704ed3e5b76
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 96ee6f77f01216b46acd0f0406129e1f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 39fd0cca68e63b24da5fe62a0a9dbd1f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: ac620efce14ec274bb2ac7720b2353d8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 09b1f1497498c0d4fa97bfaf7add0404
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: a4943caf5d80e5341bf2e2868c9406e2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -10,12 +11,31 @@ public class OpenSettingsOnESCPress : MonoBehaviour
public GameObject SoundsPanel; public GameObject SoundsPanel;
public GameObject ControlsPanel; public GameObject ControlsPanel;
public GameObject LanguagePanel; public GameObject LanguagePanel;
public KeyCode keyToSettings;
private void Start()
{
if (!PlayerPrefs.HasKey("Settings"))
{
Debug.Log("NIE MA KEY!");
keyToSettings = KeyCode.Escape;
}
else
{
Debug.Log("MA KEY!");
keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings"));
}
}
void Update() void Update()
{ {
//KeyCode keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings")); if (PlayerPrefs.HasKey("Settings"))
if (Input.GetKeyUp(KeyCode.Escape))
{ {
keyToSettings = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings"));
}
if (Input.GetKeyUp(keyToSettings))
{
Debug.Log("WYKRYWA KLAWISZ!");
if ((SettingsMainPanel.active == false) && (SettingsPanel.active == false) && (SoundsPanel.active == false) && (ControlsPanel.active == false) && (LanguagePanel.active == false)) if ((SettingsMainPanel.active == false) && (SettingsPanel.active == false) && (SoundsPanel.active == false) && (ControlsPanel.active == false) && (LanguagePanel.active == false))
{ {
SettingsMainPanel.SetActive(true); SettingsMainPanel.SetActive(true);

View File

@ -0,0 +1,270 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8299560284626945632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8299560284626945635}
- component: {fileID: 8299560284626945634}
- component: {fileID: 8299560284626945644}
- component: {fileID: 6510690144753172304}
- component: {fileID: 8299560284626945645}
- component: {fileID: 8299560284626945646}
- component: {fileID: 8552972087287136995}
- component: {fileID: 4951012252775454729}
- component: {fileID: 4951012252775454728}
- component: {fileID: 4951012252775454731}
m_Layer: 0
m_Name: BattleWizard
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8299560284626945635
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3.6720886, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8299560284626945634
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_Sprite: {fileID: 2429924255151692236, guid: a618c1a6d5f6e29438eeadfa55fcea33, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.0625, y: 1.75}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &8299560284626945644
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 5
m_LinearDrag: 1.5
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!58 &6510690144753172304
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.1}
serializedVersion: 2
m_Radius: 0.7
--- !u!61 &8299560284626945645
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.44218445}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.1875, y: 1.8125}
newSize: {x: 1.0625, y: 1.75}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.0625, y: 0.7334442}
m_EdgeRadius: 0
--- !u!95 &8299560284626945646
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 7d09ffbc6c0aa7c409b8da27c69433bd, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &8552972087287136995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d622984048644f87804ad1a3f20aa23a, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 2
currentPosition:
GCost: 0
hCost: 0
walkable: 0
worldPosition: {x: 0, y: 0, z: 0}
gridPosition: {x: 0, y: 0}
isChasing: 0
point: {x: 0, y: 0, z: 0}
path: []
--- !u!114 &4951012252775454729
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85ed5d06f443ff547aeb225e656c0e19, type: 3}
m_Name:
m_EditorClassIdentifier:
BattleState: 1
defence: 0
maxHealth: 45
currentHealth: 0
canTakeDamage: 1
attackValue: 5
attackingRadius: 1.3
MinionRespowner: {fileID: 0}
SummonedMinionsCounter: 3
KilledMinionsCounter: 0
IsAfterSummoning: 0
approaching: 0
CurrentPoint: 0
Points:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
TargetPosition: {x: 0, y: 0, z: 0}
hit: 0
firstAttack: 0
timerDmg: 0
timeToWaitBeforeNextAttack: 1
timerHit: 0
timeToWaitBeforeNextHitFromPlayer: 0.55
isPanelEnabled: 1
--- !u!114 &4951012252775454728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a932b573f4bb557488543fea26124646, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 0
enemyName:
maxHealth: {fileID: 0}
health: 0
baseAttack: 0
isKilled: 0
MinionName:
--- !u!114 &4951012252775454731
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8299560284626945632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
m_Name:
m_EditorClassIdentifier:
Name:
State: 1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1dd9a631d03d51f4792b21f682af311d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -822,6 +822,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 215490326} - component: {fileID: 215490326}
- component: {fileID: 215490327}
m_Layer: 0 m_Layer: 0
m_Name: Respowner IV m_Name: Respowner IV
m_TagString: Untagged m_TagString: Untagged
@ -844,6 +845,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &215490327
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215490325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1001 &217609132 --- !u!1001 &217609132
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -995,6 +1009,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 281735111} - component: {fileID: 281735111}
- component: {fileID: 281735112}
m_Layer: 0 m_Layer: 0
m_Name: Respowner V m_Name: Respowner V
m_TagString: Untagged m_TagString: Untagged
@ -1017,6 +1032,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &281735112
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 281735110}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &286103254 --- !u!1 &286103254
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15872,6 +15900,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 833322047} - component: {fileID: 833322047}
- component: {fileID: 833322048}
m_Layer: 0 m_Layer: 0
m_Name: Respowner III m_Name: Respowner III
m_TagString: Untagged m_TagString: Untagged
@ -15894,6 +15923,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &833322048
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 833322046}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &852779019 --- !u!1 &852779019
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -49810,6 +49852,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1004268554} - component: {fileID: 1004268554}
- component: {fileID: 1004268555}
m_Layer: 0 m_Layer: 0
m_Name: Respowner II m_Name: Respowner II
m_TagString: Untagged m_TagString: Untagged
@ -49832,6 +49875,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1004268555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1004268553}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &1017172187 --- !u!1 &1017172187
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -50515,6 +50571,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1108941935} - component: {fileID: 1108941935}
- component: {fileID: 1108941936}
m_Layer: 0 m_Layer: 0
m_Name: RespownerI VI m_Name: RespownerI VI
m_TagString: Untagged m_TagString: Untagged
@ -50537,6 +50594,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1108941936
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1108941934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1001 &1114279571 --- !u!1001 &1114279571
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -57909,6 +57979,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2083033196} - component: {fileID: 2083033196}
- component: {fileID: 2083033197}
m_Layer: 0 m_Layer: 0
m_Name: Respowner I m_Name: Respowner I
m_TagString: Untagged m_TagString: Untagged
@ -57931,6 +58002,19 @@ Transform:
m_Father: {fileID: 1797967006} m_Father: {fileID: 1797967006}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2083033197
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083033195}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &2096156760 --- !u!1 &2096156760
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -6349,6 +6349,40 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 16841862} m_GameObject: {fileID: 16841862}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &22770814
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22770815}
m_Layer: 0
m_Name: WizardPoints
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &22770815
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 22770814}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.793322, y: 9.569919, z: 4752.9263}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1397886437}
- {fileID: 1106173633}
- {fileID: 1572966418}
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &34028356 --- !u!1 &34028356
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6913,6 +6947,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106024591} m_GameObject: {fileID: 106024591}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &135636477
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 135636478}
m_Layer: 0
m_Name: Enemy
m_TagString: EnemyCollection
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &135636478
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135636477}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.880188, y: 0.35018623, z: -0.051872663}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &161234065 --- !u!1 &161234065
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -7233,7 +7298,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &204680747 --- !u!1 &204680747
GameObject: GameObject:
@ -7536,7 +7601,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &258173715 --- !u!1 &258173715
GameObject: GameObject:
@ -8170,6 +8235,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 358499145} m_GameObject: {fileID: 358499145}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &387648017
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 387648018}
- component: {fileID: 387648019}
m_Layer: 0
m_Name: RespownerI VI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &387648018
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 387648017}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.57, y: -6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &387648019
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 387648017}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &393148138 --- !u!1 &393148138
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13253,6 +13363,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 572003925} m_GameObject: {fileID: 572003925}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &593642922
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 593642923}
- component: {fileID: 593642924}
m_Layer: 0
m_Name: Respowner III
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &593642923
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 593642922}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 13.5, y: 9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &593642924
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 593642922}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &628485145 --- !u!1 &628485145
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13650,7 +13805,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3} m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ElementsToBuildOnSceneList: [] ElementsToBuildOnSceneList:
- Key: 2
Value:
EquippableItem: {fileID: 11400000, guid: 56c5c2b6450ca9e44bae4cf253354d38, type: 2}
- Key: 1
Value:
EquippableItem: {fileID: 11400000, guid: 74bb221206536b94caf425820b9d626d, type: 2}
- Key: 0
Value:
EquippableItem: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2}
convertedData: [] convertedData: []
--- !u!1 &718486685 --- !u!1 &718486685
GameObject: GameObject:
@ -14154,6 +14318,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 745339690} m_GameObject: {fileID: 745339690}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &759652002
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 759652003}
- component: {fileID: 759652004}
m_Layer: 0
m_Name: Respowner IV
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &759652003
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759652002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.36, y: -1.75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &759652004
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759652002}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &766940968 --- !u!1 &766940968
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14411,6 +14620,106 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3} m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &835929574
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 835929575}
m_Layer: 0
m_Name: Items
m_TagString: ItemCollection
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &835929575
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835929574}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.8144205, y: 2.055713, z: 53.813805}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &836498854
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3079617781123838016, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_Name
value: GridManager
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: tilemap
value:
objectReference: {fileID: 1246626}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: showIndividualNodes
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: TileDatas.Array.data[0]
value:
objectReference: {fileID: 11400000, guid: 95405e1d97d8a4e4f84c70f2bf03610a, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b44df46620f48f41903e7858379f704, type: 3}
--- !u!1 &894928854 --- !u!1 &894928854
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14544,6 +14853,72 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 898954636} m_GameObject: {fileID: 898954636}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &910626181
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 910626183}
- component: {fileID: 910626182}
m_Layer: 0
m_Name: Respowner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &910626182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 910626181}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7b61fe647fb4fe9409164deb62d90214, type: 3}
m_Name:
m_EditorClassIdentifier:
Respown: 1
Counter: 30
minions:
- {fileID: 1286673498977745411, guid: 907fd3295a32657448c71940016c2698, type: 3}
- {fileID: 4095674802650808536, guid: d4ed7b1b2a2b74b49966bd3fb39806ff, type: 3}
- {fileID: 2071044935318948575, guid: 4424631257fae904ca20d56e45a8fce1, type: 3}
- {fileID: 768066516210684488, guid: 37d53369a108ca64b8ec49414fe5b33f, type: 3}
respownPoints:
- {fileID: 1307663526}
- {fileID: 1818662997}
- {fileID: 593642922}
- {fileID: 759652002}
- {fileID: 1917480848}
- {fileID: 387648017}
killedMinions: 0
associatedChest: {fileID: 0}
--- !u!4 &910626183
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 910626181}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1307663527}
- {fileID: 1818662998}
- {fileID: 593642923}
- {fileID: 759652003}
- {fileID: 1917480849}
- {fileID: 387648018}
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &987934608 --- !u!1 &987934608
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15006,6 +15381,37 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
MissionDataList: [] MissionDataList: []
--- !u!1 &1106173632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1106173633}
m_Layer: 0
m_Name: SecondPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1106173633
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1106173632}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.8, y: 3.9, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 22770815}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1109145951 --- !u!1 &1109145951
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -24349,6 +24755,7 @@ MonoBehaviour:
coords: {x: 0.55, y: -10.48, z: 10} coords: {x: 0.55, y: -10.48, z: 10}
nextMapName: Dungeon nextMapName: Dungeon
respawnCoords: {x: 0, y: 0, z: 10} respawnCoords: {x: 0, y: 0, z: 10}
isEnabled: 0
--- !u!114 &1227686222 --- !u!114 &1227686222
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -24373,8 +24780,8 @@ Rigidbody2D:
m_Simulated: 1 m_Simulated: 1
m_UseFullKinematicContacts: 0 m_UseFullKinematicContacts: 0
m_UseAutoMass: 0 m_UseAutoMass: 0
m_Mass: 1 m_Mass: 500
m_LinearDrag: 0 m_LinearDrag: 5
m_AngularDrag: 0.05 m_AngularDrag: 0.05
m_GravityScale: 0 m_GravityScale: 0
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -24421,7 +24828,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1241145927 --- !u!1 &1241145927
GameObject: GameObject:
@ -24480,7 +24887,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1248459272 --- !u!1 &1248459272
GameObject: GameObject:
@ -24874,6 +25281,51 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
MultiDialogueDataList: [] MultiDialogueDataList: []
--- !u!1 &1307663526
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1307663527}
- component: {fileID: 1307663528}
m_Layer: 0
m_Name: Respowner I
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1307663527
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1307663526}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.45, y: 3.6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1307663528
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1307663526}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &1314372662 --- !u!1 &1314372662
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -25464,6 +25916,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1360755348} m_GameObject: {fileID: 1360755348}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1397886436
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1397886437}
m_Layer: 0
m_Name: FirstPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1397886437
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1397886436}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -28.5, y: -3, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 22770815}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1421208056 --- !u!1 &1421208056
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -26581,6 +27064,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1552776006} m_GameObject: {fileID: 1552776006}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1572966417
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1572966418}
m_Layer: 0
m_Name: ThirdPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1572966418
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1572966417}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5, y: -8, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 22770815}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1598937725 --- !u!1 &1598937725
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -26910,7 +27424,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1626092663 --- !u!1 &1626092663
GameObject: GameObject:
@ -72462,8 +72976,53 @@ Transform:
- {fileID: 516037787} - {fileID: 516037787}
- {fileID: 1626092664} - {fileID: 1626092664}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1818662997
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1818662998}
- component: {fileID: 1818662999}
m_Layer: 0
m_Name: Respowner II
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1818662998
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1818662997}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.6, y: 9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1818662999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1818662997}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &1827492990 --- !u!1 &1827492990
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -72643,7 +73202,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1846881102 --- !u!1 &1846881102
GameObject: GameObject:
@ -72998,6 +73557,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1914465133} m_GameObject: {fileID: 1914465133}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1917480848
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1917480849}
- component: {fileID: 1917480850}
m_Layer: 0
m_Name: Respowner V
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1917480849
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917480848}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 12.2, y: 3.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 910626183}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1917480850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917480848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!1 &1925834956 --- !u!1 &1925834956
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -73205,7 +73809,7 @@ RectTransform:
- {fileID: 512814467} - {fileID: 512814467}
- {fileID: 1685468476} - {fileID: 1685468476}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -73770,7 +74374,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2137885765 --- !u!1 &2137885765
GameObject: GameObject:
@ -73872,5 +74476,82 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &4951012254333768565
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: MinionRespowner
value:
objectReference: {fileID: 910626181}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[0]
value:
objectReference: {fileID: 1397886437}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[1]
value:
objectReference: {fileID: 1106173633}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[2]
value:
objectReference: {fileID: 1572966418}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[3]
value:
objectReference: {fileID: 1227686225}
- target: {fileID: 8299560284626945632, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_Name
value: BattleWizard
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.y
value: 3.6720886
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -1051,6 +1051,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 171430755} m_GameObject: {fileID: 171430755}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1001 &188723525
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3079617781123838016, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_Name
value: GridManager
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: tilemap
value:
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: showIndividualNodes
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3}
propertyPath: TileDatas.Array.data[0]
value:
objectReference: {fileID: 11400000, guid: e4239a81aa53a50408400f1396f9a1a9, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b44df46620f48f41903e7858379f704, type: 3}
--- !u!1 &189982518 --- !u!1 &189982518
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1902,6 +1971,7 @@ MonoBehaviour:
coords: {x: 0.55, y: -10.48, z: 10} coords: {x: 0.55, y: -10.48, z: 10}
nextMapName: Dungeon nextMapName: Dungeon
respawnCoords: {x: 0, y: 0, z: 10} respawnCoords: {x: 0, y: 0, z: 10}
isEnabled: 0
--- !u!114 &393747016 --- !u!114 &393747016
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2169,6 +2239,82 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
UiManager: {fileID: 0} UiManager: {fileID: 0}
--- !u!1 &436886363
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 436886364}
m_Layer: 0
m_Name: ThirdPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &436886364
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 436886363}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5, y: -19.8, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1938335923}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &495772598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 495772600}
- component: {fileID: 495772599}
m_Layer: 0
m_Name: Respowner V
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &495772599
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 495772598}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &495772600
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 495772598}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 12.2, y: -13.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &513887874 --- !u!1 &513887874
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2616,6 +2762,132 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0} m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &588379404
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 588379406}
- component: {fileID: 588379405}
m_Layer: 0
m_Name: Respowner II
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &588379405
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 588379404}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &588379406
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 588379404}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.4, y: -19.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &608430739
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: BattleState
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: MinionRespowner
value:
objectReference: {fileID: 1348709870}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[0]
value:
objectReference: {fileID: 1047621537}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[1]
value:
objectReference: {fileID: 916415620}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[2]
value:
objectReference: {fileID: 436886364}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: Points.Array.data[3]
value:
objectReference: {fileID: 393747019}
- target: {fileID: 8299560284626945632, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_Name
value: BattleWizard
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.x
value: 10.17
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.y
value: -12.38
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalPosition.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8299560284626945635, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
--- !u!1 &610477486 --- !u!1 &610477486
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -38720,6 +38992,82 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3} m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &911992334
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 911992336}
- component: {fileID: 911992335}
m_Layer: 0
m_Name: Respowner III
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &911992335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 911992334}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &911992336
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 911992334}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: -19.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &916415619
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 916415620}
m_Layer: 0
m_Name: SecondPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &916415620
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 916415619}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -12.9, y: -33.2, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1938335923}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &917723575 --- !u!1 &917723575
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -39283,6 +39631,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044269801} m_GameObject: {fileID: 1044269801}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1047621536
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1047621537}
m_Layer: 0
m_Name: FirstPoint
m_TagString: Untagged
m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1047621537
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1047621536}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -24.3, y: -23.9, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1938335923}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1056032291 --- !u!1 &1056032291
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -41570,6 +41949,72 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1326744094} m_GameObject: {fileID: 1326744094}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1348709870
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1348709872}
- component: {fileID: 1348709871}
m_Layer: 0
m_Name: Respowner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1348709871
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348709870}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7b61fe647fb4fe9409164deb62d90214, type: 3}
m_Name:
m_EditorClassIdentifier:
Respown: 1
Counter: 30
minions:
- {fileID: 1286673498977745411, guid: 907fd3295a32657448c71940016c2698, type: 3}
- {fileID: 4095674802650808536, guid: d4ed7b1b2a2b74b49966bd3fb39806ff, type: 3}
- {fileID: 2071044935318948575, guid: 4424631257fae904ca20d56e45a8fce1, type: 3}
- {fileID: 768066516210684488, guid: 37d53369a108ca64b8ec49414fe5b33f, type: 3}
respownPoints:
- {fileID: 1501176715}
- {fileID: 588379404}
- {fileID: 911992334}
- {fileID: 2073700430}
- {fileID: 495772598}
- {fileID: 1800393219}
killedMinions: 0
associatedChest: {fileID: 0}
--- !u!4 &1348709872
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348709870}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1501176717}
- {fileID: 588379406}
- {fileID: 911992336}
- {fileID: 2073700432}
- {fileID: 495772600}
- {fileID: 1800393221}
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1379000824 --- !u!1 &1379000824
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -55895,6 +56340,51 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0} m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0} m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1501176715
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1501176717}
- component: {fileID: 1501176716}
m_Layer: 0
m_Name: Respowner I
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1501176716
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1501176715}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &1501176717
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1501176715}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.7, y: -15.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1510694748 --- !u!1 &1510694748
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -56231,6 +56721,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521594999} m_GameObject: {fileID: 1521594999}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1534566625
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1534566626}
m_Layer: 0
m_Name: Enemy
m_TagString: EnemyCollection
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1534566626
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534566625}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.880188, y: 0.35018623, z: -0.051872663}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1537941804 --- !u!1 &1537941804
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -57299,6 +57820,51 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
MissionDataList: [] MissionDataList: []
--- !u!1 &1800393219
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1800393221}
- component: {fileID: 1800393220}
m_Layer: 0
m_Name: RespownerI VI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1800393220
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1800393219}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &1800393221
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1800393219}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.57, y: -6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1829337679 --- !u!1 &1829337679
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -57683,6 +58249,40 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1872046347} m_GameObject: {fileID: 1872046347}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1938335922
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1938335923}
m_Layer: 0
m_Name: WizardPoints
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1938335923
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938335922}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.793322, y: 9.569919, z: 4752.9263}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1047621537}
- {fileID: 916415620}
- {fileID: 436886364}
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1950810085 --- !u!1 &1950810085
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -58261,6 +58861,51 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2073700430
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2073700432}
- component: {fileID: 2073700431}
m_Layer: 0
m_Name: Respowner IV
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2073700431
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2073700430}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7571e86bbad71c34e82f55c1d83725fe, type: 3}
m_Name:
m_EditorClassIdentifier:
Blocked: 0
--- !u!4 &2073700432
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2073700430}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.9, y: -14.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1348709872}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2081087905 --- !u!1 &2081087905
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -62,6 +62,12 @@ public class ChangeScene : MonoBehaviour
{ {
if(collision.gameObject.tag == "SceneTransition") if(collision.gameObject.tag == "SceneTransition")
{ {
if(!collision.gameObject.GetComponent<DoorBehaviour>().isEnabled)
{
Debug.Log("Door are not enabled");
return;
}
collision.gameObject.GetComponent<DoorBehaviour>().ScenetToMoveTo(); collision.gameObject.GetComponent<DoorBehaviour>().ScenetToMoveTo();
} }
if(collision.gameObject.tag == "AnimatedDoorSceneTransition") if(collision.gameObject.tag == "AnimatedDoorSceneTransition")

View File

@ -10,6 +10,9 @@ public class DoorBehaviour : MonoBehaviour
[SerializeField] [SerializeField]
public Gateway gateway; public Gateway gateway;
[SerializeField]
public bool isEnabled = true;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@ -61,5 +64,13 @@ public class DoorBehaviour : MonoBehaviour
// 2. Change scene // 2. Change scene
SceneManager.LoadScene(gateway.nextMapName); SceneManager.LoadScene(gateway.nextMapName);
// 3. Save additional controls
SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
PlayerPrefs.Save();
} }
} }

View File

@ -13,7 +13,7 @@ public class KeyBindScript : MonoBehaviour
/// <summary> /// <summary>
/// References to the button objects, these are used for showing the current keybinds /// References to the button objects, these are used for showing the current keybinds
/// </summary> /// </summary>
public Text interaction, skills, settings, attack, inventory; public Text interaction, skills, settings, attack, inventory, quests, exphlth;
/// <summary> /// <summary>
/// The key, that we are binding atm. /// The key, that we are binding atm.
@ -33,15 +33,17 @@ public class KeyBindScript : MonoBehaviour
// Use this for initialization // Use this for initialization
void Start() void Start()
{ {
keys.Add("Interact",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interact","E"))); keys.Add("Interaction",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction","E")));
keys.Add("Settings",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings","Escape"))); keys.Add("Settings",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings","Escape")));
keys.Add("Inventory",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory","I"))); keys.Add("Inventory",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory","I")));
keys.Add("Skills",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills","U"))); keys.Add("Skills",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills","U")));
keys.Add("Attack",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Attack","Space"))); keys.Add("Attack",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Attack","Space")));
keys.Add("Quests",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests","Q")));
keys.Add("ExpHlth",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth","Tab")));
//Sets the text on the buttons //Sets the text on the buttons
//interaction.text = keys["Interact"].ToString(); //interaction.text = keys["Interact"].ToString();
interaction.text = PlayerPrefs.GetString("Interact"); interaction.text = PlayerPrefs.GetString("Interaction");
//skills.text = keys["Settings"].ToString(); //skills.text = keys["Settings"].ToString();
skills.text = PlayerPrefs.GetString("Skills"); skills.text = PlayerPrefs.GetString("Skills");
//settings.text = keys["Inventory"].ToString(); //settings.text = keys["Inventory"].ToString();
@ -50,46 +52,12 @@ public class KeyBindScript : MonoBehaviour
attack.text = PlayerPrefs.GetString("Attack"); attack.text = PlayerPrefs.GetString("Attack");
//inventory.text = keys["Attack"].ToString(); //inventory.text = keys["Attack"].ToString();
inventory.text = PlayerPrefs.GetString("Inventory"); inventory.text = PlayerPrefs.GetString("Inventory");
quests.text = PlayerPrefs.GetString("Quests");
exphlth.text = PlayerPrefs.GetString("ExpHlth");
exphlth.text = PlayerPrefs.GetString("EXP HEALTH");
} }
/* void OnGUI()
// Update is called once per frame
void Update()
{
//Simulates movement and usage of the keys
if (
)
{
//Do a move action
Debug.Log("Up");
}
if (Input.GetKeyDown(keys["Down"]))
{
//Do a move action
Debug.Log("Down");
}
if (Input.GetKeyDown(keys["Left"]))
{
//Do a move action
Debug.Log("Left");
}
if (Input.GetKeyDown(keys["Right"]))
{
//Do a move action
Debug.Log("Right");
}
if (Input.GetKeyDown(keys["Jump"]))
{
//Do a move action
Debug.Log("Jump");
}
}
}*/
void OnGUI()
{ {
if (currentKey != null) //If we have selected a key, that we want to edit if (currentKey != null) //If we have selected a key, that we want to edit
{ {
@ -129,11 +97,32 @@ public class KeyBindScript : MonoBehaviour
foreach (var key in keys) //Runs through the dictionary foreach (var key in keys) //Runs through the dictionary
{ {
PlayerPrefs.SetString(key.Key, key.Value.ToString()); //Saves the keybinds for each key PlayerPrefs.SetString(key.Key, key.Value.ToString()); //Saves the keybinds for each key
Debug.Log(key.Key + " : " + key.Value.ToString());
//Debug.Log(key.Value.ToString());
} }
PlayerPrefs.Save(); PlayerPrefs.Save();
InventoryUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory")); InventoryUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
EquipmentUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory")); EquipmentUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
ChestUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
ShopUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills")); SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
}
public static void SaveKeysOut()
{
InventoryUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
EquipmentUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
ChestUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
ShopUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
PlayerPrefs.Save();
} }
} }

View File

@ -0,0 +1,20 @@
%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: 11500000, guid: 9890013e3eb0ea54b90ab8d093688ac6, type: 3}
m_Name: Ground - FirstLabCave
m_EditorClassIdentifier:
Tiles:
- {fileID: 11400000, guid: d30976c74e1338e43ab2fb37c0f3869f, type: 2}
- {fileID: 11400000, guid: 562aa896af43f854d9a8de005acf3526, type: 2}
- {fileID: 11400000, guid: 7a995c793a6eb774d8221de2a6fdb8fe, type: 2}
- {fileID: 11400000, guid: 3b0bd9f7060361b4a9112187c8887d76, type: 2}
walkable: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 95405e1d97d8a4e4f84c70f2bf03610a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,20 @@
%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: 11500000, guid: 9890013e3eb0ea54b90ab8d093688ac6, type: 3}
m_Name: Ground - SecondLabCave
m_EditorClassIdentifier:
Tiles:
- {fileID: 11400000, guid: d30976c74e1338e43ab2fb37c0f3869f, type: 2}
- {fileID: 11400000, guid: 562aa896af43f854d9a8de005acf3526, type: 2}
- {fileID: 11400000, guid: 7a995c793a6eb774d8221de2a6fdb8fe, type: 2}
- {fileID: 11400000, guid: 3b0bd9f7060361b4a9112187c8887d76, type: 2}
walkable: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e4239a81aa53a50408400f1396f9a1a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -101,6 +101,47 @@ public class Player : MonoBehaviour
ManageLevels(exp); ManageLevels(exp);
//DEFAULT CONTROLS
if (!PlayerPrefs.HasKey("Interaction"))
{
PlayerPrefs.SetString("Interaction","E");
}
if (!PlayerPrefs.HasKey("Attack"))
{
PlayerPrefs.SetString("Attack","Space");
}
if (!PlayerPrefs.HasKey("Skills"))
{
PlayerPrefs.SetString("Skills","U");
}
if (!PlayerPrefs.HasKey("Inventory"))
{
PlayerPrefs.SetString("Inventory","I");
}
if (!PlayerPrefs.HasKey("Settings"))
{
PlayerPrefs.SetString("Settings","Escape");
}
if (!PlayerPrefs.HasKey("Quests"))
{
PlayerPrefs.SetString("Quests","Q");
}
if (PlayerPrefs.HasKey("Quests"))
{
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
}
if (!PlayerPrefs.HasKey("ExpHlth"))
{
PlayerPrefs.SetString("ExpHlth","Tab");
}
if (!PlayerPrefs.HasKey("EXP HEALTH"))
{
PlayerPrefs.SetString("EXP HEALTH","Tab");
}
// --------------------------------------------------------------------
} }
public void GetExp(float expValue) public void GetExp(float expValue)
@ -291,10 +332,10 @@ public class Player : MonoBehaviour
{ {
attackSword = true; attackSword = true;
} }
if (Input.GetKeyDown(KeyCode.LeftShift)) /*if (Input.GetKeyDown(KeyCode.LeftShift))
{ {
attackFist = true; attackFist = true;
} }*/
if (Input.GetKeyDown(KeyCode.X)) if (Input.GetKeyDown(KeyCode.X))
{ {
pickaxeInUse = true; pickaxeInUse = true;

View File

@ -50,6 +50,10 @@ class CounterRespowner : MonoBehaviour
} else if(Counter <= 20 && killedMinions >= 4) } else if(Counter <= 20 && killedMinions >= 4)
{ {
coroutine = SpownWithDelay(3.0f); coroutine = SpownWithDelay(3.0f);
} else
{
Debug.Log(Counter);
coroutine = SpownWithDelay(0.5f);
} }
StartCoroutine(coroutine); StartCoroutine(coroutine);
@ -83,41 +87,17 @@ class CounterRespowner : MonoBehaviour
; ;
// Decide which spowner use // Decide which spowner use
spowner = respownPoints
.ElementAt(UnityEngine.Random.Range(0, respownPoints.Count()))
.transform
.position
;
// Change position GameObject spownerObject = null;
var newPosition = new Vector3(
spowner.x + UnityEngine.Random.Range(-3.8f, 3.8f),
spowner.y + UnityEngine.Random.Range(-3.8f, 3.8f),
10
);
BuildMinion(minion, newPosition); do
}
public void BuildMinion(GameObject minion, Vector3 coord)
{
var sceneGui = GameObject.FindGameObjectWithTag("EnemyCollection");
if (sceneGui == null)
{ {
throw new Exception("GUI not found on scene!!!"); spownerObject = respownPoints
return; .ElementAt(UnityEngine.Random.Range(0, respownPoints.Count()));
} } while (spownerObject.GetComponent<MinionRespowner>().Blocked == true);
var newMinion = Instantiate(minion, coord, Quaternion.identity, sceneGui.transform);
newMinion.name = minion.name;
// newMinion.transform.SetParent(sceneGui.transform);
newMinion.GetComponent<SpriteRenderer>().sortingOrder = 3;
newMinion.AddComponent<RespownTrigger>();
newMinion.GetComponent<RespownTrigger>().SetParentRespowner(gameObject);
// Spawn object
spownerObject.GetComponent<MinionRespowner>().Respown(minion);
} }
} }

View File

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
class MinionRespowner : MonoBehaviour
{
/// <summary>
/// Function to determine if object nad respown object
/// </summary>
public bool Blocked = false;
private void Start()
{
}
private void Update()
{
}
public void Respown(GameObject enemyModel)
{
// Change position
var newPosition = new Vector3(
gameObject.transform.position.x + UnityEngine.Random.Range(-3.8f, 3.8f),
gameObject.transform.position.y + UnityEngine.Random.Range(-3.8f, 3.8f),
10
);
BuildMinion(enemyModel, newPosition);
}
public void BuildMinion(GameObject minion, Vector3 coord)
{
var sceneGui = GameObject.FindGameObjectWithTag("EnemyCollection");
if (sceneGui == null)
{
throw new Exception("GUI not found on scene!!!");
return;
}
var newMinion = Instantiate(minion, coord, Quaternion.identity, sceneGui.transform);
newMinion.name = minion.name;
// newMinion.transform.SetParent(sceneGui.transform);
newMinion.GetComponent<SpriteRenderer>().sortingOrder = 3;
newMinion.AddComponent<RespownTrigger>();
newMinion.GetComponent<RespownTrigger>().SetParentRespowner(GameObject.FindObjectOfType<CounterRespowner>().gameObject);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7571e86bbad71c34e82f55c1d83725fe
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -20,6 +20,11 @@ public class ChestUIManager : UIBaseManager<Chest>
private IEnumerator coroutine; private IEnumerator coroutine;
public void Start()
{
Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
ShopUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
}
public void Awake() public void Awake()
{ {
if (Instance == null) if (Instance == null)

View File

@ -17,6 +17,11 @@ class SkillsUIManager : MonoBehaviour
[SerializeField] public KeyCode keyToOpen; [SerializeField] public KeyCode keyToOpen;
public void Start()
{
keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode),PlayerPrefs.GetString("Skills"));
}
public virtual void Awake() public virtual void Awake()
{ {
if (Instance == null) if (Instance == null)

View File

@ -0,0 +1,612 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// Załozenia na przyszłość
/// - player atakując powinien wysyłać informacje o akcji ataku z wartością obrażeń
/// enemy przymując ją powinien kalkulować szanse uniku / bloku (i odskakiwać w bokj lub do tyłu) albo przyjmować obrazenia
/// WSZĘDZIE ANIMACJA blokuąca inne akcje na czas odtwarzania efektu
/// </summary>
public enum WizardBattleStepsEnum
{
First, // have 100% hp, lasts until the value will be reduced to 7%%
Second, // have 75%% hp, lasts until the value will be reduced to 50%
Third, // have 50%% hp, lasts until the value will be reduced to 25%
Last,
Summoning, // after reducing hp to 75, 50, 25 per cent wizard start to summon minions
Escaping // when player have 25% he starts escape - go to teleport
}
[RequireComponent(typeof(NPC))]
[RequireComponent(typeof(AStarPathfindingAgent))]
class BattleWizard : MonoBehaviour
{
public const string BATTLE_STATE = "BattleState";
public WizardBattleStepsEnum BattleState = WizardBattleStepsEnum.First;
[Header("Health")]
public float defence = 0;
public int maxHealth = 100;
public float currentHealth;
public bool canTakeDamage = true;
public float attackValue = 5;
public float attackingRadius = 6;
[Header("Summoned Minions")]
public GameObject MinionRespowner;
public int SummonedMinionsCounter = 3;
public int KilledMinionsCounter = 0;
public bool IsAfterSummoning = false;
[Header("Step points")]
public bool approaching = false; // mean - we can go closer to Player
[Space]
public int CurrentPoint = 0;
public Transform[] Points;
public Vector3 TargetPosition;
[Space]
[Header("Attacking Logic")]
public bool hit = false;
public bool firstAttack = false;
public float timerDmg = 0f;
public float timeToWaitBeforeNextAttack = 1.0f; // time which npc must wait before he can atack player again
public float timerHit = 0f;
public float timeToWaitBeforeNextHitFromPlayer = 0.55f; // should be moved to player script !!!!
public bool isPanelEnabled = true; // flag about some panel status.... (probably youDied / respown)
private void Start()
{
MinionRespowner.GetComponent<CounterRespowner>().Respown = false;
MinionRespowner.GetComponent<CounterRespowner>().Counter = 0;
currentHealth = maxHealth;
if (HasProggress())
{
BattleState = GetProggress();
switch(BattleState)
{
case WizardBattleStepsEnum.First:
{
// to do nothing to do here
break;
}
case WizardBattleStepsEnum.Second:
{
BattleState = WizardBattleStepsEnum.First; // go one stop earlier to propertly go throught Escaping and Summoning
gameObject.transform.position = Points[0].position;
currentHealth = maxHealth * 0.75f;
SummonedMinionsCounter = 3;
CurrentPoint = 1;
break;
}
case WizardBattleStepsEnum.Third:
{
BattleState = WizardBattleStepsEnum.Second;
gameObject.transform.position = Points[1].position;
currentHealth = maxHealth * 0.50f;
SummonedMinionsCounter = 6;
CurrentPoint = 2;
break;
}
case WizardBattleStepsEnum.Last:
{
BattleState = WizardBattleStepsEnum.Third;
gameObject.transform.position = Points[2].position;
currentHealth = maxHealth * 0.25f;
SummonedMinionsCounter = 12;
CurrentPoint = 3;
break;
}
}
}
else
{
gameObject.GetComponent<NPC>().State = NPCStateEnum.None;
BattleState = WizardBattleStepsEnum.First;
CurrentPoint = 0;
SummonedMinionsCounter = 3; // deffault value at start
}
defecnceCalculate();
speedCalculate();
// control battle proggress
ManageBehaviourScenario();
}
private void Update()
{
if (gameObject.GetComponent<NPC>().State == NPCStateEnum.Walking)
{
var dir = TargetPosition - transform.position;
float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg;
dir.Normalize();
gameObject.GetComponent<Animator>().SetBool("isRunning", new Vector2( dir.x, dir.y) != Vector2.zero);
}
// taking demage by time logic
TakingDamageManagment();
// take action based on npc state
HandleState();
// config battle depending on state
if (IsAfterSummoning)
{
//wait for killing minions by player
if (MinionRespowner.GetComponent<CounterRespowner>().killedMinions >= SummonedMinionsCounter * 3/5f)
{
SummonedMinionsCounter *= 2;
MinionRespowner.GetComponent<CounterRespowner>().killedMinions = 0;
IsAfterSummoning = false;
if ((WizardBattleStepsEnum)GetProggress() == WizardBattleStepsEnum.First)
BattleState = WizardBattleStepsEnum.Second;
else if ((WizardBattleStepsEnum)GetProggress() == WizardBattleStepsEnum.Second)
BattleState = WizardBattleStepsEnum.Third;
else if ((WizardBattleStepsEnum)GetProggress() == WizardBattleStepsEnum.Third)
BattleState = WizardBattleStepsEnum.Last;
approaching = true; // flag whivh tell to go in player direction
canTakeDamage = true;
gameObject.GetComponent<NPC>().State = NPCStateEnum.Walking;
SaveProggress(BattleState);
}
}
}
public void OnTriggerEnter2D(Collider2D collision)
{
// after reaching teleport position remove component
if (collision.gameObject.tag == "SceneTransition")
{
collision.gameObject.GetComponent<DoorBehaviour>().isEnabled = true;
SaveProggress(WizardBattleStepsEnum.First);
Destroy(gameObject);
}
// Hit logic
if (collision.gameObject.tag == "AttackHitbox" || collision.gameObject.tag == "PickaxeHitbox")
{
hit = true;
}
}
public void OnTriggerExit2D(Collider2D collision)
{
// Hit logic
if (collision.gameObject.tag == "AttackHitbox" || collision.gameObject.tag == "PickaxeHitbox")
{
timerDmg = 0f;
hit = false;
}
}
// script controlling battle scenario by listening on change, depending on:
// - Wizard life
// - Wizard state
// - battle state
public void ManageBehaviourScenario()
{
// at first
if (BattleState == WizardBattleStepsEnum.First &&
gameObject.GetComponent<NPC>().State == NPCStateEnum.None)
{
Debug.Log("First");
approaching = true;
gameObject.GetComponent<NPC>().State = NPCStateEnum.Walking; // HandleState make rest - makes sure the wizard walks up to the player and cxhange state to attacking
} else
// detect health status after each taked damage from player (invoked in TakeDamage)
if ((BattleState == WizardBattleStepsEnum.First || BattleState == WizardBattleStepsEnum.Second || BattleState == WizardBattleStepsEnum.Third) &&
(gameObject.GetComponent<NPC>().State & NPCStateEnum.Attacking) > 0)
{
if (IsAfterSummoning == true)
return;
} else
// 1 Change state to pending & block damage taking & go to safe position
if (BattleState == WizardBattleStepsEnum.Escaping)
{
gameObject.GetComponent<AStarPathfindingAgent>().speed = 5f;
canTakeDamage = false;
approaching = false;
if (currentHealth <= maxHealth * 0.10f) // summon before
{
Debug.Log("Wizard HP critical");
TargetPosition = Points[Points.Count() - 1].position;
SummonManagment();
}
else
{
TargetPosition = Points[CurrentPoint].position;
CurrentPoint++;
}
gameObject.GetComponent<NPC>().State = NPCStateEnum.Walking; // go to newxt base point
} else
if (BattleState == WizardBattleStepsEnum.Summoning)
{
if(!IsAfterSummoning)
{
speedCalculate();
SummonManagment();
}
}
}
public void HandleState()
{
switch (gameObject.GetComponent<NPC>().State)
{
case NPCStateEnum.Walking: // to player, to next point, to exit xd
{
WalkingManagment();
break;
}
case NPCStateEnum.Attacking:
{
gameObject.GetComponent<Animator>().SetBool("isRunning", false);
AttackManagment();
break;
}
case NPCStateEnum.Pending:
{
gameObject.GetComponent<Animator>().SetBool("isRunning", false);
BattleState = WizardBattleStepsEnum.Summoning;
ManageBehaviourScenario();
break;
}
default:
{
break;
}
}
}
public void WalkingManagment()
{
StopAllCoroutines();
if(approaching)
{
// when we can go closer to player - we go closer and when we are close enought we start attacking
if (!IsInAttackRadious())
{
gameObject.GetComponent<AStarPathfindingAgent>().FindPath();
StartCoroutine(gameObject.GetComponent<AStarPathfindingAgent>().FollowPath());
}
else
{
timeToWaitBeforeNextAttack = 0; // to allowa to first hit withot waiting
// in this script we set attacking mode
gameObject.GetComponent<NPC>().State = NPCStateEnum.Attacking;
gameObject.GetComponent<AStarPathfindingAgent>().path.Clear(); // if we are able to talgk we dont want go go further player
}
}
else
{
// we summon minions and go to next save point, else we escape
// IMPOSRANT make summoning and walking independent and unbinded in code
// first focus on targetting next step from list
//Debug.Log(Vector2.Distance(transform.position, TargetPosition));
if (Vector2.Distance(transform.position, TargetPosition) > 0.95f) // count value - path finding stop moving them before reachin position well..
{
gameObject.GetComponent<AStarPathfindingAgent>().point = TargetPosition;
gameObject.GetComponent<AStarPathfindingAgent>().FindPoint();
StartCoroutine(gameObject.GetComponent<AStarPathfindingAgent>().FollowPath());
}
else
{
// ------ anim.SetBool("isRunning", false);
gameObject.GetComponent<Animator>().SetBool("isRunning", false);
// set next point for future
gameObject.GetComponent<NPC>().State = NPCStateEnum.Pending; // decide what next
}
}
}
public void SummonManagment()
{
// 2. Spown minions (depending on iteration increase spowned amount
BlockRespowners();
MinionRespowner.GetComponent<CounterRespowner>().Counter = SummonedMinionsCounter;
MinionRespowner.GetComponent<CounterRespowner>().Respown = true;
IsAfterSummoning = true;
Debug.Log("After summoning");
}
#region damage managment
/// <summary>
/// Take damage only once in a time and only when IT IS ALLOWED
/// </summary>
public void TakingDamageManagment()
{
// COPIED FROM Following Enemy scripts
// Taking hit logic
timerHit += Time.deltaTime;
if (hit == true && canTakeDamage)
{
if (timerHit >= timeToWaitBeforeNextHitFromPlayer)
{
TakeDamage(PlayerPrefs.GetFloat("attackValue"));
hit = false;
timerHit = 0f;
TakeKnockback();
}
}
}
private void TakeDamage(float damage)
{
var healthBeforeDamage = currentHealth;
damage = damage - defence;
damage = damage < 0 ? 0 : damage;
Debug.Log("Gamage from player: " + damage + "(defence: " + defence + ")");
currentHealth -= damage;
/* if (gameObject.GetComponent<Enemy>().health <= 0)
{
gameObject.SetActive(false);
gameObject.GetComponent<Enemy>().isKilled = 1;
GameObject.FindGameObjectWithTag("Player").GetComponent<Player>().GetExp(30);
// pass info about killing assigned enemy to mission manager listener
// pass enemy name from script NOT object name (thats allow to have many different objects variantsa with this same aggregate key (private name - not preffab name) )
ConditionManager.Instance.UpdateKillCondition(gameObject.GetComponent<Enemy>().MinionName);
}*/
if (
(healthBeforeDamage > maxHealth * 0.75f && currentHealth <= maxHealth * 0.75f) ||
(healthBeforeDamage > maxHealth * 0.50f && currentHealth <= maxHealth * 0.50f) ||
(healthBeforeDamage > maxHealth * 0.25f && currentHealth <= maxHealth * 0.25f) ||
(healthBeforeDamage > maxHealth * 0.10f && currentHealth <= maxHealth * 0.10f)
){
Debug.Log("escaping");
BattleState = WizardBattleStepsEnum.Escaping;
Debug.Log(BattleState);
// re-calculate after each damage
defecnceCalculate();
speedCalculate();
ManageBehaviourScenario();
}
}
private void TakeKnockback()
{
Rigidbody2D enemy = gameObject.GetComponent<Rigidbody2D>();
Rigidbody2D player = GameObject.FindGameObjectWithTag("Player").GetComponent<Rigidbody2D>();
if (enemy != null)
{
enemy.isKinematic = false;
Vector2 difference = enemy.transform.position - player.transform.position;
difference = difference.normalized * 5; // thrust
enemy.AddForce(difference, ForceMode2D.Impulse);
//StartCoroutine(KnockCo(enemy));
}
}
#endregion
#region attack managment
public void AttackManagment()
{
// if during Attacking mode player GO OUT of the attacking radious
if (!IsInAttackRadious())
{
gameObject.GetComponent<NPC>().State = NPCStateEnum.Walking;
return;
}
// Attack logic
if (timerDmg >= timeToWaitBeforeNextAttack)
{
timerDmg = 0f;
GameObject.FindGameObjectWithTag("Player").GetComponent<Player>().TakeDamage(
attackValue,
isPanelEnabled
);
}
speedCalculate(); // to restore property timeToWaitBeforeNextAttack walue
timerDmg += Time.deltaTime;
}
public bool IsInAttackRadious()
{
if (Vector2.Distance(GameObject.FindGameObjectWithTag("Player").transform.position, transform.position) >= attackingRadius)
return false;
return true;
}
#endregion
// jesli gracz ma "x" pkt siły
// Ze wzgledu na wyniki EXCEL'a zakładajac że
// - gracz ma 4/5 pkt sily (skile + bonus naszyjnika)
// obrona nie moze przekroczyc 3 - 3.2f
public void defecnceCalculate()
{
if (currentHealth > maxHealth * 0.75f)
{
defence = 1.5f;
}else if(currentHealth <= maxHealth * 0.75f && currentHealth > maxHealth * 0.50f)
{
defence = 2.5f;
}
else if (currentHealth <= maxHealth * 0.50f && currentHealth > maxHealth * 0.25f)
{
defence = 3.15f;
} else if (currentHealth <= maxHealth * 0.25f && currentHealth > maxHealth * 0.10f)
{
defence = 4f; // or higher ???
}
}
public void speedCalculate()
{
if (currentHealth > maxHealth * 0.75f)
{
gameObject.GetComponent<AStarPathfindingAgent>().speed = 1f;
timeToWaitBeforeNextAttack = 1f;
}
else if (currentHealth <= maxHealth * 0.75f && currentHealth > maxHealth * 0.50f)
{
gameObject.GetComponent<AStarPathfindingAgent>().speed = 1.15f;
timeToWaitBeforeNextAttack = 0.8f;
}
else if (currentHealth <= maxHealth * 0.50f && currentHealth > maxHealth * 0.25f)
{
gameObject.GetComponent<AStarPathfindingAgent>().speed = 1.30f;
timeToWaitBeforeNextAttack = 0.7f;
}
else if (currentHealth <= maxHealth * 0.25f && currentHealth > maxHealth * 0.10f)
{
gameObject.GetComponent<AStarPathfindingAgent>().speed = 1.45f;
timeToWaitBeforeNextAttack = 0.6f;
}
}
#region Respown minions managments
private void BlockRespowners()
{
ResetRespowners();
if (SummonedMinionsCounter == 3) // use only 1
{
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(1).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(2).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(3).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(4).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(5).GetComponent<MinionRespowner>().Blocked = true;
}
if (SummonedMinionsCounter == 6) // use 2 & 3
{
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(0).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(3).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(4).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(5).GetComponent<MinionRespowner>().Blocked = true;
}
if (SummonedMinionsCounter == 12) // use 2 & 4 & 5
{
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(0).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(1).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(5).GetComponent<MinionRespowner>().Blocked = true;
}
if (SummonedMinionsCounter > 12) // use 4 & 5 & 6
{
SummonedMinionsCounter = 15;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(0).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(1).GetComponent<MinionRespowner>().Blocked = true;
MinionRespowner.GetComponent<CounterRespowner>().respownPoints.ElementAtOrDefault(2).GetComponent<MinionRespowner>().Blocked = true;
}
}
private void ResetRespowners()
{
foreach(var respownPointObject in MinionRespowner.GetComponent<CounterRespowner>().respownPoints)
{
respownPointObject.GetComponent<MinionRespowner>().Blocked = false;
}
}
#endregion
#region proggress API
public void SaveProggress(WizardBattleStepsEnum status)
{
Debug.Log("Save: " + status);
PlayerPrefs.SetInt(SceneManager.GetActiveScene().name + "." + BATTLE_STATE, (int)status);
}
public WizardBattleStepsEnum GetProggress()
{
return (WizardBattleStepsEnum)PlayerPrefs.GetInt(SceneManager.GetActiveScene().name + "." + BATTLE_STATE);
}
public bool HasProggress()
{
return PlayerPrefs.HasKey(SceneManager.GetActiveScene().name + "." + BATTLE_STATE);
}
#endregion
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 85ed5d06f443ff547aeb225e656c0e19
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -29,6 +29,7 @@ public class SaveController : MonoBehaviour
{ {
var player = GameObject.FindGameObjectWithTag("Player"); var player = GameObject.FindGameObjectWithTag("Player");
player.GetComponent<Player>().SaveCheckpoint(); player.GetComponent<Player>().SaveCheckpoint();
} }
public void SaveAccountBalance() public void SaveAccountBalance()
@ -46,7 +47,7 @@ public class SaveController : MonoBehaviour
public void SavePlayerQuests() public void SavePlayerQuests()
{ {
SceneTaskDataManager.Instance.SaveDynamicData(); SceneTaskDataManager.Instance.SaveDynamicData();
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
// right now, we dont need to save dynamic list :D // right now, we dont need to save dynamic list :D
} }

43
Assets/UpdateControls.cs Normal file
View File

@ -0,0 +1,43 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class UpdateControls : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
InventoryUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
EquipmentUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<EquipmentUIManager>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<InventoryUIManager>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<Task>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
ChestUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
ShopUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills"));
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
PlayerPrefs.Save();
}
// Update is called once per frame
void Update()
{
InventoryUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
EquipmentUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<EquipmentUIManager>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<InventoryUIManager>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Inventory"));
UIBaseManager<Task>.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
ChestUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
ShopUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interaction"));
SkillsUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Skills"));
TaskUIManager.Instance.keyToOpen = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Quests"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("EXP HEALTH"));
DisplayExpStatus.keyToExp = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
DisplayHealthStatus.keyToHealth = (KeyCode) System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("ExpHlth"));
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3e405827d28ed5344a3b97ebbae780f3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -599,7 +599,7 @@ PlayerSettings:
webGLTemplate: APPLICATION:Default webGLTemplate: APPLICATION:Default
webGLAnalyzeBuildSize: 0 webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0 webGLUseEmbeddedResources: 0
webGLCompressionFormat: 0 webGLCompressionFormat: 2
webGLWasmArithmeticExceptions: 0 webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1 webGLLinkerTarget: 1
webGLThreadsSupport: 0 webGLThreadsSupport: 0

View File

@ -1,9 +1,9 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # 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 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -11,14 +11,14 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU
{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.Build.0 = Debug|Any CPU {7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.ActiveCfg = Release|Any CPU {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.Build.0 = Release|Any CPU {7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4 serializedVersion: 4
m_ConfigSettings: m_ConfigSettings:
RecentlyUsedScenePath-0: RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
flags: 0 flags: 0
RecentlyUsedScenePath-1: RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
flags: 0 flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b
flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04 value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0 flags: 0
RecentlyUsedScenePath-9: RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
flags: 0 flags: 0
vcSharedLogLevel: vcSharedLogLevel:
value: 0d5e400f0650 value: 0d5e400f0650