diff --git a/Assets/Audio/beneath-surface-3.ogg.meta b/Assets/Audio/beneath-surface-3.ogg.meta new file mode 100644 index 0000000..8c61c94 --- /dev/null +++ b/Assets/Audio/beneath-surface-3.ogg.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c87ec6c441a524fd28ce35c45551396a +AudioImporter: + serializedVersion: 4 + format: 0 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/beneath-surface-4.ogg.meta b/Assets/Audio/beneath-surface-4.ogg.meta new file mode 100644 index 0000000..12e24f5 --- /dev/null +++ b/Assets/Audio/beneath-surface-4.ogg.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 06d87cfe44b7845b89755c1bb89091fc +AudioImporter: + serializedVersion: 4 + format: 0 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 5d694c0..7c31566 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -821,7 +821,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &704683992 Transform: m_ObjectHideFlags: 0 @@ -1440,6 +1440,71 @@ Transform: - {fileID: 1779026304} - {fileID: 710538758} m_Father: {fileID: 0} +--- !u!1 &1078582105 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1078582108} + - 212: {fileID: 1078582107} + - 95: {fileID: 1078582106} + m_Layer: 0 + m_Name: demon-hero-idle_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &1078582106 +Animator: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1078582105} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5e88aafb94f8b4a05be25a6a1f417180, type: 2} + m_CullingMode: 0 + m_ApplyRootMotion: 1 + m_AnimatePhysics: 0 + m_HasTransformHierarchy: 1 +--- !u!212 &1078582107 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1078582105} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: bf0037c206d67144d8e55f3a177cfda6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!4 &1078582108 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1078582105} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -42.8189774, y: -2.38178039, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} --- !u!1 &1152010653 GameObject: m_ObjectHideFlags: 0 @@ -1987,6 +2052,7 @@ GameObject: m_Component: - 4: {fileID: 1605196874} - 212: {fileID: 1605196875} + - 95: {fileID: 1605196876} m_Layer: 0 m_Name: PlayerSprite m_TagString: Untagged @@ -2001,7 +2067,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1605196873} m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: .297014475, z: .297014624} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 146718572} @@ -2026,8 +2092,22 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_SortingLayerID: 0 - m_Sprite: {fileID: 21300000, guid: e57f0e5297e49478bba13bb85b3d8d84, type: 3} + m_Sprite: {fileID: 21300000, guid: bf0037c206d67144d8e55f3a177cfda6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!95 &1605196876 +Animator: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1605196873} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5e88aafb94f8b4a05be25a6a1f417180, type: 2} + m_CullingMode: 0 + m_ApplyRootMotion: 1 + m_AnimatePhysics: 0 + m_HasTransformHierarchy: 1 --- !u!1 &1731015426 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index f3f35e5..43670a6 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -13,6 +13,13 @@ public class PlayerController : MonoBehaviour { public int swigCounter; private int swigs = 0; + private Animator animator; + + void Awake() + { + animator = GameObject.Find("PlayerSprite").GetComponent(); + } + void Update() { if (Input.GetButton("Fire1") && Time.time > nextFire) @@ -20,6 +27,8 @@ public class PlayerController : MonoBehaviour { //audio.Play (); nextFire = Time.time + delay; Instantiate(shank, shankSpawn.position, playerAngle.rotation); + //animator.SetInteger("state", 3); + animator.Play("player_shank"); } if (Input.GetButton("ActivateVV") && swigs < swigCounter && Time.time > nextFire) @@ -27,6 +36,8 @@ public class PlayerController : MonoBehaviour { nextFire = Time.time + delay * 2; Instantiate (vvAura, rigidbody.position, rigidbody.rotation); swigs++; + //animator.SetInteger("state", 1); + animator.Play("player_swig"); } } @@ -34,6 +45,15 @@ public class PlayerController : MonoBehaviour { float moveHorizontal = Input.GetAxis ("Horizontal"); float moveVertical = Input.GetAxis ("Vertical"); + if (Mathf.Approximately(moveHorizontal, 0) && + Mathf.Approximately(moveVertical, 0)) { + //animator.SetInteger("state", 0); + //animator.Play("player_idle"); + } else { + //animator.SetInteger("state", 2); + animator.Play("player_walk"); + } + if (moveHorizontal < 0) playerAngle.eulerAngles = new Vector3(0f, -180f, 0f); else if (moveHorizontal > 0) diff --git a/Assets/Sprites/Animation.meta b/Assets/Sprites/Animation.meta new file mode 100644 index 0000000..5287458 --- /dev/null +++ b/Assets/Sprites/Animation.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 4112eb2abd1684bf6abfc9610424f603 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Sprites/Animation/player_anim_controller.controller b/Assets/Sprites/Animation/player_anim_controller.controller new file mode 100644 index 0000000..4f78dc4 --- /dev/null +++ b/Assets/Sprites/Animation/player_anim_controller.controller @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_anim_controller + serializedVersion: 2 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 3 + m_Name: Base Layer + m_StateMachine: {fileID: 110700000} + m_Mask: {fileID: 0} + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_StateMachineMotionSetIndex: 0 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &110100000 +Transition: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_SrcState: {fileID: 0} + m_DstState: {fileID: 110200000} + m_TransitionDuration: .00934026856 + m_TransitionOffset: .00242453814 + m_Conditions: + - m_ConditionMode: 5 + m_ConditionEvent: + m_EventTreshold: 0 + m_ExitTime: .994861603 + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 0 + m_ExitTime: .994861603 + m_Atomic: 1 + m_Solo: 0 + m_Mute: 0 +--- !u!1101 &110148545 +Transition: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_SrcState: {fileID: 0} + m_DstState: {fileID: 110295956} + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 1 + m_ExitTime: .99000001 + - m_ConditionMode: 5 + m_ConditionEvent: + m_EventTreshold: 0 + m_ExitTime: 1.00260508 + m_Atomic: 1 + m_Solo: 0 + m_Mute: 0 +--- !u!1101 &110156039 +Transition: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_SrcState: {fileID: 0} + m_DstState: {fileID: 110292038} + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 2 + m_ExitTime: .899999976 + - m_ConditionMode: 5 + m_ConditionEvent: + m_EventTreshold: 0 + m_ExitTime: 1.00084031 + m_Atomic: 1 + m_Solo: 0 + m_Mute: 0 +--- !u!1101 &110185540 +Transition: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_SrcState: {fileID: 0} + m_DstState: {fileID: 110297756} + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 3 + m_ExitTime: .899999976 + - m_ConditionMode: 5 + m_ConditionEvent: + m_EventTreshold: 0 + m_ExitTime: 1.00084031 + m_Atomic: 1 + m_Solo: 0 + m_Mute: 0 +--- !u!1102 &110200000 +State: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_idle + m_Speed: 1 + m_CycleOffset: 0 + m_Motions: + - {fileID: 7400000, guid: 9761a6ce7969e46d58104f452efab378, type: 2} + m_ParentStateMachine: {fileID: 110700000} + m_Position: {x: 36, y: 120, z: 0} + m_IKOnFeet: 0 + m_Mirror: 0 + m_Tag: +--- !u!1102 &110292038 +State: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_walk + m_Speed: 1 + m_CycleOffset: 0 + m_Motions: + - {fileID: 7400000, guid: 5a4b76e5271dc4f11ba898f496a8db5d, type: 2} + m_ParentStateMachine: {fileID: 110700000} + m_Position: {x: 36, y: -72, z: 0} + m_IKOnFeet: 0 + m_Mirror: 0 + m_Tag: +--- !u!1102 &110295956 +State: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_swig + m_Speed: 1 + m_CycleOffset: 0 + m_Motions: + - {fileID: 7400000, guid: ab7a492317ff445b685070d57beeaabc, type: 2} + m_ParentStateMachine: {fileID: 110700000} + m_Position: {x: 288, y: 12, z: 0} + m_IKOnFeet: 0 + m_Mirror: 0 + m_Tag: +--- !u!1102 &110297756 +State: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_shank + m_Speed: 1 + m_CycleOffset: 0 + m_Motions: + - {fileID: 7400000, guid: d331a9eea077c47528b6b5b7c66ed0bb, type: 2} + m_ParentStateMachine: {fileID: 110700000} + m_Position: {x: -228, y: 12, z: 0} + m_IKOnFeet: 0 + m_Mirror: 0 + m_Tag: +--- !u!1107 &110700000 +StateMachine: + serializedVersion: 2 + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_DefaultState: {fileID: 110200000} + m_States: + - {fileID: 110200000} + - {fileID: 110297756} + - {fileID: 110295956} + - {fileID: 110292038} + m_ChildStateMachine: [] + m_ChildStateMachinePosition: [] + m_OrderedTransitions: + data: + first: {fileID: 110292038} + second: [] + data: + first: {fileID: 110295956} + second: [] + data: + first: {fileID: 110297756} + second: [] + data: + first: {fileID: 110200000} + second: [] + data: + first: {fileID: 0} + second: + - {fileID: 110100000} + - {fileID: 110148545} + - {fileID: 110156039} + - {fileID: 110185540} + m_MotionSetCount: 1 + m_AnyStatePosition: {x: 60, y: 12, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} diff --git a/Assets/Sprites/Animation/player_anim_controller.controller.meta b/Assets/Sprites/Animation/player_anim_controller.controller.meta new file mode 100644 index 0000000..e23f2a7 --- /dev/null +++ b/Assets/Sprites/Animation/player_anim_controller.controller.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 5e88aafb94f8b4a05be25a6a1f417180 +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Animation/player_idle.anim b/Assets/Sprites/Animation/player_idle.anim new file mode 100644 index 0000000..7976c5f --- /dev/null +++ b/Assets/Sprites/Animation/player_idle.anim @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_idle + serializedVersion: 4 + m_AnimationType: 2 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: bf0037c206d67144d8e55f3a177cfda6, type: 3} + - time: .600000024 + value: {fileID: 21300002, guid: bf0037c206d67144d8e55f3a177cfda6, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 5 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .800000012 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 1 + 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_Events: [] diff --git a/Assets/Sprites/Animation/player_idle.anim.meta b/Assets/Sprites/Animation/player_idle.anim.meta new file mode 100644 index 0000000..3629125 --- /dev/null +++ b/Assets/Sprites/Animation/player_idle.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 9761a6ce7969e46d58104f452efab378 +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Animation/player_shank.anim b/Assets/Sprites/Animation/player_shank.anim new file mode 100644 index 0000000..700832e --- /dev/null +++ b/Assets/Sprites/Animation/player_shank.anim @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_shank + serializedVersion: 4 + m_AnimationType: 2 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 8a7d20d19b593974894a1d833a048e02, type: 3} + - time: .5 + value: {fileID: 21300002, guid: 8a7d20d19b593974894a1d833a048e02, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 6 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .666666687 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 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_Events: [] diff --git a/Assets/Sprites/Animation/player_shank.anim.meta b/Assets/Sprites/Animation/player_shank.anim.meta new file mode 100644 index 0000000..6851c1a --- /dev/null +++ b/Assets/Sprites/Animation/player_shank.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: d331a9eea077c47528b6b5b7c66ed0bb +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Animation/player_swig.anim b/Assets/Sprites/Animation/player_swig.anim new file mode 100644 index 0000000..2b20c21 --- /dev/null +++ b/Assets/Sprites/Animation/player_swig.anim @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_swig + serializedVersion: 4 + m_AnimationType: 2 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} + - time: .0833333358 + value: {fileID: 21300002, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} + - time: .166666672 + value: {fileID: 21300004, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} + - time: .25 + value: {fileID: 21300006, guid: fe6d80532fd41334a8fb780b9851a64a, 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_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .333333343 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 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_Events: [] diff --git a/Assets/Sprites/Animation/player_swig.anim.meta b/Assets/Sprites/Animation/player_swig.anim.meta new file mode 100644 index 0000000..796c988 --- /dev/null +++ b/Assets/Sprites/Animation/player_swig.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ab7a492317ff445b685070d57beeaabc +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Animation/player_walk.anim b/Assets/Sprites/Animation/player_walk.anim new file mode 100644 index 0000000..0946564 --- /dev/null +++ b/Assets/Sprites/Animation/player_walk.anim @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: player_walk + serializedVersion: 4 + m_AnimationType: 2 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 6565e061d62cf29409fb2f7ebe0c3c15, type: 3} + - time: .0833333358 + value: {fileID: 21300002, guid: 6565e061d62cf29409fb2f7ebe0c3c15, 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_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .166666672 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 1 + 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_Events: [] diff --git a/Assets/Sprites/Animation/player_walk.anim.meta b/Assets/Sprites/Animation/player_walk.anim.meta new file mode 100644 index 0000000..52be53e --- /dev/null +++ b/Assets/Sprites/Animation/player_walk.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 5a4b76e5271dc4f11ba898f496a8db5d +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/demon-hero-idle.png.meta b/Assets/Sprites/demon-hero-idle.png.meta index ec01b43..ef889ac 100644 --- a/Assets/Sprites/demon-hero-idle.png.meta +++ b/Assets/Sprites/demon-hero-idle.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,26 +20,44 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: - sprites: [] + sprites: + - name: demon-hero-idle_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-idle_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} spritePackingTag: userData: diff --git a/Assets/Sprites/demon-hero-shank-1.png b/Assets/Sprites/demon-hero-shank-1.png deleted file mode 100644 index d419460..0000000 Binary files a/Assets/Sprites/demon-hero-shank-1.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-shank-1.png.meta b/Assets/Sprites/demon-hero-shank-1.png.meta deleted file mode 100644 index 1f18624..0000000 --- a/Assets/Sprites/demon-hero-shank-1.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: 684315f05351c4938bce1004e30145f0 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-shank-2.png b/Assets/Sprites/demon-hero-shank-2.png deleted file mode 100644 index 1a09cb9..0000000 Binary files a/Assets/Sprites/demon-hero-shank-2.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-shank-2.png.meta b/Assets/Sprites/demon-hero-shank-2.png.meta deleted file mode 100644 index eaba276..0000000 --- a/Assets/Sprites/demon-hero-shank-2.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: 8f871b50a4c5e462e8d5879eb04e8fc4 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-shank.png.meta b/Assets/Sprites/demon-hero-shank.png.meta index 9862248..b1433c0 100644 --- a/Assets/Sprites/demon-hero-shank.png.meta +++ b/Assets/Sprites/demon-hero-shank.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,26 +20,44 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: - sprites: [] + sprites: + - name: demon-hero-shank_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-shank_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} spritePackingTag: userData: diff --git a/Assets/Sprites/demon-hero-swig-1.png b/Assets/Sprites/demon-hero-swig-1.png deleted file mode 100644 index 08efb8c..0000000 Binary files a/Assets/Sprites/demon-hero-swig-1.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-swig-1.png.meta b/Assets/Sprites/demon-hero-swig-1.png.meta deleted file mode 100644 index a88a688..0000000 --- a/Assets/Sprites/demon-hero-swig-1.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: bf3613b402da9470594428284333b0bb -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-swig-2.png b/Assets/Sprites/demon-hero-swig-2.png deleted file mode 100644 index 6510df0..0000000 Binary files a/Assets/Sprites/demon-hero-swig-2.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-swig-2.png.meta b/Assets/Sprites/demon-hero-swig-2.png.meta deleted file mode 100644 index 708fe12..0000000 --- a/Assets/Sprites/demon-hero-swig-2.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: b0bf5913ffc1c4e3db8ffc75e8044979 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-swig-3.png b/Assets/Sprites/demon-hero-swig-3.png deleted file mode 100644 index 2ce6099..0000000 Binary files a/Assets/Sprites/demon-hero-swig-3.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-swig-3.png.meta b/Assets/Sprites/demon-hero-swig-3.png.meta deleted file mode 100644 index a7aefb2..0000000 --- a/Assets/Sprites/demon-hero-swig-3.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: e20d04627576c4c11b5acc4f81966dff -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-swig-4.png b/Assets/Sprites/demon-hero-swig-4.png deleted file mode 100644 index af46e0d..0000000 Binary files a/Assets/Sprites/demon-hero-swig-4.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-swig-4.png.meta b/Assets/Sprites/demon-hero-swig-4.png.meta deleted file mode 100644 index e68cc57..0000000 --- a/Assets/Sprites/demon-hero-swig-4.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: e9bf03e050c7945ebba62d1a11ee911f -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-swig.png.meta b/Assets/Sprites/demon-hero-swig.png.meta index 1ba4075..9ff7c90 100644 --- a/Assets/Sprites/demon-hero-swig.png.meta +++ b/Assets/Sprites/demon-hero-swig.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,26 +20,62 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: - sprites: [] + sprites: + - name: demon-hero-swig_0 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-swig_1 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-swig_2 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-swig_3 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} spritePackingTag: userData: diff --git a/Assets/Sprites/demon-hero-walk-1.png b/Assets/Sprites/demon-hero-walk-1.png deleted file mode 100644 index b74a4b9..0000000 Binary files a/Assets/Sprites/demon-hero-walk-1.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-walk-1.png.meta b/Assets/Sprites/demon-hero-walk-1.png.meta deleted file mode 100644 index e84537f..0000000 --- a/Assets/Sprites/demon-hero-walk-1.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: e57f0e5297e49478bba13bb85b3d8d84 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 1024 - textureSettings: - filterMode: 0 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 10 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-walk-2.png b/Assets/Sprites/demon-hero-walk-2.png deleted file mode 100644 index 137330f..0000000 Binary files a/Assets/Sprites/demon-hero-walk-2.png and /dev/null differ diff --git a/Assets/Sprites/demon-hero-walk-2.png.meta b/Assets/Sprites/demon-hero-walk-2.png.meta deleted file mode 100644 index abacf96..0000000 --- a/Assets/Sprites/demon-hero-walk-2.png.meta +++ /dev/null @@ -1,45 +0,0 @@ -fileFormatVersion: 2 -guid: c60a47de9fad34ad7ae8e30e5322cfe6 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 10 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Sprites/demon-hero-walk.png.meta b/Assets/Sprites/demon-hero-walk.png.meta index 07d020b..269fa13 100644 --- a/Assets/Sprites/demon-hero-walk.png.meta +++ b/Assets/Sprites/demon-hero-walk.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,26 +20,44 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: - sprites: [] + sprites: + - name: demon-hero-walk_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + - name: demon-hero-walk_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} spritePackingTag: userData: