From 6bcc54309c9c3049aaf8956c0b94d52c23be88d0 Mon Sep 17 00:00:00 2001 From: Jakub Sztuba Date: Tue, 7 Jun 2022 12:19:40 +0200 Subject: [PATCH] Fix attack animation --- Assembly-CSharp.csproj | 76 ++++---- .../Animations/MainCharacter/Attack_Down.anim | 80 ++++++++ .../MainCharacter/Attack_Down.anim.meta | 8 + .../Animations/MainCharacter/Attack_Left.anim | 4 +- .../Animations/MainCharacter/Attack_Up.anim | 12 +- .../MainCharacter/mainCh_standing.controller | 56 +++--- .../Main Character Sprites/sword-battle.png | Bin 0 -> 14719 bytes .../sword-battle.png.meta | 180 ++++++++++++++++++ .../sword_and_fight.png.meta | 36 ++-- Scriptum.sln | 10 +- 10 files changed, 368 insertions(+), 94 deletions(-) create mode 100644 Assets/Animations/MainCharacter/Attack_Down.anim create mode 100644 Assets/Animations/MainCharacter/Attack_Down.anim.meta create mode 100644 Assets/Character Sprites/Main Character Sprites/sword-battle.png create mode 100644 Assets/Character Sprites/Main Character Sprites/sword-battle.png.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 85b59dbe..2ba480cf 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} + {e0f48af5-6d3e-b154-523d-8f755dc8e665} + {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 @@ -47,6 +52,7 @@ false + @@ -674,94 +680,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/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/MainCharacter/Attack_Down.anim b/Assets/Animations/MainCharacter/Attack_Down.anim new file mode 100644 index 00000000..d6321446 --- /dev/null +++ b/Assets/Animations/MainCharacter/Attack_Down.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: Attack_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: -737396690282350277, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - time: 0.083333336 + value: {fileID: 6801523008633619359, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - time: 0.16666667 + value: {fileID: 4288188533273746505, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - time: 0.25 + value: {fileID: 6801523008633619359, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - time: 0.33333334 + value: {fileID: -737396690282350277, 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: -737396690282350277, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - {fileID: 6801523008633619359, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - {fileID: 4288188533273746505, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - {fileID: 6801523008633619359, guid: 14b4e5a0723e3e44f8320bf3f1a71930, type: 3} + - {fileID: -737396690282350277, 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/Attack_Down.anim.meta b/Assets/Animations/MainCharacter/Attack_Down.anim.meta new file mode 100644 index 00000000..4db7f700 --- /dev/null +++ b/Assets/Animations/MainCharacter/Attack_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cb4d0def5e45d141998615e8142eceb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/MainCharacter/Attack_Left.anim b/Assets/Animations/MainCharacter/Attack_Left.anim index 9f70fb34..9168d1df 100644 --- a/Assets/Animations/MainCharacter/Attack_Left.anim +++ b/Assets/Animations/MainCharacter/Attack_Left.anim @@ -22,7 +22,7 @@ AnimationClip: - time: 0 value: {fileID: -3476519325272923408, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - time: 0.083333336 - value: {fileID: 6502455061363775637, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} + value: {fileID: -3476519325272923408, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - time: 0.16666667 value: {fileID: 795342102365546028, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - time: 0.25 @@ -49,7 +49,7 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: -3476519325272923408, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - - {fileID: 6502455061363775637, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} + - {fileID: -3476519325272923408, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - {fileID: 795342102365546028, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - {fileID: 6502455061363775637, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - {fileID: -3476519325272923408, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} diff --git a/Assets/Animations/MainCharacter/Attack_Up.anim b/Assets/Animations/MainCharacter/Attack_Up.anim index c8f39b88..740b5b2b 100644 --- a/Assets/Animations/MainCharacter/Attack_Up.anim +++ b/Assets/Animations/MainCharacter/Attack_Up.anim @@ -21,19 +21,19 @@ AnimationClip: - curve: - time: 0 value: {fileID: 3229698138569089477, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - - time: 0.016666668 + - time: 0.083333336 value: {fileID: -7516206529079155594, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - - time: 0.033333335 + - time: 0.16666667 value: {fileID: 4594081524995518200, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - - time: 0.05 + - time: 0.25 value: {fileID: -7516206529079155594, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} - - time: 0.06666667 + - time: 0.33333334 value: {fileID: 3229698138569089477, guid: 3885eb6d9df9cae4b91741eec7e45840, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -58,7 +58,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.4166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/MainCharacter/mainCh_standing.controller b/Assets/Animations/MainCharacter/mainCh_standing.controller index 600a41eb..39586b65 100644 --- a/Assets/Animations/MainCharacter/mainCh_standing.controller +++ b/Assets/Animations/MainCharacter/mainCh_standing.controller @@ -96,7 +96,7 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0.40000004 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -125,6 +125,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4984416496896433241 +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!206 &-1633676018275584126 BlendTree: m_ObjectHideFlags: 1 @@ -134,7 +156,7 @@ BlendTree: m_Name: Blend Tree m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 2f980ae4637ab33478d95c20fc6ebda8, type: 2} + m_Motion: {fileID: 7400000, guid: 6cb4d0def5e45d141998615e8142eceb, type: 2} m_Threshold: 0 m_Position: {x: 0, y: -0.1} m_TimeScale: 1 @@ -165,8 +187,8 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: moveX m_Mirror: 0 - m_BlendParameter: moveX - m_BlendParameterY: moveY + m_BlendParameter: lastMoveX + m_BlendParameterY: lastMoveY m_MinThreshold: 0 m_MaxThreshold: 1 m_UseAutomaticThresholds: 1 @@ -288,7 +310,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 7551231252227633570} + - {fileID: -4984416496896433241} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -325,7 +347,7 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -382,28 +404,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &7551231252227633570 -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: 7257817922151744131} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1107 &9041107495391884788 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/Character Sprites/Main Character Sprites/sword-battle.png b/Assets/Character Sprites/Main Character Sprites/sword-battle.png new file mode 100644 index 0000000000000000000000000000000000000000..6241a2a94719cdf60b8b5bd4774ebe967e6e81f8 GIT binary patch literal 14719 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 PDnU<`G#{5KSiJc^l64Wx literal 0 HcmV?d00001 diff --git a/Assets/Character Sprites/Main Character Sprites/sword-battle.png.meta b/Assets/Character Sprites/Main Character Sprites/sword-battle.png.meta new file mode 100644 index 00000000..82f361a9 --- /dev/null +++ b/Assets/Character Sprites/Main Character Sprites/sword-battle.png.meta @@ -0,0 +1,180 @@ +fileFormatVersion: 2 +guid: 14b4e5a0723e3e44f8320bf3f1a71930 +TextureImporter: + internalIDToNameTable: + - first: + 213: -737396690282350277 + second: sword-battle_0 + - first: + 213: 6801523008633619359 + second: sword-battle_1 + - first: + 213: 4288188533273746505 + second: sword-battle_2 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sword-battle_0 + rect: + serializedVersion: 2 + x: 190 + y: 91 + width: 18 + height: 30 + alignment: 9 + pivot: {x: 0.52963424, y: 0.5177811} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b39fb29fd9d34c5f0800000000000000 + internalID: -737396690282350277 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sword-battle_1 + rect: + serializedVersion: 2 + x: 170 + y: 88 + width: 17 + height: 33 + alignment: 9 + pivot: {x: 0.5, y: 0.5614256} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f93c04de32dd36e50800000000000000 + internalID: 6801523008633619359 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sword-battle_2 + rect: + serializedVersion: 2 + x: 148 + y: 86 + width: 18 + height: 35 + alignment: 9 + pivot: {x: 0.5266707, y: 0.5853496} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 94c5faf40c4b28b30800000000000000 + internalID: 4288188533273746505 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Sprites/Main Character Sprites/sword_and_fight.png.meta b/Assets/Character Sprites/Main Character Sprites/sword_and_fight.png.meta index 2b64efed..c30a7cba 100644 --- a/Assets/Character Sprites/Main Character Sprites/sword_and_fight.png.meta +++ b/Assets/Character Sprites/Main Character Sprites/sword_and_fight.png.meta @@ -125,8 +125,8 @@ TextureImporter: y: 201 width: 18 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.47480667, y: 0.49869722} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -146,8 +146,8 @@ TextureImporter: y: 201 width: 19 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.44232076, y: 0.49869722} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -167,8 +167,8 @@ TextureImporter: y: 202 width: 19 height: 33 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.44232097, y: 0.43701681} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -188,8 +188,8 @@ TextureImporter: y: 164 width: 21 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.7363087, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -209,8 +209,8 @@ TextureImporter: y: 164 width: 19 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.7088077, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -230,8 +230,8 @@ TextureImporter: y: 164 width: 13 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.5707626, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -251,8 +251,8 @@ TextureImporter: y: 127 width: 13 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.4302327, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -272,8 +272,8 @@ TextureImporter: y: 127 width: 19 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.2946649, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -293,8 +293,8 @@ TextureImporter: y: 127 width: 21 height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.26322246, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Scriptum.sln b/Scriptum.sln index a0073ad3..06cdecf1 100644 --- a/Scriptum.sln +++ b/Scriptum.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU + {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU + {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU + {e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE