From 0a07120b68232ef833862f8648f4f542b9125fd2 Mon Sep 17 00:00:00 2001 From: Jakub Sztuba Date: Tue, 14 Jun 2022 21:20:02 +0200 Subject: [PATCH] Added fist attack animation --- Assembly-CSharp.csproj | 83 ++-- .../MainCharacter/Attack_Fist_Down.anim | 77 ++++ .../MainCharacter/Attack_Fist_Down.anim.meta | 8 + .../MainCharacter/Fist_Attack_Right.anim | 80 ++++ .../MainCharacter/Fist_Attack_Right.anim.meta | 8 + .../MainCharacter/Fist_Attack_Up.anim | 80 ++++ .../MainCharacter/Fist_Attack_Up.anim.meta | 8 + .../MainCharacter/Fist_Attack_left.anim | 80 ++++ .../MainCharacter/Fist_Attack_left.anim.meta | 8 + .../MainCharacter/mainCh_standing.controller | 179 ++++++++ .../pixil-frame-0 (2).png | Bin 0 -> 14720 bytes .../pixil-frame-0 (2).png.meta | 396 ++++++++++++++++++ .../sword-battle.png.meta | 216 ++++++++++ Assets/Scripts/Player.cs | 18 +- UserSettings/EditorUserSettings.asset | 6 +- 15 files changed, 1201 insertions(+), 46 deletions(-) create mode 100644 Assets/Animations/MainCharacter/Attack_Fist_Down.anim create mode 100644 Assets/Animations/MainCharacter/Attack_Fist_Down.anim.meta create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_Right.anim create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_Right.anim.meta create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_Up.anim create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_left.anim create mode 100644 Assets/Animations/MainCharacter/Fist_Attack_left.anim.meta create mode 100644 Assets/Character Sprites/Main Character Sprites/pixil-frame-0 (2).png create mode 100644 Assets/Character Sprites/Main Character Sprites/pixil-frame-0 (2).png.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a4f42aa5..2faf6e2a 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,8 +2,10 @@ latest - C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts - unity_csc.bat + <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package + <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package + true + Debug @@ -11,7 +13,8 @@ 10.0.20506 2.0 - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} + {2a01b88a-fe76-747c-0b76-b5df201ede33} + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Properties Assembly-CSharp @@ -27,8 +30,9 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 - 0169 + False + False pdbonly @@ -36,8 +40,9 @@ Temp\bin\Release\ prompt 4 - 0169 + False + False true @@ -51,7 +56,6 @@ - @@ -66,14 +70,12 @@ - - @@ -83,7 +85,6 @@ - @@ -100,6 +101,10 @@ + + + + @@ -689,94 +694,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/Desktop/1/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Projekt Inzynierski/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/MainCharacter/Attack_Fist_Down.anim b/Assets/Animations/MainCharacter/Attack_Fist_Down.anim new file mode 100644 index 00000000..3184537c --- /dev/null +++ b/Assets/Animations/MainCharacter/Attack_Fist_Down.anim @@ -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: [] diff --git a/Assets/Animations/MainCharacter/Attack_Fist_Down.anim.meta b/Assets/Animations/MainCharacter/Attack_Fist_Down.anim.meta new file mode 100644 index 00000000..5177613e --- /dev/null +++ b/Assets/Animations/MainCharacter/Attack_Fist_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0a8926e6a725944e8b47e277ff6676d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/Fist_Attack_Right.anim b/Assets/Animations/MainCharacter/Fist_Attack_Right.anim new file mode 100644 index 00000000..7a83ded3 --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_Right.anim @@ -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: [] diff --git a/Assets/Animations/MainCharacter/Fist_Attack_Right.anim.meta b/Assets/Animations/MainCharacter/Fist_Attack_Right.anim.meta new file mode 100644 index 00000000..11341e9e --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_Right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3dabb96e33ecf9f489eb93f9f6364a7d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/Fist_Attack_Up.anim b/Assets/Animations/MainCharacter/Fist_Attack_Up.anim new file mode 100644 index 00000000..1feeec75 --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_Up.anim @@ -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: [] diff --git a/Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta b/Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta new file mode 100644 index 00000000..6f79fb01 --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_Up.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c37f3c3a07a8be46b56239656625c2f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/Fist_Attack_left.anim b/Assets/Animations/MainCharacter/Fist_Attack_left.anim new file mode 100644 index 00000000..6fe52ba9 --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_left.anim @@ -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: [] diff --git a/Assets/Animations/MainCharacter/Fist_Attack_left.anim.meta b/Assets/Animations/MainCharacter/Fist_Attack_left.anim.meta new file mode 100644 index 00000000..b9ef9ccc --- /dev/null +++ b/Assets/Animations/MainCharacter/Fist_Attack_left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26021e5afd59b17458272dae2d451934 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/mainCh_standing.controller b/Assets/Animations/MainCharacter/mainCh_standing.controller index 39586b65..43e71d25 100644 --- a/Assets/Animations/MainCharacter/mainCh_standing.controller +++ b/Assets/Animations/MainCharacter/mainCh_standing.controller @@ -47,6 +47,28 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 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 AnimatorState: serializedVersion: 6 @@ -60,6 +82,7 @@ AnimatorState: m_Transitions: - {fileID: 3178665442510596103} - {fileID: 2663480789015550344} + - {fileID: 6170832368830547399} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -286,6 +309,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 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: - serializedVersion: 5 m_Name: Base Layer @@ -326,6 +355,53 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: 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 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -376,6 +452,78 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 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 AnimatorState: serializedVersion: 6 @@ -389,6 +537,7 @@ AnimatorState: m_Transitions: - {fileID: -5572165365293705200} - {fileID: -5632725443533880303} + - {fileID: 5310161437452972708} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -404,6 +553,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: 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 AnimatorStateMachine: serializedVersion: 6 @@ -422,6 +598,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 764129659546702357} 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_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Character Sprites/Main Character Sprites/pixil-frame-0 (2).png b/Assets/Character Sprites/Main Character Sprites/pixil-frame-0 (2).png new file mode 100644 index 0000000000000000000000000000000000000000..69a135726c8a5d58733ef91475e28046a0fb4ed1 GIT binary patch literal 14720 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