Added fist attack animation
This commit is contained in:
parent
8f199ae953
commit
0a07120b68
@ -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>{2a01b88a-fe76-747c-0b76-b5df201ede33}</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>
|
||||||
@ -51,7 +56,6 @@
|
|||||||
<Compile Include="Assets\Scripts\SettingsButton.cs" />
|
<Compile Include="Assets\Scripts\SettingsButton.cs" />
|
||||||
<Compile Include="Assets\Scripts\UI\ISlot.cs" />
|
<Compile Include="Assets\Scripts\UI\ISlot.cs" />
|
||||||
<Compile Include="Assets\Scripts\Enemies' Scprits\Enemy.cs" />
|
<Compile Include="Assets\Scripts\Enemies' Scprits\Enemy.cs" />
|
||||||
<Compile Include="Assets\closePossibleButtonInfo.cs" />
|
|
||||||
<Compile Include="Assets\Scripts\Inventory\InventorySlot.cs" />
|
<Compile Include="Assets\Scripts\Inventory\InventorySlot.cs" />
|
||||||
<Compile Include="Assets\Scripts\Task\TaskPanelController.cs" />
|
<Compile Include="Assets\Scripts\Task\TaskPanelController.cs" />
|
||||||
<Compile Include="Assets\Scripts\Task\TaskManager.cs" />
|
<Compile Include="Assets\Scripts\Task\TaskManager.cs" />
|
||||||
@ -66,14 +70,12 @@
|
|||||||
<Compile Include="Assets\Scripts\PlayerPosition.cs" />
|
<Compile Include="Assets\Scripts\PlayerPosition.cs" />
|
||||||
<Compile Include="Assets\Scripts\Chest\ChestSlot.cs" />
|
<Compile Include="Assets\Scripts\Chest\ChestSlot.cs" />
|
||||||
<Compile Include="Assets\Scripts\CamerFollow.cs" />
|
<Compile Include="Assets\Scripts\CamerFollow.cs" />
|
||||||
<Compile Include="Assets\CloseIfQuestPanel.cs" />
|
|
||||||
<Compile Include="Assets\TreeParticleEffect.cs" />
|
<Compile Include="Assets\TreeParticleEffect.cs" />
|
||||||
<Compile Include="Assets\SaveMusicSettings.cs" />
|
<Compile Include="Assets\SaveMusicSettings.cs" />
|
||||||
<Compile Include="Assets\Scripts\Equipment\EquipmentSlot.cs" />
|
<Compile Include="Assets\Scripts\Equipment\EquipmentSlot.cs" />
|
||||||
<Compile Include="Assets\Scripts\DealDamage.cs" />
|
<Compile Include="Assets\Scripts\DealDamage.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\NPCs' Scripts\NPCQuest.cs" />
|
|
||||||
<Compile Include="Assets\Scripts\Task\Task.cs" />
|
<Compile Include="Assets\Scripts\Task\Task.cs" />
|
||||||
<Compile Include="Assets\Scripts\FloatValue.cs" />
|
<Compile Include="Assets\Scripts\FloatValue.cs" />
|
||||||
<Compile Include="Assets\Scripts\Item\EquippableItem.cs" />
|
<Compile Include="Assets\Scripts\Item\EquippableItem.cs" />
|
||||||
@ -83,7 +85,6 @@
|
|||||||
<Compile Include="Assets\Scripts\UI\BasePanelController.cs" />
|
<Compile Include="Assets\Scripts\UI\BasePanelController.cs" />
|
||||||
<Compile Include="Assets\Scripts\Equipment\EquipmentManager.cs" />
|
<Compile Include="Assets\Scripts\Equipment\EquipmentManager.cs" />
|
||||||
<Compile Include="Assets\ParticleDisable.cs" />
|
<Compile Include="Assets\ParticleDisable.cs" />
|
||||||
<Compile Include="Assets\NPCType.cs" />
|
|
||||||
<Compile Include="Assets\Scripts\Enemies' Scprits\FollowingEnemy.cs" />
|
<Compile Include="Assets\Scripts\Enemies' Scprits\FollowingEnemy.cs" />
|
||||||
<Compile Include="Assets\Scripts\HealthBar.cs" />
|
<Compile Include="Assets\Scripts\HealthBar.cs" />
|
||||||
<Compile Include="Assets\Scripts\Item\PickableController.cs" />
|
<Compile Include="Assets\Scripts\Item\PickableController.cs" />
|
||||||
@ -100,6 +101,10 @@
|
|||||||
<Compile Include="Assets\Scripts\SaveController.cs" />
|
<Compile Include="Assets\Scripts\SaveController.cs" />
|
||||||
<Compile Include="Assets\Scripts\NPCs' Scripts\NPCDialogue.cs" />
|
<Compile Include="Assets\Scripts\NPCs' Scripts\NPCDialogue.cs" />
|
||||||
<Compile Include="Assets\Scripts\Player.cs" />
|
<Compile Include="Assets\Scripts\Player.cs" />
|
||||||
|
<Compile Include="Assets\NPCType.cs" />
|
||||||
|
<Compile Include="Assets\closePossibleButtonInfo.cs" />
|
||||||
|
<Compile Include="Assets\Scripts\NPCs' Scripts\NPCQuest.cs" />
|
||||||
|
<Compile Include="Assets\CloseIfQuestPanel.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" />
|
||||||
@ -689,94 +694,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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.InternalAPIEngineBridge.001">
|
<Reference Include="Unity.InternalAPIEngineBridge.001">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.VSCode.Editor">
|
<Reference Include="Unity.VSCode.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.2D.PixelPerfect">
|
<Reference Include="Unity.2D.PixelPerfect">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="PsdPlugin">
|
<Reference Include="PsdPlugin">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.TextMeshPro.Editor">
|
<Reference Include="Unity.TextMeshPro.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.VisualStudio.Editor">
|
<Reference Include="Unity.VisualStudio.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.Timeline">
|
<Reference Include="Unity.Timeline">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.TextMeshPro">
|
<Reference Include="Unity.TextMeshPro">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.2D.IK.Editor">
|
<Reference Include="Unity.2D.IK.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.InternalAPIEditorBridge.001">
|
<Reference Include="Unity.InternalAPIEditorBridge.001">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEditor.UI">
|
<Reference Include="UnityEditor.UI">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.PlasticSCM.Editor">
|
<Reference Include="Unity.PlasticSCM.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.Rider.Editor">
|
<Reference Include="Unity.Rider.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.UI">
|
<Reference Include="UnityEngine.UI">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.Mathematics">
|
<Reference Include="Unity.Mathematics">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.2D.IK.Runtime">
|
<Reference Include="Unity.2D.IK.Runtime">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.Timeline.Editor">
|
<Reference Include="Unity.Timeline.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Unity.Mathematics.Editor">
|
<Reference Include="Unity.Mathematics.Editor">
|
||||||
<HintPath>C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/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/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
|
<HintPath>C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
77
Assets/Animations/MainCharacter/Attack_Fist_Down.anim
Normal file
77
Assets/Animations/MainCharacter/Attack_Fist_Down.anim
Normal 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: Attack_Fist_Down
|
||||||
|
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: -168421969075237668, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.083333336
|
||||||
|
value: {fileID: -249628310123516169, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.16666667
|
||||||
|
value: {fileID: 6950916264672091854, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.25
|
||||||
|
value: {fileID: 87419031593189281, guid: 597b2c2006a4de8489f0f049247a30fd, 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: -168421969075237668, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -249628310123516169, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: 6950916264672091854, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: 87419031593189281, guid: 597b2c2006a4de8489f0f049247a30fd, 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: 0
|
||||||
|
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: []
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a0a8926e6a725944e8b47e277ff6676d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
80
Assets/Animations/MainCharacter/Fist_Attack_Right.anim
Normal file
80
Assets/Animations/MainCharacter/Fist_Attack_Right.anim
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
%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: Fist_Attack_Right
|
||||||
|
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: 7080715997881667233, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.083333336
|
||||||
|
value: {fileID: -4512349985842528654, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.16666667
|
||||||
|
value: {fileID: -3625319683996010164, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.25
|
||||||
|
value: {fileID: -4512349985842528654, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.33333334
|
||||||
|
value: {fileID: 7080715997881667233, guid: 597b2c2006a4de8489f0f049247a30fd, 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: 7080715997881667233, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -4512349985842528654, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -3625319683996010164, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -4512349985842528654, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: 7080715997881667233, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 0.4166667
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
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: []
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3dabb96e33ecf9f489eb93f9f6364a7d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
80
Assets/Animations/MainCharacter/Fist_Attack_Up.anim
Normal file
80
Assets/Animations/MainCharacter/Fist_Attack_Up.anim
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
%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: Fist_Attack_Up
|
||||||
|
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: -2201208147727788599, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- time: 0.083333336
|
||||||
|
value: {fileID: -5296109847814325529, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- time: 0.16666667
|
||||||
|
value: {fileID: -4275449529538938607, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- time: 0.25
|
||||||
|
value: {fileID: -5296109847814325529, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- time: 0.33333334
|
||||||
|
value: {fileID: -2201208147727788599, guid: 14b4e5a0723e3e44f8320bf3f1a71930, 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: -2201208147727788599, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- {fileID: -5296109847814325529, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- {fileID: -4275449529538938607, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- {fileID: -5296109847814325529, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
- {fileID: -2201208147727788599, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3}
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 0.4166667
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
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: []
|
8
Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta
Normal file
8
Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9c37f3c3a07a8be46b56239656625c2f
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
80
Assets/Animations/MainCharacter/Fist_Attack_left.anim
Normal file
80
Assets/Animations/MainCharacter/Fist_Attack_left.anim
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
%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: Fist_Attack_left
|
||||||
|
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: 887692905118280314, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.083333336
|
||||||
|
value: {fileID: -2855075988674079279, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.16666667
|
||||||
|
value: {fileID: 1489986872292285190, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.25
|
||||||
|
value: {fileID: -2855075988674079279, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- time: 0.33333334
|
||||||
|
value: {fileID: 887692905118280314, guid: 597b2c2006a4de8489f0f049247a30fd, 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: 887692905118280314, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -2855075988674079279, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: 1489986872292285190, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: -2855075988674079279, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
- {fileID: 887692905118280314, guid: 597b2c2006a4de8489f0f049247a30fd, type: 3}
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 0.4166667
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
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: []
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 26021e5afd59b17458272dae2d451934
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -47,6 +47,28 @@ BlendTree:
|
|||||||
m_UseAutomaticThresholds: 1
|
m_UseAutomaticThresholds: 1
|
||||||
m_NormalizedBlendValues: 0
|
m_NormalizedBlendValues: 0
|
||||||
m_BlendType: 1
|
m_BlendType: 1
|
||||||
|
--- !u!1101 &-5752672959895580906
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions: []
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: -5678147287597586547}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.40000004
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &-5678147287597586547
|
--- !u!1102 &-5678147287597586547
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@ -60,6 +82,7 @@ AnimatorState:
|
|||||||
m_Transitions:
|
m_Transitions:
|
||||||
- {fileID: 3178665442510596103}
|
- {fileID: 3178665442510596103}
|
||||||
- {fileID: 2663480789015550344}
|
- {fileID: 2663480789015550344}
|
||||||
|
- {fileID: 6170832368830547399}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
@ -286,6 +309,12 @@ AnimatorController:
|
|||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 0}
|
||||||
|
- m_Name: attackFist
|
||||||
|
m_Type: 9
|
||||||
|
m_DefaultFloat: 0
|
||||||
|
m_DefaultInt: 0
|
||||||
|
m_DefaultBool: 0
|
||||||
|
m_Controller: {fileID: 0}
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
- serializedVersion: 5
|
- serializedVersion: 5
|
||||||
m_Name: Base Layer
|
m_Name: Base Layer
|
||||||
@ -326,6 +355,53 @@ AnimatorState:
|
|||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!206 &2292878563474488193
|
||||||
|
BlendTree:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Blend Tree
|
||||||
|
m_Childs:
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: 7400000, guid: 6cb4d0def5e45d141998615e8142eceb, type: 2}
|
||||||
|
m_Threshold: 0
|
||||||
|
m_Position: {x: 0, y: -0.1}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: moveX
|
||||||
|
m_Mirror: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: 7400000, guid: 9c37f3c3a07a8be46b56239656625c2f, type: 2}
|
||||||
|
m_Threshold: 0.33333334
|
||||||
|
m_Position: {x: 0, y: 0.1}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: moveX
|
||||||
|
m_Mirror: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: 7400000, guid: 7f6d671d2fe52794eb27c45dd79504cb, type: 2}
|
||||||
|
m_Threshold: 0.6666667
|
||||||
|
m_Position: {x: 0.1, y: 0}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: moveX
|
||||||
|
m_Mirror: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: 7400000, guid: 3dabb96e33ecf9f489eb93f9f6364a7d, type: 2}
|
||||||
|
m_Threshold: 1
|
||||||
|
m_Position: {x: -0.1, y: 0}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: moveX
|
||||||
|
m_Mirror: 0
|
||||||
|
m_BlendParameter: lastMoveX
|
||||||
|
m_BlendParameterY: lastMoveY
|
||||||
|
m_MinThreshold: 0
|
||||||
|
m_MaxThreshold: 1
|
||||||
|
m_UseAutomaticThresholds: 1
|
||||||
|
m_NormalizedBlendValues: 0
|
||||||
|
m_BlendType: 1
|
||||||
--- !u!1101 &2663480789015550344
|
--- !u!1101 &2663480789015550344
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -376,6 +452,78 @@ AnimatorStateTransition:
|
|||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &5310161437452972708
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions:
|
||||||
|
- m_ConditionMode: 1
|
||||||
|
m_ConditionEvent: attackFist
|
||||||
|
m_EventTreshold: 0
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: 8289624602891864746}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.40000004
|
||||||
|
m_HasExitTime: 0
|
||||||
|
m_HasFixedDuration: 0
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &6170832368830547399
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions:
|
||||||
|
- m_ConditionMode: 1
|
||||||
|
m_ConditionEvent: attackFist
|
||||||
|
m_EventTreshold: 0
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: 8289624602891864746}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0
|
||||||
|
m_HasExitTime: 0
|
||||||
|
m_HasFixedDuration: 0
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &6629487919944119600
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions: []
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: -5678147287597586547}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.40000004
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &7257817922151744131
|
--- !u!1102 &7257817922151744131
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@ -389,6 +537,7 @@ AnimatorState:
|
|||||||
m_Transitions:
|
m_Transitions:
|
||||||
- {fileID: -5572165365293705200}
|
- {fileID: -5572165365293705200}
|
||||||
- {fileID: -5632725443533880303}
|
- {fileID: -5632725443533880303}
|
||||||
|
- {fileID: 5310161437452972708}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
@ -404,6 +553,33 @@ AnimatorState:
|
|||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &8289624602891864746
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Attack 0
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions:
|
||||||
|
- {fileID: 6629487919944119600}
|
||||||
|
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: 2292878563474488193}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
--- !u!1107 &9041107495391884788
|
--- !u!1107 &9041107495391884788
|
||||||
AnimatorStateMachine:
|
AnimatorStateMachine:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@ -422,6 +598,9 @@ AnimatorStateMachine:
|
|||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 764129659546702357}
|
m_State: {fileID: 764129659546702357}
|
||||||
m_Position: {x: 760, y: 40, z: 0}
|
m_Position: {x: 760, y: 40, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 8289624602891864746}
|
||||||
|
m_Position: {x: 110, y: -90, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
|
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
@ -0,0 +1,396 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 597b2c2006a4de8489f0f049247a30fd
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable:
|
||||||
|
- first:
|
||||||
|
213: -168421969075237668
|
||||||
|
second: pixil-frame-0 (2)_0
|
||||||
|
- first:
|
||||||
|
213: -249628310123516169
|
||||||
|
second: pixil-frame-0 (2)_1
|
||||||
|
- first:
|
||||||
|
213: 6950916264672091854
|
||||||
|
second: pixil-frame-0 (2)_2
|
||||||
|
- first:
|
||||||
|
213: 87419031593189281
|
||||||
|
second: pixil-frame-0 (2)_3
|
||||||
|
- first:
|
||||||
|
213: 7080715997881667233
|
||||||
|
second: pixil-frame-0 (2)_4
|
||||||
|
- first:
|
||||||
|
213: -4512349985842528654
|
||||||
|
second: pixil-frame-0 (2)_5
|
||||||
|
- first:
|
||||||
|
213: 1301278337192169457
|
||||||
|
second: pixil-frame-0 (2)_6
|
||||||
|
- first:
|
||||||
|
213: -3625319683996010164
|
||||||
|
second: pixil-frame-0 (2)_7
|
||||||
|
- first:
|
||||||
|
213: 887692905118280314
|
||||||
|
second: pixil-frame-0 (2)_8
|
||||||
|
- first:
|
||||||
|
213: 2049773315141763561
|
||||||
|
second: pixil-frame-0 (2)_9
|
||||||
|
- first:
|
||||||
|
213: -2855075988674079279
|
||||||
|
second: pixil-frame-0 (2)_10
|
||||||
|
- first:
|
||||||
|
213: 1489986872292285190
|
||||||
|
second: pixil-frame-0 (2)_11
|
||||||
|
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: 8192
|
||||||
|
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: 8192
|
||||||
|
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: pixil-frame-0 (2)_0
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 225
|
||||||
|
y: 92
|
||||||
|
width: 17
|
||||||
|
height: 30
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: cdc06e88c15a9adf0800000000000000
|
||||||
|
internalID: -168421969075237668
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_1
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 244
|
||||||
|
y: 93
|
||||||
|
width: 17
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 7fee431ef54298cf0800000000000000
|
||||||
|
internalID: -249628310123516169
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_2
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 263
|
||||||
|
y: 93
|
||||||
|
width: 17
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: eced343e38d967060800000000000000
|
||||||
|
internalID: 6950916264672091854
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_3
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 283
|
||||||
|
y: 92
|
||||||
|
width: 17
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 1af78b46523963100800000000000000
|
||||||
|
internalID: 87419031593189281
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_4
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 227
|
||||||
|
y: 168
|
||||||
|
width: 11
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 1ae89215fa1c34260800000000000000
|
||||||
|
internalID: 7080715997881667233
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_5
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 245
|
||||||
|
y: 168
|
||||||
|
width: 13
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.4219689, y: 0.5000021}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 27efd976899e061c0800000000000000
|
||||||
|
internalID: -4512349985842528654
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_6
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 262
|
||||||
|
y: 168
|
||||||
|
width: 14
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.38958523, y: 0.5000011}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 1ff0042d0c11f0210800000000000000
|
||||||
|
internalID: 1301278337192169457
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_7
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 277
|
||||||
|
y: 167
|
||||||
|
width: 15
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.3679606, y: 0.5000011}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: c49bf2684f640bdc0800000000000000
|
||||||
|
internalID: -3625319683996010164
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_8
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 279
|
||||||
|
y: 133
|
||||||
|
width: 11
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: a7aa5377ef7b15c00800000000000000
|
||||||
|
internalID: 887692905118280314
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_9
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 259
|
||||||
|
y: 133
|
||||||
|
width: 13
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.57432204, y: 0.50000054}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 9e1891f48f1427c10800000000000000
|
||||||
|
internalID: 2049773315141763561
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_10
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 241
|
||||||
|
y: 133
|
||||||
|
width: 14
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.60697174, y: 0.50000155}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 1d59550e38bb068d0800000000000000
|
||||||
|
internalID: -2855075988674079279
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: pixil-frame-0 (2)_11
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 225
|
||||||
|
y: 132
|
||||||
|
width: 15
|
||||||
|
height: 29
|
||||||
|
alignment: 9
|
||||||
|
pivot: {x: 0.6320455, y: 0.50333273}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 60b1af28a2f7da410800000000000000
|
||||||
|
internalID: 1489986872292285190
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -11,6 +11,33 @@ TextureImporter:
|
|||||||
- first:
|
- first:
|
||||||
213: 4288188533273746505
|
213: 4288188533273746505
|
||||||
second: sword-battle_2
|
second: sword-battle_2
|
||||||
|
- first:
|
||||||
|
213: -2201208147727788599
|
||||||
|
second: sword-battle_3
|
||||||
|
- first:
|
||||||
|
213: -5296109847814325529
|
||||||
|
second: sword-battle_4
|
||||||
|
- first:
|
||||||
|
213: -4275449529538938607
|
||||||
|
second: sword-battle_5
|
||||||
|
- first:
|
||||||
|
213: 474691196297396936
|
||||||
|
second: sword-battle_6
|
||||||
|
- first:
|
||||||
|
213: -5157774232136272366
|
||||||
|
second: sword-battle_7
|
||||||
|
- first:
|
||||||
|
213: -5454003658976986870
|
||||||
|
second: sword-battle_8
|
||||||
|
- first:
|
||||||
|
213: 4784725802582458130
|
||||||
|
second: sword-battle_9
|
||||||
|
- first:
|
||||||
|
213: 6022402560213181555
|
||||||
|
second: sword-battle_10
|
||||||
|
- first:
|
||||||
|
213: -3203741481322687352
|
||||||
|
second: sword-battle_11
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 11
|
serializedVersion: 11
|
||||||
mipmaps:
|
mipmaps:
|
||||||
@ -162,6 +189,195 @@ TextureImporter:
|
|||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_3
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 146
|
||||||
|
y: 204
|
||||||
|
width: 17
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 9c55df52adcb371e0800000000000000
|
||||||
|
internalID: -2201208147727788599
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_4
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 171
|
||||||
|
y: 204
|
||||||
|
width: 17
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 7ea349547207086b0800000000000000
|
||||||
|
internalID: -5296109847814325529
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_5
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 196
|
||||||
|
y: 204
|
||||||
|
width: 18
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 11978b02e4d8aa4c0800000000000000
|
||||||
|
internalID: -4275449529538938607
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_6
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 148
|
||||||
|
y: 168
|
||||||
|
width: 11
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 8c2cf45c021769600800000000000000
|
||||||
|
internalID: 474691196297396936
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_7
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 174
|
||||||
|
y: 168
|
||||||
|
width: 12
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 216bad5b9a7eb68b0800000000000000
|
||||||
|
internalID: -5157774232136272366
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_8
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 193
|
||||||
|
y: 168
|
||||||
|
width: 13
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: a09fef6919c7f44b0800000000000000
|
||||||
|
internalID: -5454003658976986870
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_9
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 198
|
||||||
|
y: 131
|
||||||
|
width: 13
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 21fb29254c2c66240800000000000000
|
||||||
|
internalID: 4784725802582458130
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_10
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 173
|
||||||
|
y: 131
|
||||||
|
width: 12
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 374e8ef683fd39350800000000000000
|
||||||
|
internalID: 6022402560213181555
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: sword-battle_11
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 148
|
||||||
|
y: 131
|
||||||
|
width: 11
|
||||||
|
height: 29
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 884d39dc8160a83d0800000000000000
|
||||||
|
internalID: -3203741481322687352
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
@ -18,7 +18,8 @@ public class Player : MonoBehaviour
|
|||||||
public FloatValue maxHealth;
|
public FloatValue maxHealth;
|
||||||
public float currentHealth;
|
public float currentHealth;
|
||||||
public HealthBar healthBar;
|
public HealthBar healthBar;
|
||||||
private bool attack;
|
private bool attackSword;
|
||||||
|
private bool attackFist;
|
||||||
|
|
||||||
private float timerRegen = 0f;
|
private float timerRegen = 0f;
|
||||||
private float timerTick = 0f;
|
private float timerTick = 0f;
|
||||||
@ -67,23 +68,32 @@ public class Player : MonoBehaviour
|
|||||||
|
|
||||||
private void HandleAttacks()
|
private void HandleAttacks()
|
||||||
{
|
{
|
||||||
if (attack)
|
if (attackSword)
|
||||||
{
|
{
|
||||||
myAnimator.SetTrigger("attack");
|
myAnimator.SetTrigger("attack");
|
||||||
}
|
}
|
||||||
|
if (attackFist)
|
||||||
|
{
|
||||||
|
myAnimator.SetTrigger("attackFist");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleInput()
|
private void HandleInput()
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.Space))
|
if (Input.GetKeyDown(KeyCode.Space))
|
||||||
{
|
{
|
||||||
attack = true;
|
attackSword = true;
|
||||||
|
}
|
||||||
|
if (Input.GetKeyDown(KeyCode.LeftShift))
|
||||||
|
{
|
||||||
|
attackFist = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResetValues()
|
private void ResetValues()
|
||||||
{
|
{
|
||||||
attack = false;
|
attackSword = false;
|
||||||
|
attackFist = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
|
@ -27,13 +27,13 @@ EditorUserSettings:
|
|||||||
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
|
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-7:
|
RecentlyUsedScenePath-7:
|
||||||
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
|
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-8:
|
RecentlyUsedScenePath-8:
|
||||||
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-9:
|
RecentlyUsedScenePath-9:
|
||||||
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
|
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
||||||
flags: 0
|
flags: 0
|
||||||
vcSharedLogLevel:
|
vcSharedLogLevel:
|
||||||
value: 0d5e400f0650
|
value: 0d5e400f0650
|
||||||
|
Loading…
Reference in New Issue
Block a user