Merge branch 'master' into shop

This commit is contained in:
kabix09 2022-12-19 03:43:24 +01:00
commit 43e1d817d7
53 changed files with 268656 additions and 65635 deletions

View File

@ -2,10 +2,8 @@
<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>
<_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories> <CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath>
<_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths> <CscToolExe>unity_csc.bat</CscToolExe>
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
<CodeAnalysisRuleSet></CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -13,8 +11,7 @@
<ProductVersion>10.0.20506</ProductVersion> <ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<ProjectGuid>{e0f48af5-6d3e-b154-523d-8f755dc8e665}</ProjectGuid> <ProjectGuid>{F58AF4E0-3E6D-54B1-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>
@ -30,9 +27,8 @@
<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></NoWarn> <NoWarn>0169</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>
@ -40,9 +36,8 @@
<OutputPath>Temp\bin\Release\</OutputPath> <OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NoConfig>true</NoConfig> <NoConfig>true</NoConfig>
@ -92,6 +87,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Model\DialogueStepModel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Model\DialogueStepModel.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Panel\Slot\InventorySlot.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Panel\Slot\InventorySlot.cs" />
<Compile Include="Assets\Mercenary.cs" /> <Compile Include="Assets\Mercenary.cs" />
<Compile Include="Assets\DisplayExpStatus.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Shared\PrefabAssetModelData.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Shared\PrefabAssetModelData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\UI\MainMenu\Continue.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\UI\MainMenu\Continue.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\ChestTypeEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\ChestTypeEnum.cs" />
@ -113,6 +109,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Models\Chest\ChestPrefabAssetData.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Chest\ChestPrefabAssetData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Item\ItemData.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Item\ItemData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Panel\Slot\ItemSlot.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Panel\Slot\ItemSlot.cs" />
<Compile Include="Assets\healthText.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItem.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItem.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\Panel\WarehousePanel\WarehousePanelController.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\Panel\WarehousePanel\WarehousePanelController.cs" />
<Compile Include="Assets\Scripts\PlayerPosition.cs" /> <Compile Include="Assets\Scripts\PlayerPosition.cs" />
@ -126,10 +123,12 @@
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UISlotPanelManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UISlotPanelManager.cs" />
<Compile Include="Assets\Scripts\CamerFollow.cs" /> <Compile Include="Assets\Scripts\CamerFollow.cs" />
<Compile Include="Assets\CloseIfQuestPanel.cs" /> <Compile Include="Assets\CloseIfQuestPanel.cs" />
<Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCFollowing.cs" />
<Compile Include="Assets\TreeParticleEffect.cs" /> <Compile Include="Assets\TreeParticleEffect.cs" />
<Compile Include="Assets\SaveMusicSettings.cs" /> <Compile Include="Assets\SaveMusicSettings.cs" />
<Compile Include="Assets\_\Stuff\GridPathfinding\PathRoute.cs" /> <Compile Include="Assets\_\Stuff\GridPathfinding\PathRoute.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\MissionStepStatusEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\MissionStepStatusEnum.cs" />
<Compile Include="Assets\DisplayHealthStatus.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\EquipmentTypeEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\EquipmentTypeEnum.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UIBaseManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\UIBaseManager.cs" />
<Compile Include="Assets\Scripts\ProceduralGeneration\TileMapGenerator.cs" /> <Compile Include="Assets\Scripts\ProceduralGeneration\TileMapGenerator.cs" />
@ -150,6 +149,7 @@
<Compile Include="Assets\Scripts\LevelBar.cs" /> <Compile Include="Assets\Scripts\LevelBar.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\Loader\DialoguePanelsPrefabsLoader.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\Loader\DialoguePanelsPrefabsLoader.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\Factory\PanelFactory.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\Factory\PanelFactory.cs" />
<Compile Include="Assets\Scripts\Objects\Letter\PrologueLetterManager.cs" />
<Compile Include="Assets\Scripts\SaveSoundSettings.cs" /> <Compile Include="Assets\Scripts\SaveSoundSettings.cs" />
<Compile Include="Assets\Scripts\MenuGUI.cs" /> <Compile Include="Assets\Scripts\MenuGUI.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\IPanel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\IPanel.cs" />
@ -163,8 +163,10 @@
<Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItemPrefabAssetData.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItemPrefabAssetData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Task\Task.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Task\Task.cs" />
<Compile Include="Assets\TranslateText.cs" /> <Compile Include="Assets\TranslateText.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\NPCStateEnum.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\Buildable\SceneObjectBuilderInterface.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\Buildable\SceneObjectBuilderInterface.cs" />
<Compile Include="Assets\Scripts\SceneManager\Teleports\Gateway.cs" /> <Compile Include="Assets\Scripts\SceneManager\Teleports\Gateway.cs" />
<Compile Include="Assets\DamageDealingPlant.cs" />
<Compile Include="Assets\Scripts\FloatValue.cs" /> <Compile Include="Assets\Scripts\FloatValue.cs" />
<Compile Include="Assets\_\Stuff\GridPathfinding\LastMoveTo.cs" /> <Compile Include="Assets\_\Stuff\GridPathfinding\LastMoveTo.cs" />
<Compile Include="Assets\Scripts\SceneManager\SaveItem\SaveEquitableItemSystem.cs" /> <Compile Include="Assets\Scripts\SceneManager\SaveItem\SaveEquitableItemSystem.cs" />
@ -193,6 +195,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\Panel\SceneBaseDataLoader.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\Panel\SceneBaseDataLoader.cs" />
<Compile Include="Assets\Scripts\HealthBar.cs" /> <Compile Include="Assets\Scripts\HealthBar.cs" />
<Compile Include="Assets\Scripts\Pathfinding\Node.cs" /> <Compile Include="Assets\Scripts\Pathfinding\Node.cs" />
<Compile Include="Assets\ManageExpBar.cs" />
<Compile Include="Assets\Scripts\Pathfinding\Pathfinding.cs" /> <Compile Include="Assets\Scripts\Pathfinding\Pathfinding.cs" />
<Compile Include="Assets\Scripts\Item\PickableController.cs" /> <Compile Include="Assets\Scripts\Item\PickableController.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Chest\SceneChestBuilder.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Chest\SceneChestBuilder.cs" />
@ -206,11 +209,13 @@
<Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItemPrefabAsset.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Models\Item\EquippableItem\EquippableItemPrefabAsset.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Model\MissionStepModel.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Model\MissionStepModel.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\Domain\Enum\SceneElementTypeEnum.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\SceneElementTypeEnum.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Panel\Chest\SceneChestDataManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Panel\Chest\SceneChestDataManager.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\SaveSystem\SaveModelSystem.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\SaveSystem\SaveModelSystem.cs" />
<Compile Include="Assets\TakingDamage.cs" /> <Compile Include="Assets\TakingDamage.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Panel\Chest\ChestDataListManager.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Panel\Chest\ChestDataListManager.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Story\WizardHouse\ResetPlayer.cs" />
<Compile Include="Assets\StartOnEnter.cs" /> <Compile Include="Assets\StartOnEnter.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\Panel\Draggable\DraggablePanelController.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Manager\UI\Panel\Draggable\DraggablePanelController.cs" />
<Compile Include="Assets\_\Stuff\GridPathfinding\BinaryTree.cs" /> <Compile Include="Assets\_\Stuff\GridPathfinding\BinaryTree.cs" />
@ -226,7 +231,6 @@
<Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCDialogue.cs" /> <Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCDialogue.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\UI\Panel\TaskPanelController.cs" /> <Compile Include="Assets\Scripts\REFACTORING\Application\UI\Panel\TaskPanelController.cs" />
<Compile Include="Assets\Scripts\Player.cs" /> <Compile Include="Assets\Scripts\Player.cs" />
<Compile Include="Assets\Scripts\NPCs&apos; Scripts\WizardScripts\Wizard.cs" />
<None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" /> <None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" /> <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" /> <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" />
@ -816,94 +820,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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEngineBridge.001"> <Reference Include="Unity.InternalAPIEngineBridge.001">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VSCode.Editor"> <Reference Include="Unity.VSCode.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.PixelPerfect"> <Reference Include="Unity.2D.PixelPerfect">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Tilemap.Editor"> <Reference Include="Unity.2D.Tilemap.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="PsdPlugin"> <Reference Include="PsdPlugin">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro.Editor"> <Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.VisualStudio.Editor"> <Reference Include="Unity.VisualStudio.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline"> <Reference Include="Unity.Timeline">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro"> <Reference Include="Unity.TextMeshPro">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Editor"> <Reference Include="Unity.2D.IK.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.InternalAPIEditorBridge.001"> <Reference Include="Unity.InternalAPIEditorBridge.001">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.UI"> <Reference Include="UnityEditor.UI">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.PlasticSCM.Editor"> <Reference Include="Unity.PlasticSCM.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Rider.Editor"> <Reference Include="Unity.Rider.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.UI"> <Reference Include="UnityEngine.UI">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics"> <Reference Include="Unity.Mathematics">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.IK.Runtime"> <Reference Include="Unity.2D.IK.Runtime">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline.Editor"> <Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Mathematics.Editor"> <Reference Include="Unity.Mathematics.Editor">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.2D.Common.Runtime"> <Reference Include="Unity.2D.Common.Runtime">
<HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/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:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath> <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -0,0 +1,75 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DamageDealingPlant : MonoBehaviour
{
public bool inRange = false;
public float timerDmg = 0f;
public float waitTime = 1.0f;
public bool firstAttack = false;
public float baseAttack = 1.0f;
public bool isPanelEnabled = true;
public GameObject other;
void Start()
{
other = GameObject.FindWithTag("Player");
}
void OnTriggerEnter2D(Collider2D collision)
{
///For attacking player
if (collision.tag == "PlayerHitbox")
{
inRange = true;
firstAttack = false;
}
}
void OnTriggerStay2D(Collider2D collision)
{
///For attacking player
if (collision.tag == "PlayerHitbox")
{
inRange = true;
}
}
void OnTriggerExit2D(Collider2D collision)
{
///For attacking player
inRange = false;
timerDmg = 0f;
}
// Update is called once per frame
void Update()
{
if (inRange == true)
{
if (firstAttack == false)
{
if (timerDmg >= 0.15f)
{
firstAttack = true;
other.GetComponent<Player>().TakeDamage(baseAttack, isPanelEnabled);
timerDmg = 0f;
}
}
if (timerDmg >= waitTime)
{
timerDmg = 0f;
other.GetComponent<Player>().TakeDamage(baseAttack, isPanelEnabled);
}
timerDmg += Time.deltaTime;
}
}
}

View File

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

View File

@ -0,0 +1,24 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DisplayExpStatus : MonoBehaviour
{
public GameObject expText;
// Update is called once per frame
void Update()
{
if (Input.GetKeyDown(KeyCode.Tab))
{
expText.SetActive(true);
}
if (Input.GetKeyUp(KeyCode.Tab))
{
expText.SetActive(false);
}
}
}

View File

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

View File

@ -0,0 +1,26 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class DisplayHealthStatus : MonoBehaviour
{
public GameObject healthText;
// Update is called once per frame
void Update()
{
if (Input.GetKeyDown(KeyCode.Tab))
{
healthText.SetActive(true);
}
if (Input.GetKeyUp(KeyCode.Tab))
{
healthText.SetActive(false);
}
}
}

View File

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

18
Assets/ManageExpBar.cs Normal file
View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ManageExpBar : MonoBehaviour
{
public GameObject levelNumber;
void OnEnable()
{
levelNumber.SetActive(false);
}
void OnDisable()
{
levelNumber.SetActive(true);
}
}

View File

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

View File

@ -186,31 +186,31 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3} m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
moveSpeed: 0 moveSpeed: 2
enemyName: enemyName:
maxHealth: {fileID: 0} maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 0 health: 0
baseAttack: 0 baseAttack: 1
target: {fileID: 0} target: {fileID: 4869648843286970699, guid: 4cb7163e44af59f4c9350005c199db3c, type: 3}
chaseRadius: 0 chaseRadius: 6
attackRadius: 0 attackRadius: 1
homePosition: {fileID: 0} homePosition: {fileID: 0}
speed: 0 speed: 2
shouldRotate: 0 shouldRotate: 0
dir: {x: 0, y: 0, z: 0} dir: {x: 0, y: 0, z: 0}
whatisplayer: whatisplayer:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
roundingDistance: 0 roundingDistance: 0
anim: {fileID: 0} anim: {fileID: 4006076606190978598}
other: {fileID: 0} other: {fileID: 0}
inRange: 0 inRange: 0
hit: 0 hit: 0
player: {fileID: 0} player: {fileID: 4869648843286970700, guid: 4cb7163e44af59f4c9350005c199db3c, type: 3}
thrust: 0 thrust: 0
knockTime: 0 knockTime: 0
isKilled: 0 isKilled: 0
isKilled2: 0 isKilled2: 0
isPanelEnabled: 1 isPanelEnabled: 1
expValue: 0 expValue: 2
agent: {fileID: 0} agent: {fileID: -5618304694998678869}

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: eccb9cf12a3487a42b268c1a8da1e19c
TextureImporter:
internalIDToNameTable:
- first:
213: -8021673700567968874
second: inn1_0
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: 0
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: 2
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: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: inn1_0
rect:
serializedVersion: 2
x: 2
y: 1
width: 14
height: 15
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6939d8d154a4da090800000000000000
internalID: -8021673700567968874
vertices: []
indices:
edges: []
weights: []
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: 13 KiB

View File

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: dd8cf2409d325924f8bf9b03e4f3331a
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: 0
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: 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: 2
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: 2
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: 13 KiB

View File

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 31700b8972dcb2b47820d7216e84c540
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: 0
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: 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: 2
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: 2
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: 21 KiB

View File

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 92a4ea85a39ad844eb42e94fdc5827e2
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: 0
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: 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: 2
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: 2
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: 12 KiB

View File

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: f549c39d1b4c00444a61b4aa50784192
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: 0
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: 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: 2
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: 2
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: 13 KiB

View File

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 1d7f25758e40cb748a5748669830feb4
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: 0
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: 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: 2
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: 2
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: 744 B

View File

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: b9648a6f5c3da3c4f9f144c8e7aa6d5c
TextureImporter:
internalIDToNameTable:
- first:
213: -6265031851550064424
second: 318066439_529903472531846_3737329213360468357_n_0
- first:
213: -2961633206104660032
second: 318066439_529903472531846_3737329213360468357_n_1
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: 0
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: 2
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: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: 318066439_529903472531846_3737329213360468357_n_0
rect:
serializedVersion: 2
x: 0
y: 16
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: 8d0c9dd79b22e09a0800000000000000
internalID: -6265031851550064424
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: 318066439_529903472531846_3737329213360468357_n_1
rect:
serializedVersion: 2
x: 16
y: 16
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: 0c7612b5a4a26e6d0800000000000000
internalID: -2961633206104660032
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,7 +1,10 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4ae08c8cbf942114184485fa0e0ce7ea guid: 4ae08c8cbf942114184485fa0e0ce7ea
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable:
- first:
213: 4166373824455199591
second: BigTree-4_0
externalObjects: {} externalObjects: {}
serializedVersion: 11 serializedVersion: 11
mipmaps: mipmaps:
@ -41,7 +44,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 1 spriteMode: 2
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@ -89,7 +92,28 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites:
- serializedVersion: 2
name: BigTree-4_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 92
height: 73
alignment: 1
pivot: {x: 0, y: 1}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 76b43204beee1d930800000000000000
internalID: 4166373824455199591
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []

View File

@ -32,7 +32,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 1 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 1
@ -46,7 +46,7 @@ TextureImporter:
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
@ -68,7 +68,19 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 2
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: 2
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 82ce5bf2f2f272c43b47777bf3d879e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -108749,6 +108749,7 @@ GameObject:
- component: {fileID: 858875760} - component: {fileID: 858875760}
- component: {fileID: 858875762} - component: {fileID: 858875762}
- component: {fileID: 858875761} - component: {fileID: 858875761}
- component: {fileID: 858875763}
m_Layer: 5 m_Layer: 5
m_Name: Level Bar m_Name: Level Bar
m_TagString: Untagged m_TagString: Untagged
@ -108771,6 +108772,7 @@ RectTransform:
- {fileID: 344424549} - {fileID: 344424549}
- {fileID: 2127378288} - {fileID: 2127378288}
- {fileID: 8480983} - {fileID: 8480983}
- {fileID: 1355509361}
m_Father: {fileID: 1866620309} m_Father: {fileID: 1866620309}
m_RootOrder: 12 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -108794,6 +108796,9 @@ MonoBehaviour:
slider: {fileID: 858875762} slider: {fileID: 858875762}
maxExp: 0 maxExp: 0
exp: 0 exp: 0
maxExpString:
expString:
displayText: {fileID: 1355509363}
--- !u!114 &858875762 --- !u!114 &858875762
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -108845,6 +108850,19 @@ MonoBehaviour:
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &858875763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858875759}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05516c4d688c3c14f97aa79ae39828bd, type: 3}
m_Name:
m_EditorClassIdentifier:
expText: {fileID: 1355509360}
--- !u!1 &865356172 --- !u!1 &865356172
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -123105,6 +123123,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1261810047} m_GameObject: {fileID: 1261810047}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1266023184
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1266023185}
- component: {fileID: 1266023187}
- component: {fileID: 1266023186}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1266023185
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1266023184}
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_Children: []
m_Father: {fileID: 1677041282}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1266023186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1266023184}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: f00af03777ec0764c9988b7276259e03, type: 2}
m_FontSize: 0
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!222 &1266023187
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1266023184}
m_CullTransparentMesh: 1
--- !u!1 &1267427583 stripped --- !u!1 &1267427583 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 5245844912008955764, guid: bb5308fba8936aa479d242e38a056110, type: 3} m_CorrespondingSourceObject: {fileID: 5245844912008955764, guid: bb5308fba8936aa479d242e38a056110, type: 3}
@ -187825,6 +187922,99 @@ RectTransform:
m_AnchoredPosition: {x: 94.4, y: 0} m_AnchoredPosition: {x: 94.4, y: 0}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1355509360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1355509361}
- component: {fileID: 1355509364}
- component: {fileID: 1355509363}
- component: {fileID: 1355509362}
m_Layer: 5
m_Name: expText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1355509361
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355509360}
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_Children: []
m_Father: {fileID: 858875760}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1355509362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355509360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 231253ef9edb84948a1defaa79c31079, type: 3}
m_Name:
m_EditorClassIdentifier:
levelNumber: {fileID: 8480982}
--- !u!114 &1355509363
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355509360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: f00af03777ec0764c9988b7276259e03, type: 2}
m_FontSize: 0
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!222 &1355509364
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355509360}
m_CullTransparentMesh: 1
--- !u!1 &1379407233 --- !u!1 &1379407233
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -221082,6 +221272,7 @@ GameObject:
- component: {fileID: 1677041282} - component: {fileID: 1677041282}
- component: {fileID: 1677041284} - component: {fileID: 1677041284}
- component: {fileID: 1677041283} - component: {fileID: 1677041283}
- component: {fileID: 1677041285}
m_Layer: 5 m_Layer: 5
m_Name: Health Bar m_Name: Health Bar
m_TagString: Untagged m_TagString: Untagged
@ -221103,6 +221294,7 @@ RectTransform:
- {fileID: 304730968} - {fileID: 304730968}
- {fileID: 477634855} - {fileID: 477634855}
- {fileID: 1664676692} - {fileID: 1664676692}
- {fileID: 1266023185}
m_Father: {fileID: 1866620309} m_Father: {fileID: 1866620309}
m_RootOrder: 11 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -221126,6 +221318,10 @@ MonoBehaviour:
slider: {fileID: 1677041284} slider: {fileID: 1677041284}
maxHealth: 0 maxHealth: 0
health: 0 health: 0
displayText: {fileID: 1266023186}
currentHealth: 0
maxHealthString:
currentHealthString:
--- !u!114 &1677041284 --- !u!114 &1677041284
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -221177,6 +221373,19 @@ MonoBehaviour:
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &1677041285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677041281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b56dee52b87a0224dbc8ff52ed83a5a3, type: 3}
m_Name:
m_EditorClassIdentifier:
healthText: {fileID: 1266023184}
--- !u!1 &1683754329 --- !u!1 &1683754329
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -226451,6 +226660,10 @@ MonoBehaviour:
slider: {fileID: 1738591104} slider: {fileID: 1738591104}
maxHealth: 0 maxHealth: 0
health: 0 health: 0
displayText: {fileID: 0}
currentHealth: 0
maxHealthString:
currentHealthString:
--- !u!114 &1738591104 --- !u!114 &1738591104
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -252,6 +252,7 @@ GameObject:
- component: {fileID: 1177818051} - component: {fileID: 1177818051}
- component: {fileID: 1177818049} - component: {fileID: 1177818049}
- component: {fileID: 1177818050} - component: {fileID: 1177818050}
- component: {fileID: 1177818052}
m_Layer: 0 m_Layer: 0
m_Name: Walls m_Name: Walls
m_TagString: Untagged m_TagString: Untagged
@ -359,6 +360,22 @@ Transform:
m_Father: {fileID: 1796128697} m_Father: {fileID: 1796128697}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!19719996 &1177818052
TilemapCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1177818048}
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}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!1 &1796128694 --- !u!1 &1796128694
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,11 @@ public class HealthBar : MonoBehaviour
public float maxHealth; public float maxHealth;
public float health; public float health;
public Text displayText;
public float currentHealth;
public string maxHealthString;
public string currentHealthString;
public void SetMaxHealth(float health) public void SetMaxHealth(float health)
{ {
@ -27,6 +32,11 @@ public class HealthBar : MonoBehaviour
health = PlayerPrefs.GetFloat("health"); health = PlayerPrefs.GetFloat("health");
slider.maxValue = maxHealth; slider.maxValue = maxHealth;
slider.value = health; slider.value = health;
currentHealth = PlayerPrefs.GetFloat("health");
maxHealthString = maxHealth.ToString();
currentHealthString = currentHealth.ToString();
displayText.text = currentHealthString + "/" + maxHealthString;
//SetExp(exp); //SetExp(exp);
} }
} }

View File

@ -8,6 +8,9 @@ public class LevelBar : MonoBehaviour
public Slider slider; public Slider slider;
public float maxExp; public float maxExp;
public float exp; public float exp;
public string maxExpString;
public string expString;
public Text displayText;
public void SetStartExp(float exp) public void SetStartExp(float exp)
{ {
@ -22,6 +25,11 @@ public class LevelBar : MonoBehaviour
exp = PlayerPrefs.GetFloat("exp"); exp = PlayerPrefs.GetFloat("exp");
slider.maxValue = maxExp; slider.maxValue = maxExp;
slider.value = exp; slider.value = exp;
maxExpString = maxExp.ToString();
expString = exp.ToString();
displayText.text = expString + "/" + maxExpString;
//SetExp(exp); //SetExp(exp);
} }

View File

@ -38,6 +38,7 @@ public class AStarPathfindingAgent : MonoBehaviour
public void FindPath() public void FindPath()
{ {
Pathfinder.FindPath(transform.position,Pathfinder.Player.position, this); Pathfinder.FindPath(transform.position,Pathfinder.Player.position, this);
} }
public IEnumerator FollowPath() public IEnumerator FollowPath()
@ -58,7 +59,8 @@ public class AStarPathfindingAgent : MonoBehaviour
while (true) while (true)
{ {
currentWorldPosition = transform.position; currentWorldPosition = transform.position;
if (transform.position == currentWaypoint.worldPosition) //if (transform.position == currentWaypoint.worldPosition)
if (Vector3.Distance(transform.position, currentWaypoint.worldPosition)<0.01f)
{ {
targetIndex++; targetIndex++;
bool reachedPosition = targetIndex >= path.Count; bool reachedPosition = targetIndex >= path.Count;
@ -81,6 +83,7 @@ public class AStarPathfindingAgent : MonoBehaviour
myAnim.SetBool("Left", false); myAnim.SetBool("Left", false);
} }
transform.position = Vector3.MoveTowards(current, target, speed * Time.deltaTime); transform.position = Vector3.MoveTowards(current, target, speed * Time.deltaTime);
Debug.Log(current + "target:" + target);
yield return null; yield return null;
} }
} }

View File

@ -15,7 +15,7 @@ public class NodeMap : MonoBehaviour
public Tilemap tilemap; public Tilemap tilemap;
// Start is called before the first frame update // Start is called before the first frame update
void Awake() void Start()
{ {
DataFromTiles = new Dictionary<TileBase, TileData>(); DataFromTiles = new Dictionary<TileBase, TileData>();
foreach (var tileData in TileDatas) foreach (var tileData in TileDatas)
@ -118,7 +118,7 @@ public class NodeMap : MonoBehaviour
public Vector3 GetWorldPosition(Vector2Int position) public Vector3 GetWorldPosition(Vector2Int position)
{ {
Vector3 worldBottomLeft = transform.position - (Vector3.right * mapSize.x / 2) - (Vector3.up * (mapSize.y/ 2)); Vector3 worldBottomLeft = transform.position - (Vector3.right * (mapSize.x / 2)) - (Vector3.up * (mapSize.y / 2));
Vector3 worldPoint = worldBottomLeft + (Vector3.right * position.x) + (Vector3.up * position.y); Vector3 worldPoint = worldBottomLeft + (Vector3.right * position.x) + (Vector3.up * position.y);
Vector3 cellSizeOffset = new Vector3(cellSize / 2, cellSize / 2, 0); Vector3 cellSizeOffset = new Vector3(cellSize / 2, cellSize / 2, 0);
return worldPoint * cellSize + cellSizeOffset; return worldPoint * cellSize + cellSizeOffset;

View File

@ -37,5 +37,4 @@ MonoBehaviour:
- {fileID: 11400000, guid: 4f93b992f96f0fe448df379f0b2d3565, type: 2} - {fileID: 11400000, guid: 4f93b992f96f0fe448df379f0b2d3565, type: 2}
- {fileID: 11400000, guid: 00611fa507c2a2d478a9e57097e8b16d, type: 2} - {fileID: 11400000, guid: 00611fa507c2a2d478a9e57097e8b16d, type: 2}
- {fileID: 11400000, guid: 9596769ea6df4414696f628c2fc44ca8, type: 2} - {fileID: 11400000, guid: 9596769ea6df4414696f628c2fc44ca8, type: 2}
- {fileID: 11400000, guid: 9596769ea6df4414696f628c2fc44ca8, type: 2}
walkable: 1 walkable: 1

View File

@ -1,9 +1,11 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GUI_Scripts.ProceduralGeneration; using GUI_Scripts.ProceduralGeneration;
using UnityEngine; using UnityEngine;
using UnityEngine.Tilemaps; using UnityEngine.Tilemaps;
using Random = UnityEngine.Random;
public class TileMapGenerator : MonoBehaviour public class TileMapGenerator : MonoBehaviour
{ {
@ -13,7 +15,16 @@ public class TileMapGenerator : MonoBehaviour
public Tile ground1, wall1; public Tile ground1, wall1;
public Graph graph; public Graph graph;
void Start() private void Start()
{
while (!Generate())
{
}
}
bool Generate()
{ {
Map map = new Map(new Vector2Int(100, 100)); Map map = new Map(new Vector2Int(100, 100));
List<FloodFill> fillers = new List<FloodFill>(); List<FloodFill> fillers = new List<FloodFill>();
@ -53,6 +64,11 @@ public class TileMapGenerator : MonoBehaviour
} }
if (graph.graphNodes.Count > count * 0.8)
{
return false;
}
foreach (var filler in fillers) foreach (var filler in fillers)
{ {
int id = filler.id; int id = filler.id;
@ -65,16 +81,19 @@ public class TileMapGenerator : MonoBehaviour
} }
else if (id == 2) else if (id == 2)
{ {
ground.SetTile(new Vector3Int(pos.x,pos.y,0), wall1); walls.SetTile(new Vector3Int(pos.x,pos.y,0), wall1);
} }
} }
} }
GraphNode playerPosStart = graph.graphNodes[Random.Range(0, graph.graphNodes.Count)]; GraphNode playerPosStart = graph.graphNodes[Random.Range(0, graph.graphNodes.Count)];
Vector2Int startPos = playerPosStart.positions.ElementAt(Random.Range(0, playerPosStart.positions.Count)); Vector2Int startPos = playerPosStart.positions.ElementAt(Random.Range(0, playerPosStart.positions.Count));
Debug.Log(startPos); Debug.Log(startPos);
return true;
} }
// Update is called once per frame // Update is called once per frame

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 429e6ec48b6b6cd4c93c3b8cb6bba0d6 guid: c90d75e9bd47b6d40898d869c615efcf
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: bd4cef05b2907f4449fc832dfe3140e5 guid: f33c17aacddc33c458a499b3af60995c
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 97fdd6676eec8fe4a9ae7f14adcb6366 guid: e54b4b7aad48d1a4cb5bb17f73048fa7
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

View File

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: 7d0cf6fea35d64547bb569a8e6ed02fe
TextureImporter:
internalIDToNameTable:
- first:
213: -1404353606913837428
second: thorn_bush2_0
- first:
213: -3291741553057942754
second: thorn_bush2_1
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: 0
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: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: thorn_bush2_0
rect:
serializedVersion: 2
x: 0
y: 16
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: c86bcd8c5dbb28ce0800000000000000
internalID: -1404353606913837428
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: thorn_bush2_1
rect:
serializedVersion: 2
x: 16
y: 16
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: e13b6957f726152d0800000000000000
internalID: -3291741553057942754
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

8
Assets/healthText.cs Normal file
View File

@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class healthText : MonoBehaviour
{
}

11
Assets/healthText.cs.meta Normal file
View File

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

View File

@ -41,4 +41,7 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Cementary.unity path: Assets/Scenes/Cementary.unity
guid: f91e2d00a3cb35a498c26fb5ee724004 guid: f91e2d00a3cb35a498c26fb5ee724004
- enabled: 1
path: Assets/Scenes/FirstVillage.unity
guid: d09d8f73d205f2c4b84728e6fe6c2839
m_configObjects: {} m_configObjects: {}

View File

@ -1,7 +1,7 @@
 
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", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -9,10 +9,10 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU
{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -6,32 +6,35 @@ EditorUserSettings:
serializedVersion: 4 serializedVersion: 4
m_ConfigSettings: m_ConfigSettings:
RecentlyUsedScenePath-0: RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b
flags: 0 flags: 0
RecentlyUsedScenePath-4: RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
flags: 0 flags: 0
RecentlyUsedScenePath-5: RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 value: 22424703114646680e0b0227036c7b0518101d252266333e243d04
flags: 0 flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
flags: 0
RecentlyUsedScenePath-6: RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
flags: 0 flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
flags: 0 flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
flags: 0
vcSharedLogLevel: vcSharedLogLevel:
value: 0d5e400f0650 value: 0d5e400f0650
flags: 0 flags: 0