From 01b141d78a6caf842b64e9bcc0cf116f7a1cf164 Mon Sep 17 00:00:00 2001 From: Jeremy Smitherman Date: Sun, 24 Aug 2025 17:38:37 -0500 Subject: [PATCH] Updated version, added movement animations and facing --- Assets/InputSystem_Actions.cs | 2 +- Assets/Prefab/Characters/BLOODJOE.prefab | 2 + Assets/Scenes/Boot.unity | 115 ++++++++- Assets/Scripts/Pawn.cs | 9 +- .../State/GameStateMachine/PlayLevel.cs | 4 +- ...e_strip4_0.controller => Human.controller} | 33 ++- ....controller.meta => Human.controller.meta} | 0 .../BLOODJOE/Vigilante_Walk_strip4.png | Bin 0 -> 561 bytes .../BLOODJOE/Vigilante_Walk_strip4.png.meta | 234 ++++++++++++++++++ Assets/Sprites/BLOODJOE/Walk.anim | 81 ++++++ Assets/Sprites/BLOODJOE/Walk.anim.meta | 8 + Packages/manifest.json | 4 +- Packages/packages-lock.json | 18 +- ProjectSettings/ProjectVersion.txt | 4 +- 14 files changed, 494 insertions(+), 20 deletions(-) rename Assets/Sprites/BLOODJOE/{Vigilante_Idle_strip4_0.controller => Human.controller} (71%) rename Assets/Sprites/BLOODJOE/{Vigilante_Idle_strip4_0.controller.meta => Human.controller.meta} (100%) create mode 100644 Assets/Sprites/BLOODJOE/Vigilante_Walk_strip4.png create mode 100644 Assets/Sprites/BLOODJOE/Vigilante_Walk_strip4.png.meta create mode 100644 Assets/Sprites/BLOODJOE/Walk.anim create mode 100644 Assets/Sprites/BLOODJOE/Walk.anim.meta diff --git a/Assets/InputSystem_Actions.cs b/Assets/InputSystem_Actions.cs index 4112ba8..c1ed850 100644 --- a/Assets/InputSystem_Actions.cs +++ b/Assets/InputSystem_Actions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.14.1 +// version 1.14.2 // from Assets/InputSystem_Actions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Assets/Prefab/Characters/BLOODJOE.prefab b/Assets/Prefab/Characters/BLOODJOE.prefab index e42fad6..eaf23b4 100644 --- a/Assets/Prefab/Characters/BLOODJOE.prefab +++ b/Assets/Prefab/Characters/BLOODJOE.prefab @@ -46,6 +46,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Pawn unitData: {fileID: 11400000, guid: 002caf708abb1144c99ca1048c00afcc, type: 2} + spriteRenderer: {fileID: 5418347876159129663} + animator: {fileID: 9153895417803376005} --- !u!1 &7443273741764524837 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Boot.unity b/Assets/Scenes/Boot.unity index 8d64b1b..f14a683 100644 --- a/Assets/Scenes/Boot.unity +++ b/Assets/Scenes/Boot.unity @@ -119,6 +119,119 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &14305653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 14305656} + - component: {fileID: 14305655} + - component: {fileID: 14305654} + m_Layer: 0 + m_Name: Vigilante_Walk_strip4_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &14305654 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14305653} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 76987e46ed3f06e44b0109890c9c1532, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &14305655 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14305653} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5182867339085442074, guid: 2e963a8df8218d247b9a96461b2cea08, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.17, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &14305656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14305653} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.8244877, y: -4.7786894, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1072830979 GameObject: m_ObjectHideFlags: 0 @@ -369,7 +482,6 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Managers.InputManager stateMachine: {fileID: 1567913722} playerInputManager: {fileID: 1135129242} - uiModule: {fileID: 0} characterPrefabs: - {fileID: 5178305101487608751, guid: 990b0cce140f5964eabc74ee4b0fde11, type: 3} - {fileID: 5178305101487608751, guid: 990b0cce140f5964eabc74ee4b0fde11, type: 3} @@ -471,3 +583,4 @@ SceneRoots: - {fileID: 1695492504} - {fileID: 1135129243} - {fileID: 1567913723} + - {fileID: 14305656} diff --git a/Assets/Scripts/Pawn.cs b/Assets/Scripts/Pawn.cs index 5551003..e7a754e 100644 --- a/Assets/Scripts/Pawn.cs +++ b/Assets/Scripts/Pawn.cs @@ -5,11 +5,18 @@ using UnityEngine; public class Pawn : MonoBehaviour { [SerializeField] private UnitData unitData; + [SerializeField] private SpriteRenderer spriteRenderer; + [SerializeField] private Animator animator; + + private Vector2 _moveInput; public virtual void HandleMove(Vector2 input) { - _moveInput = input; + _moveInput = input; + animator.Play(input.magnitude > 0 ? "Walk" : "Idle"); + if(_moveInput.magnitude > 0) + spriteRenderer.flipX = _moveInput.x < 0; } private void FixedUpdate() diff --git a/Assets/Scripts/State/GameStateMachine/PlayLevel.cs b/Assets/Scripts/State/GameStateMachine/PlayLevel.cs index 764935e..9475069 100644 --- a/Assets/Scripts/State/GameStateMachine/PlayLevel.cs +++ b/Assets/Scripts/State/GameStateMachine/PlayLevel.cs @@ -9,12 +9,12 @@ namespace State.GameStateMachine public override void OnExit() { - throw new System.NotImplementedException(); + } public override void Update() { - throw new System.NotImplementedException(); + } } } \ No newline at end of file diff --git a/Assets/Sprites/BLOODJOE/Vigilante_Idle_strip4_0.controller b/Assets/Sprites/BLOODJOE/Human.controller similarity index 71% rename from Assets/Sprites/BLOODJOE/Vigilante_Idle_strip4_0.controller rename to Assets/Sprites/BLOODJOE/Human.controller index 4bd6234..df3f14f 100644 --- a/Assets/Sprites/BLOODJOE/Vigilante_Idle_strip4_0.controller +++ b/Assets/Sprites/BLOODJOE/Human.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7041491042131476571 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0e4e2c7d885da8a4c9da311f62419dd7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-6585584643281648321 AnimatorState: serializedVersion: 6 @@ -7,7 +33,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: idle + m_Name: Idle m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: [] @@ -32,7 +58,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Vigilante_Idle_strip4_0 + m_Name: Human serializedVersion: 5 m_AnimatorParameters: - m_Name: punch @@ -66,6 +92,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -6585584643281648321} m_Position: {x: 310, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7041491042131476571} + m_Position: {x: 320, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Sprites/BLOODJOE/Vigilante_Idle_strip4_0.controller.meta b/Assets/Sprites/BLOODJOE/Human.controller.meta similarity index 100% rename from Assets/Sprites/BLOODJOE/Vigilante_Idle_strip4_0.controller.meta rename to Assets/Sprites/BLOODJOE/Human.controller.meta diff --git a/Assets/Sprites/BLOODJOE/Vigilante_Walk_strip4.png b/Assets/Sprites/BLOODJOE/Vigilante_Walk_strip4.png new file mode 100644 index 0000000000000000000000000000000000000000..807ca575940ceafe438a7c4c0b0b9ff9db506aac GIT binary patch literal 561 zcmV-10?z%3P){_bQCXB}&#!$K~|2#J0xlTT>%>19nw**MR`@P;G zroh((D1kXeOoOLdV9~-|CAcdvZTNM3QveGVE`vhoo`gmIaeP&P5IhpI;A;Y`sFpUW z4HhvCz9;~yXBQD;8Jon1e@8AtGvPAo>8R4__}&(LR) znls|-y8ytE#DqjCm9Xl$1VAjwli=$D7+`~Bb&u-3I0=4BZmt4AD<#e(%c&kkJ|jMJ zfcd2)U2h$s&Ymd}&x|j&K&X}t!cH^e3j!#8NCe@PR{tLSqOC=RI`7Em_!9vXZX>}* z5hNLjtN1975k%h3Po4%Hsq!z$IgclJPT+Wuu?vQy&EFOPMv8wZoC|OQB==vTW^_2< zx8hD0)FTie>3=)>#_q=Udl6I{lybc3AU^-s9H6s;Ll->I24554_3#4J?7#S{%x8v* z%iCX210X+lE$HOW9T0!{KObLe0X)PgJh;3|+ARRqhQ;x#h7`_x#f#u5Il zhqy#kib|f|1+_V@N5~QWjT*p+CwGpX+(Z073C*XO8r|SH00000NkvXXu0mjfkcs