From a09a16a00dc4449bb265d9ffb6797e6b7256585d Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 11:30:03 -0500 Subject: [PATCH 01/11] Add rest of basic player animations --- Assets/Scripts/Player.cs | 4 +- Assets/Sprites/Player/JrDevFall.anim | 69 +++++ Assets/Sprites/Player/JrDevFall.anim.meta | 8 + Assets/Sprites/Player/JrDevIdle.anim | 9 +- Assets/Sprites/Player/JrDevJump.anim | 69 +++++ Assets/Sprites/Player/JrDevJump.anim.meta | 8 + Assets/Sprites/Player/JrDevRun.anim | 18 +- Assets/Sprites/Player/Player.controller | 317 +++++++++++++++++++--- 8 files changed, 442 insertions(+), 60 deletions(-) create mode 100644 Assets/Sprites/Player/JrDevFall.anim create mode 100644 Assets/Sprites/Player/JrDevFall.anim.meta create mode 100644 Assets/Sprites/Player/JrDevJump.anim create mode 100644 Assets/Sprites/Player/JrDevJump.anim.meta diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d36ff54..36cb290 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -95,11 +95,11 @@ public class Player : MonoBehaviour { if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon) { - animator.SetBool("IsRunning", true); + //animator.SetBool("IsRunning", true); } else { - animator.SetBool("IsRunning", false); + //animator.SetBool("IsRunning", false); } } } diff --git a/Assets/Sprites/Player/JrDevFall.anim b/Assets/Sprites/Player/JrDevFall.anim new file mode 100644 index 0000000..363d92f --- /dev/null +++ b/Assets/Sprites/Player/JrDevFall.anim @@ -0,0 +1,69 @@ +%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: JrDevFall + 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: 111747663661122317, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + 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: 111747663661122317, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 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_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/JrDevFall.anim.meta b/Assets/Sprites/Player/JrDevFall.anim.meta new file mode 100644 index 0000000..e659124 --- /dev/null +++ b/Assets/Sprites/Player/JrDevFall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c548f94c5ec43584b96000eba8131665 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDevIdle.anim b/Assets/Sprites/Player/JrDevIdle.anim index 1040853..114a902 100644 --- a/Assets/Sprites/Player/JrDevIdle.anim +++ b/Assets/Sprites/Player/JrDevIdle.anim @@ -66,11 +66,4 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/JrDevJump.anim b/Assets/Sprites/Player/JrDevJump.anim new file mode 100644 index 0000000..9d2e8cd --- /dev/null +++ b/Assets/Sprites/Player/JrDevJump.anim @@ -0,0 +1,69 @@ +%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: JrDevJump + 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: -8899148160246948828, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + 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: -8899148160246948828, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 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_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/JrDevJump.anim.meta b/Assets/Sprites/Player/JrDevJump.anim.meta new file mode 100644 index 0000000..fbf13be --- /dev/null +++ b/Assets/Sprites/Player/JrDevJump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d96d85916a6600498f0b701f6fa0dbd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDevRun.anim b/Assets/Sprites/Player/JrDevRun.anim index df48157..0d10626 100644 --- a/Assets/Sprites/Player/JrDevRun.anim +++ b/Assets/Sprites/Player/JrDevRun.anim @@ -29,7 +29,7 @@ AnimationClip: path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -70,18 +70,4 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0.2 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 798b5bb..2509d0e 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -11,20 +11,74 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2991084837782200938} - m_Position: {x: 290, y: 190, z: 0} + m_Position: {x: -120, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 218451160527659384} - m_Position: {x: 280, y: 10, z: 0} + m_Position: {x: -120, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3835953866042416} + m_Position: {x: 160, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6251363122210737033} + m_Position: {x: 160, y: 270, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 3708718943660755162} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: -100, y: 40, z: 0} + m_EntryPosition: {x: -100, y: 80, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2991084837782200938} +--- !u!1101 &-4427708455344951909 +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: -2991084837782200938} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4109286016316069763 +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: IsRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2991084837782200938 AnimatorState: serializedVersion: 5 @@ -36,7 +90,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6827210264901212170} + - {fileID: -4109286016316069763} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -67,6 +121,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: IsGround + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: YVelocity + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -80,6 +146,60 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &3835953866042416 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevJump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6603220255420949708} + - {fileID: -4427708455344951909} + - {fileID: 52732914799995005} + 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: 1d96d85916a6600498f0b701f6fa0dbd, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &52732914799995005 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &218451160527659384 AnimatorState: serializedVersion: 5 @@ -91,7 +211,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 3208414158787817513} + - {fileID: 8688058787396499934} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -107,7 +227,161 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &3208414158787817513 +--- !u!1101 &577109220446267355 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &666109352704067654 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: YVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3835953866042416} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3708718943660755162 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3835953866042416} + 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: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4734573323873509709 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2991084837782200938} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6251363122210737033 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevFall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 666109352704067654} + - {fileID: 4734573323873509709} + - {fileID: 577109220446267355} + 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: c548f94c5ec43584b96000eba8131665, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6603220255420949708 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: YVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6251363122210737033} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8688058787396499934 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -127,32 +401,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &6827210264901212170 -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: IsRunning - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 218451160527659384} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 From f16895d02c7acc7db8e26391b4a143faedbafcfe Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sat, 1 Feb 2020 11:36:57 -0500 Subject: [PATCH 02/11] stamina bar asset --- Assets/Sprites/Hud.meta | 8 ++ Assets/Sprites/Hud/StaminaBar.png | Bin 0 -> 373 bytes Assets/Sprites/Hud/StaminaBar.png.meta | 115 +++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 Assets/Sprites/Hud.meta create mode 100644 Assets/Sprites/Hud/StaminaBar.png create mode 100644 Assets/Sprites/Hud/StaminaBar.png.meta diff --git a/Assets/Sprites/Hud.meta b/Assets/Sprites/Hud.meta new file mode 100644 index 0000000..7c0b3e6 --- /dev/null +++ b/Assets/Sprites/Hud.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9931456aa6e9e840b3bd497e9b0803d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/StaminaBar.png b/Assets/Sprites/Hud/StaminaBar.png new file mode 100644 index 0000000000000000000000000000000000000000..0c146356043227a66611b0fabc8b4f7468d6b281 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*h@TpUD=;7F$yR${XHen2NV)7 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6;RN#5=*4F5rJ!QSPQK_VqVe!&nC^9bo$pvXQ?7srr_Id7-Naxp9N zv|NsUCs@74?u$UJhL0}yyNo2Mqx)Rh$_}R3JzmcsuygLAWyjir?EEeLauZA1*b>%C zNp0fRsIq_O8q9O<6|ZA(*kiBwIS2cu7K&c!UDU=F-g@_}PT`|zjB_kl3YH3m`#At*XHIpUp>h zi)%wYYc9i)_lr0gZl&ujT6lg%a=5nxlMq7 Date: Sat, 1 Feb 2020 11:44:43 -0500 Subject: [PATCH 03/11] Finished event control displaying and movement --- Assets/Scenes/LevelOne.unity | 8 ++-- Assets/Scripts/CameraMovement.cs.meta | 2 +- Assets/Scripts/EventControlsDisplay.cs | 52 +++++++++++++++------ Assets/Scripts/EventControlsDisplay.cs.meta | 2 +- Assets/Scripts/Player.cs | 2 +- Assets/Scripts/Player.cs.meta | 2 +- Assets/Sprites/Player/Player.controller | 2 +- 7 files changed, 47 insertions(+), 23 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index a54d416..ea191cf 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -168,8 +168,8 @@ MonoBehaviour: camera: {fileID: 1337282922} tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} framesPerControlTile: 15 - nextControlYOffset: 1 - nextControlXOffset: -2 + nextControlYOffset: 4 + nextControlXOffset: 1.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -388,7 +388,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 1671840916} - offsetY: 0 + offsetY: 2 interpolate: 0.1 --- !u!4 &1146013793 stripped Transform: @@ -521,7 +521,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.5, y: -4, z: 0} + m_LocalPosition: {x: -5, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} diff --git a/Assets/Scripts/CameraMovement.cs.meta b/Assets/Scripts/CameraMovement.cs.meta index a7d36b4..e4e1421 100644 --- a/Assets/Scripts/CameraMovement.cs.meta +++ b/Assets/Scripts/CameraMovement.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs index b80931b..f8e322e 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -8,10 +8,13 @@ public class EventControlsDisplay : MonoBehaviour [SerializeField] private Camera camera; [SerializeField] private Tile tile; [SerializeField] private float framesPerControlTile = 15; - [SerializeField] private int nextControlYOffset = 1; - [SerializeField] private int nextControlXOffset = -2; + [SerializeField] private float nextControlYOffset = 0; + [SerializeField] private float nextControlXOffset = 0; private Tilemap tilemap; + private int maxNumberOfControlTiles = 3; + private int numberOfControlTilesSet = 0; + private Vector3Int? initialCameraPosition; private int nextControlAccumalator = 0; private int framePerSecond => 60; @@ -23,25 +26,46 @@ public class EventControlsDisplay : MonoBehaviour private void Update() { - - if (nextControlAccumalator >= framesPerControlTile && nextControlXOffset < 1) - { - tilemap.SetTile(GetCameraPosition() + new Vector3Int(nextControlXOffset, nextControlYOffset, 0), tile); - nextControlAccumalator = 0; - nextControlXOffset++; - } - else - { - //transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .1f); - } - + SetTile(); + SetTileMapPosition(); + nextControlAccumalator++; } + private void SetTile() + { + if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles) + { + if (initialCameraPosition == null) + initialCameraPosition = GetCameraPosition(); + + tilemap.SetTile(GetNextTilePosition(), tile); + + nextControlAccumalator = 0; + numberOfControlTilesSet++; + } + else if (numberOfControlTilesSet == maxNumberOfControlTiles) + { + initialCameraPosition = null; + } + } + private Vector3Int GetCameraPosition() { return new Vector3Int((int) camera.transform.position.x, (int) camera.transform.position.y, (int) camera.transform.position.z); } + + private Vector3Int GetNextTilePosition() + { + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0)) + .GetValueOrDefault(); + } + + private void SetTileMapPosition() + { + transform.position = camera.transform.position + + new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset + } } diff --git a/Assets/Scripts/EventControlsDisplay.cs.meta b/Assets/Scripts/EventControlsDisplay.cs.meta index 8ad8c89..84457e3 100644 --- a/Assets/Scripts/EventControlsDisplay.cs.meta +++ b/Assets/Scripts/EventControlsDisplay.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d36ff54..ab93479 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -39,7 +39,7 @@ public class Player : MonoBehaviour private void Jump() { // Jump - if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround()) + if (Input.GetKeyDown(KeyCode.Space) && IsPlayerOnGround()) { rigidBody.velocity += new Vector2(0, jumpSpeed); rigidBody.velocity = new Vector2(rigidBody.velocity.x, diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player.cs.meta index 58fde68..b1db695 100644 --- a/Assets/Scripts/Player.cs.meta +++ b/Assets/Scripts/Player.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 50 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 798b5bb..8791c72 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -65,7 +65,7 @@ AnimatorController: m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 + m_DefaultBool: 1 m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 From 9a1f4d63f4e025165bddf411e51959211adace32 Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 11:51:23 -0500 Subject: [PATCH 04/11] Modify player logic to use animation parameters --- Assets/Scripts/Player.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 36cb290..0012385 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -33,7 +33,8 @@ public class Player : MonoBehaviour Jump(); Run(); FlipSprite(); - MarkAsRunning(); + //MarkAsRunning(); + HandleAnimations(); } private void Jump() @@ -95,11 +96,18 @@ public class Player : MonoBehaviour { if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon) { - //animator.SetBool("IsRunning", true); + animator.SetBool("IsRunning", true); } else { - //animator.SetBool("IsRunning", false); + animator.SetBool("IsRunning", false); } } + + private void HandleAnimations() + { + animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > float.Epsilon); + animator.SetBool("IsOnGround", IsPlayerOnGround()); + animator.SetFloat("YVelocity", rigidBody.velocity.y); + } } From 9a6f7f7a3790ab889aac64701b1c2f0174f6ce8f Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 13:27:07 -0500 Subject: [PATCH 05/11] Finished making successful path for event controls --- Assets/Model.meta | 8 ++ Assets/Model/EventControlTile.cs | 26 ++++ Assets/Model/EventControlTile.cs.meta | 11 ++ Assets/Scenes/LevelOne.unity | 5 +- Assets/Scripts/EventControls.cs | 130 ++++++++++++++++++ ...sDisplay.cs.meta => EventControls.cs.meta} | 0 Assets/Scripts/EventControlsDisplay.cs | 71 ---------- Assets/Scripts/Player.cs | 2 +- .../Sprites/Controls/Control W Success.asset | 36 +++++ .../Controls/Control W Success.asset.meta | 8 ++ Assets/Sprites/Palette/Event Controls.prefab | 21 ++- 11 files changed, 239 insertions(+), 79 deletions(-) create mode 100644 Assets/Model.meta create mode 100644 Assets/Model/EventControlTile.cs create mode 100644 Assets/Model/EventControlTile.cs.meta create mode 100644 Assets/Scripts/EventControls.cs rename Assets/Scripts/{EventControlsDisplay.cs.meta => EventControls.cs.meta} (100%) delete mode 100644 Assets/Scripts/EventControlsDisplay.cs create mode 100644 Assets/Sprites/Controls/Control W Success.asset create mode 100644 Assets/Sprites/Controls/Control W Success.asset.meta diff --git a/Assets/Model.meta b/Assets/Model.meta new file mode 100644 index 0000000..f22c276 --- /dev/null +++ b/Assets/Model.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 477280fac62d2934f9d0aa49bedf3251 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/EventControlTile.cs b/Assets/Model/EventControlTile.cs new file mode 100644 index 0000000..95fd97f --- /dev/null +++ b/Assets/Model/EventControlTile.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.Tilemaps; + +namespace Assets.Model +{ + public class EventControlTile + { + public KeyCode keyCode; + public Tile tile; + public Tile successTile; + public Vector3Int position; + + public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position) + { + this.keyCode = keyCode; + this.tile = tile; + this.successTile = successTile; + this.position = position; + } + } +} diff --git a/Assets/Model/EventControlTile.cs.meta b/Assets/Model/EventControlTile.cs.meta new file mode 100644 index 0000000..fff2c4e --- /dev/null +++ b/Assets/Model/EventControlTile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 651afb7ac1f7a324b8b21db2b04ff151 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index ea191cf..bcf44c8 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -167,9 +167,10 @@ MonoBehaviour: m_EditorClassIdentifier: camera: {fileID: 1337282922} tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + successTile: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} framesPerControlTile: 15 nextControlYOffset: 4 - nextControlXOffset: 1.5 + nextControlXOffset: 2.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -389,7 +390,7 @@ MonoBehaviour: m_EditorClassIdentifier: player: {fileID: 1671840916} offsetY: 2 - interpolate: 0.1 + interpolate: 0.6 --- !u!4 &1146013793 stripped Transform: m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11, diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs new file mode 100644 index 0000000..08dd965 --- /dev/null +++ b/Assets/Scripts/EventControls.cs @@ -0,0 +1,130 @@ +using Assets.Model; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Tilemaps; + +public class EventControls : MonoBehaviour +{ + [SerializeField] private Camera camera; + [SerializeField] private Tile tile; + [SerializeField] private Tile successTile; + [SerializeField] private float framesPerControlTile = 15; + [SerializeField] private float nextControlYOffset = 0; + [SerializeField] private float nextControlXOffset = 0; + [SerializeField] private float tileMapClearDelayInSeconds = 0.5f; + + private Tilemap tilemap; + + /* For drawing event control tiles */ + private Vector3Int? initialCameraPosition; + private int maxNumberOfControlTiles = 3; + private int numberOfControlTilesSet = 0; + private int nextControlAccumalator = 0; + + private bool eventDrawn = false; + private bool eventTriggered = false; + private int eventCycleInSeconds = 4; + private int eventCycleAccumalator = 0; + private int tileMapClearDelayAccumalator = 0; + private EventControlTile currentEventControl; + + private Queue eventControlTilesInCycle; + + private int framesPerSecond => 60; + + private void Start() + { + tilemap = GetComponent(); + eventControlTilesInCycle = new Queue(); + eventTriggered = true; // TODO: TEST + } + + private void Update() + { + if (eventTriggered) + { + SetTile(); + SetTileMapPosition(); + } + else + { + nextControlAccumalator = 0; + } + + if (eventDrawn && eventTriggered) + { + if (currentEventControl == null) + currentEventControl = eventControlTilesInCycle.Dequeue(); + + if (Input.GetKeyDown(currentEventControl.keyCode)) + { + tilemap.SetTile(currentEventControl.position, currentEventControl.successTile); + + currentEventControl = null; + if (eventControlTilesInCycle.Count == 0) + { + eventTriggered = false; + } + } + } + + if (eventDrawn && !eventTriggered) + { + if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond) + { + tilemap.ClearAllTiles(); + tileMapClearDelayAccumalator = 0; + eventDrawn = false; + } + else + { + tileMapClearDelayAccumalator++; + } + } + } + + private void SetTile() + { + if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles) + { + if (initialCameraPosition == null) + initialCameraPosition = GetCameraPosition(); + + // Store tiles for event cycle + var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition()); /* TODO: Hard code */ + eventControlTilesInCycle.Enqueue(eventControlTile); + + tilemap.SetTile(eventControlTile.position, tile); + + nextControlAccumalator = 0; + numberOfControlTilesSet++; + } + else if (numberOfControlTilesSet == maxNumberOfControlTiles) + { + initialCameraPosition = null; + eventDrawn = true; + } + + nextControlAccumalator++; + } + + private Vector3Int GetCameraPosition() + { + return new Vector3Int((int)camera.transform.position.x, + (int)camera.transform.position.y, + (int)camera.transform.position.z); + } + + private Vector3Int GetNextTilePosition() + { + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0)) + .GetValueOrDefault(); + } + + private void SetTileMapPosition() + { + transform.position = camera.transform.position + + new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset + } +} diff --git a/Assets/Scripts/EventControlsDisplay.cs.meta b/Assets/Scripts/EventControls.cs.meta similarity index 100% rename from Assets/Scripts/EventControlsDisplay.cs.meta rename to Assets/Scripts/EventControls.cs.meta diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs deleted file mode 100644 index f8e322e..0000000 --- a/Assets/Scripts/EventControlsDisplay.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Tilemaps; - -public class EventControlsDisplay : MonoBehaviour -{ - [SerializeField] private Camera camera; - [SerializeField] private Tile tile; - [SerializeField] private float framesPerControlTile = 15; - [SerializeField] private float nextControlYOffset = 0; - [SerializeField] private float nextControlXOffset = 0; - - private Tilemap tilemap; - private int maxNumberOfControlTiles = 3; - private int numberOfControlTilesSet = 0; - private Vector3Int? initialCameraPosition; - private int nextControlAccumalator = 0; - - private int framePerSecond => 60; - - private void Start() - { - tilemap = GetComponent(); - } - - private void Update() - { - SetTile(); - SetTileMapPosition(); - - nextControlAccumalator++; - } - - private void SetTile() - { - if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles) - { - if (initialCameraPosition == null) - initialCameraPosition = GetCameraPosition(); - - tilemap.SetTile(GetNextTilePosition(), tile); - - nextControlAccumalator = 0; - numberOfControlTilesSet++; - } - else if (numberOfControlTilesSet == maxNumberOfControlTiles) - { - initialCameraPosition = null; - } - } - - private Vector3Int GetCameraPosition() - { - return new Vector3Int((int) camera.transform.position.x, - (int) camera.transform.position.y, - (int) camera.transform.position.z); - } - - private Vector3Int GetNextTilePosition() - { - return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0)) - .GetValueOrDefault(); - } - - private void SetTileMapPosition() - { - transform.position = camera.transform.position + - new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset - } -} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 295ce60..c82d6d1 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -107,7 +107,7 @@ public class Player : MonoBehaviour private void HandleAnimations() { animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > float.Epsilon); - animator.SetBool("IsOnGround", IsPlayerOnGround()); + animator.SetBool("IsGround", IsPlayerOnGround()); animator.SetFloat("YVelocity", rigidBody.velocity.y); } } diff --git a/Assets/Sprites/Controls/Control W Success.asset b/Assets/Sprites/Controls/Control W Success.asset new file mode 100644 index 0000000..4bedf93 --- /dev/null +++ b/Assets/Sprites/Controls/Control W Success.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Control W Success + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_Color: {r: 0.066082224, g: 0.9339623, b: 0.12693371, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Control W Success.asset.meta b/Assets/Sprites/Controls/Control W Success.asset.meta new file mode 100644 index 0000000..8f04672 --- /dev/null +++ b/Assets/Sprites/Controls/Control W Success.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cf7a50810d16f2468acc06180743d07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Palette/Event Controls.prefab b/Assets/Sprites/Palette/Event Controls.prefab index 7288274..1e82ddc 100644 --- a/Assets/Sprites/Palette/Event Controls.prefab +++ b/Assets/Sprites/Palette/Event Controls.prefab @@ -85,6 +85,15 @@ Tilemap: m_GameObject: {fileID: 7903917978724306658} m_Enabled: 1 m_Tiles: + - first: {x: -2, y: 1, z: 0} + second: + m_TileIndex: 1 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 0, y: 1, z: 0} second: m_TileIndex: 0 @@ -98,11 +107,13 @@ Tilemap: m_TileAssetArray: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} - m_TileSpriteArray: - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} m_TileMatrixArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: e00: 1 e01: 0 @@ -121,12 +132,12 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 2, z: 1} + m_Origin: {x: -2, y: 0, z: 0} + m_Size: {x: 3, y: 2, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: From a21e6fcff099f51d020f40c4a3c4bde392d0d26f Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sat, 1 Feb 2020 13:37:36 -0500 Subject: [PATCH 06/11] add heart asset --- Assets/Sprites/Hud/Heart.png | Bin 0 -> 485 bytes Assets/Sprites/Hud/Heart.png.meta | 115 ++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 Assets/Sprites/Hud/Heart.png create mode 100644 Assets/Sprites/Hud/Heart.png.meta diff --git a/Assets/Sprites/Hud/Heart.png b/Assets/Sprites/Hud/Heart.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a2b18639f66e9a8393e201c308d1fc5beb7aca GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9>?NMQuIx{k7=@H9g!BC-0)@m& zTq8*YAD9|cD(^JOjkfDywj@H&@%L6*cWL0!@Vw{sQ{gcGJPEA?(&9j z)n>u(GOlM?N1XerqnA_E)u~l!vZZvY;|#&)Py5AEQ#Eu7emhUl)(UrF(OSW-$^Cxs zW5fSPuN)HzObng#_JYawMH<;XhosEE-izJB+V^OBs8oJz@HC6Ky&f%#D<*7gi+JwX zC&XA77ua%V{e({)SGtdH-F~~_hVs?FSBy@7eev2nI&$umya^jWP3dFVdQ&MBb@001?+-v9sr literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Hud/Heart.png.meta b/Assets/Sprites/Hud/Heart.png.meta new file mode 100644 index 0000000..eebd685 --- /dev/null +++ b/Assets/Sprites/Hud/Heart.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 80eebf55b1280784a8820eb8444c6a7b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 804a4764cb64f4f5227fba50222900eac287c60c Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 14:01:54 -0500 Subject: [PATCH 07/11] Add Gio bug animation --- Assets/Sprites/Collectibles/Coffee.png | Bin 0 -> 357 bytes Assets/Sprites/Collectibles/Coffee.png.meta | 151 +++++++++++++++ Assets/Sprites/Collectibles/pizza.png.meta | 12 +- Assets/Sprites/Enemy/GioBug.meta | 8 + Assets/Sprites/Enemy/GioBug/GioBug.png | Bin 0 -> 978 bytes Assets/Sprites/Enemy/GioBug/GioBug.png.meta | 199 ++++++++++++++++++++ Assets/Sprites/Enemy/KatBug/KatBug.png.meta | 40 ++-- Assets/Sprites/Hud/StaminaBar.png.meta | 36 ++++ 8 files changed, 420 insertions(+), 26 deletions(-) create mode 100644 Assets/Sprites/Collectibles/Coffee.png create mode 100644 Assets/Sprites/Collectibles/Coffee.png.meta create mode 100644 Assets/Sprites/Enemy/GioBug.meta create mode 100644 Assets/Sprites/Enemy/GioBug/GioBug.png create mode 100644 Assets/Sprites/Enemy/GioBug/GioBug.png.meta diff --git a/Assets/Sprites/Collectibles/Coffee.png b/Assets/Sprites/Collectibles/Coffee.png new file mode 100644 index 0000000000000000000000000000000000000000..96dad336010a7863f648932ba04b7b763d5da997 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9>?NMQuIx{k7@3(gKkjdC0}6?k zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwDAd!+FzhH=nd4zN=P-LB_i(^Q|oa7(=ss{{Q zc#;wlj`VvNyg1)1D$o)-ZG$7r-KNvA5j=+;i`l$eG_!kxtm~d)w>gfCY&=I47V$&{ zGduBUJ8&%FaAUgIFRRd!DIm{`BIS1MB3LJ35>#_}il`X~^1X%CSgt z1@9q-Ndn3b+LCVc@G>+r$T@s4Xkr&mV@TxBsi;t%-70fqiKI)=oyR6G?BAtyZZ%jm j-SNou%|CdQL>U-%FWDN%>L}O^bUA~ktDnm{r-UW|R&{f% literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Collectibles/Coffee.png.meta b/Assets/Sprites/Collectibles/Coffee.png.meta new file mode 100644 index 0000000..b6df58e --- /dev/null +++ b/Assets/Sprites/Collectibles/Coffee.png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: 66b61c174b527e14e9b5ad791405c46e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Collectibles/pizza.png.meta b/Assets/Sprites/Collectibles/pizza.png.meta index 22d68ce..b218ce9 100644 --- a/Assets/Sprites/Collectibles/pizza.png.meta +++ b/Assets/Sprites/Collectibles/pizza.png.meta @@ -63,7 +63,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -75,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -87,7 +87,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -99,7 +99,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -111,7 +111,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,7 +123,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Enemy/GioBug.meta b/Assets/Sprites/Enemy/GioBug.meta new file mode 100644 index 0000000..452bc84 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b10abe26d9fb8b4b8833e1f030d78f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.png b/Assets/Sprites/Enemy/GioBug/GioBug.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4c5ed7dc745c3edbfc348aac2b2984a5edb7d3 GIT binary patch literal 978 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*QtTz3zOL*~m>7jjP2{86bbvzQ zC9V-A!TD(=<%vb94DLQIKw}ijQi~Lf^-Ky|mplY2;V3Eaa|g;81KA8-4Vv;miY49A z*O7r?V?XzwL{=c5Ey>&6h2cL4F4((#GDxH($S)X3|6%x(R%|T9z`!i+>EaktG3V`! zvxRpIcv?fdPJ1xwU2&g2)u`si%&o#_g9LuCHz+u=Jlx~#w%faopMSy=nd6T?#!uU% z&Y@S`^nfy|-XY^BcfyeaDsA6h{X3<=pv|nkF;(t4TS8ufbCKBoYUb)gmw(=sz9BsC z-1~b6=6xus`_8uK^KSD8viJ5f=KeeW{(NxvgS*lfn*E>b+_itw;oas7j@)lh_u_be zuc7>3C!5{9?D=um?eBf(P2l~{!yH?ERR4|efgrFc{-zA-TdW^Tvu$XqZ);r2Z}|St zJKl=t<@pD!ffirlS?8?%CpP{C_h;rCmm50fAKF>UAT25JO#RWsAFN_`qyv!Nk+^V)cfsE#e`izPgjtQ}AHTJE^!mE*F3CR+=O;K`(zce`5&qxC+qn6PbFyC7 zpOuX(9`ByrxaWH?+bi=$=QPaiv-}N`YeadjIP7Hm7k6g$e4~K!*yY6aFWEXk&J_l%1|W$KCTpg`b~neB{^9 zD<(^F*={Mkbp78yDPD!euIktBN$ozPaWsU{WZw@Z^M*aYHaxlzbT2@JzmoZxdBBFn z8-5wwtxknefvj~nYR6|agf_@ZI^goUZ^#^c+! zwjAN=HvJXFv_M)jF44eT|BL(6?58;{aRF>=-&8U_c`EijP5=5MZ}ImFlH#{BOO!Dh zHwfSH43Ajm{!-3VnIZDhmrbu&18NR@d05H$T)dpO;n&~1_9A~5*Y|nnEE*~bEg1H^ zZDKHqnbNp>Hb3ivMRoljvXA&?Z(RJADZu`g4a2AD`x&(Yqys19%=!+@FbtlqelF{r G5}E)ldb4K$ literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.png.meta b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta new file mode 100644 index 0000000..eb3a924 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta @@ -0,0 +1,199 @@ +fileFormatVersion: 2 +guid: 843576248a0c2dc4eb92d627ffe951a6 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7874731793569252650 + second: GioBug0 + - first: + 213: -2140509875661681078 + second: GioBug1 + externalObjects: {} + serializedVersion: 10 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: GioBug0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 11ac28c96939e93498dfa9120ebda5eb + internalID: 7874731793569252650 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GioBug1 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 64 + height: 64 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8d27cd8b1810d6546997ad498e0065a1 + internalID: -2140509875661681078 + 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/Sprites/Enemy/KatBug/KatBug.png.meta b/Assets/Sprites/Enemy/KatBug/KatBug.png.meta index 145df43..f214b72 100644 --- a/Assets/Sprites/Enemy/KatBug/KatBug.png.meta +++ b/Assets/Sprites/Enemy/KatBug/KatBug.png.meta @@ -4,16 +4,16 @@ TextureImporter: internalIDToNameTable: - first: 213: 5875687446670976453 - second: KatBug_0 + second: KatBug0 - first: 213: 7736766425618006454 - second: KatBug_1 + second: KatBug1 - first: 213: 3280950127566773269 - second: KatBug_2 + second: KatBug2 - first: 213: -8924824664453206661 - second: KatBug_3 + second: KatBug3 externalObjects: {} serializedVersion: 10 mipmaps: @@ -110,84 +110,84 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: KatBug_0 + name: KatBug0 rect: serializedVersion: 2 x: 0 y: 64 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 6f4e391968fcf9d49970d99d64690f0a + spriteID: f5924d52da99945408e636c8884a6990 internalID: 5875687446670976453 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_1 + name: KatBug1 rect: serializedVersion: 2 x: 64 y: 64 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 2f7c5fbbb87128a479ae7e7eea6295d8 + spriteID: 2cb774fc754a1594991edf9c9bbb933e internalID: 7736766425618006454 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_2 + name: KatBug2 rect: serializedVersion: 2 x: 0 y: 0 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1d2d498f1c1e82045a815f4805ce3e37 + spriteID: 79c1bd5e65859c44dbe562d3a59dc60b internalID: 3280950127566773269 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_3 + name: KatBug3 rect: serializedVersion: 2 x: 64 y: 0 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: bacae02e7339d8b4cb8459a0ee11b233 + spriteID: e0a2841ce7fc12a49946571cd2410282 internalID: -8924824664453206661 vertices: [] indices: diff --git a/Assets/Sprites/Hud/StaminaBar.png.meta b/Assets/Sprites/Hud/StaminaBar.png.meta index 46be896..918c344 100644 --- a/Assets/Sprites/Hud/StaminaBar.png.meta +++ b/Assets/Sprites/Hud/StaminaBar.png.meta @@ -94,6 +94,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] From a7b7061a4c4cde7438f94fb75b6f41aab478de4d Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 14:37:59 -0500 Subject: [PATCH 08/11] Set up enemy animation and HUD elements --- Assets/Scenes/LevelOne.unity | 261 ++++++++++++++++++ Assets/Sprites/Enemy/GioBug/GioBug.anim | 73 +++++ Assets/Sprites/Enemy/GioBug/GioBug.anim.meta | 8 + .../Enemy/GioBug/GioBugAnim.controller | 72 +++++ .../Enemy/GioBug/GioBugAnim.controller.meta | 8 + Assets/Sprites/Enemy/KatBug/KatBug.anim | 81 ++++++ Assets/Sprites/Enemy/KatBug/KatBug.anim.meta | 8 + .../Enemy/KatBug/KatBugAnim.controller | 72 +++++ .../Enemy/KatBug/KatBugAnim.controller.meta | 8 + Assets/Sprites/Hud/StaminaBar.png.meta | 4 +- 10 files changed, 593 insertions(+), 2 deletions(-) create mode 100644 Assets/Sprites/Enemy/GioBug/GioBug.anim create mode 100644 Assets/Sprites/Enemy/GioBug/GioBug.anim.meta create mode 100644 Assets/Sprites/Enemy/GioBug/GioBugAnim.controller create mode 100644 Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta create mode 100644 Assets/Sprites/Enemy/KatBug/KatBug.anim create mode 100644 Assets/Sprites/Enemy/KatBug/KatBug.anim.meta create mode 100644 Assets/Sprites/Enemy/KatBug/KatBugAnim.controller create mode 100644 Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index bcf44c8..beb0f80 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -171,6 +171,7 @@ MonoBehaviour: framesPerControlTile: 15 nextControlYOffset: 4 nextControlXOffset: 2.5 + tileMapClearDelayInSeconds: 0.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -254,6 +255,186 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &136431330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136431333} + - component: {fileID: 136431332} + - component: {fileID: 136431331} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &136431331 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4, y: 4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &136431332 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8b1593eba53dfd848ba134d626f63f6c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &136431333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.728933, y: -5.9760585, z: -27.586058} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &367096168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367096169} + - component: {fileID: 367096170} + m_Layer: 0 + m_Name: StaminaBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &367096169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367096168} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.39, y: 6.39, z: 6.1276217} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &367096170 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367096168} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 80eebf55b1280784a8820eb8444c6a7b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 4.5, y: 1.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &414764564 PrefabInstance: m_ObjectHideFlags: 0 @@ -880,6 +1061,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2086987803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2086987804} + - component: {fileID: 2086987805} + m_Layer: 0 + m_Name: LifeBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2086987804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086987803} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.85, y: -6.83, z: 8.230801} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2086987805 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086987803} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 82c7c7c05d293dd46aa29dd621784808, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 10, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2120494076 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.anim b/Assets/Sprites/Enemy/GioBug/GioBug.anim new file mode 100644 index 0000000..2fd35b4 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.anim @@ -0,0 +1,73 @@ +%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: GioBug + 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: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + - time: 0.125 + value: {fileID: -2140509875661681078, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, type: 3} + - {fileID: -2140509875661681078, guid: 843576248a0c2dc4eb92d627ffe951a6, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 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_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.anim.meta b/Assets/Sprites/Enemy/GioBug/GioBug.anim.meta new file mode 100644 index 0000000..ce0906f --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35774ad3ac32bb641beb7c3b9e10f8d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller new file mode 100644 index 0000000..e68b27c --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-2351193573875906098 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GioBug + m_Speed: 1 + 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: 35774ad3ac32bb641beb7c3b9e10f8d8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GioBugAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6471426929848467592} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &6471426929848467592 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2351193573875906098} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2351193573875906098} diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta new file mode 100644 index 0000000..e3edc2d --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b76bb1b393cc12742a8731288b81b071 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/KatBug/KatBug.anim b/Assets/Sprites/Enemy/KatBug/KatBug.anim new file mode 100644 index 0000000..0864444 --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBug.anim @@ -0,0 +1,81 @@ +%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: KatBug + 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: 7736766425618006454, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.25 + value: {fileID: 3280950127566773269, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.5 + value: {fileID: -8924824664453206661, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.75 + value: {fileID: 5875687446670976453, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 7736766425618006454, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: 3280950127566773269, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: -8924824664453206661, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: 5875687446670976453, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 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_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Enemy/KatBug/KatBug.anim.meta b/Assets/Sprites/Enemy/KatBug/KatBug.anim.meta new file mode 100644 index 0000000..ee138a9 --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBug.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 230aeafb651d43a4ba0b692f099ed9c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller new file mode 100644 index 0000000..73869df --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8082923426992956091 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6909292311268931723} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6909292311268931723} +--- !u!1102 &-6909292311268931723 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KatBug + m_Speed: 1 + 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: 230aeafb651d43a4ba0b692f099ed9c4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KatBugAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8082923426992956091} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta new file mode 100644 index 0000000..ca3aa8f --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b1593eba53dfd848ba134d626f63f6c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/StaminaBar.png.meta b/Assets/Sprites/Hud/StaminaBar.png.meta index 918c344..0bbb57d 100644 --- a/Assets/Sprites/Hud/StaminaBar.png.meta +++ b/Assets/Sprites/Hud/StaminaBar.png.meta @@ -42,11 +42,11 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 16 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 12, y: 14, z: 12, w: 12} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 From a17c6048fb3ad64ae8df53e9722ade95eb7885dd Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 14:39:17 -0500 Subject: [PATCH 09/11] event controls WIP --- Assets/Prefabs/Bug.prefab | 7 +- Assets/Scenes/LevelOne.unity | 734 ++++++++++++-------------------- Assets/Scripts/BugMovement.cs | 10 +- Assets/Scripts/EventControls.cs | 114 +++-- Assets/Scripts/Player.cs | 8 +- 5 files changed, 378 insertions(+), 495 deletions(-) diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index 6eb9545..bad02d9 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -121,10 +121,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5f777aa09d2ced42baa1cc6bf9dbe54, type: 3} m_Name: m_EditorClassIdentifier: - secondsGoingLeft: 1 - secondsGoingRight: 1 - movementSpeed: 5 + secondsGoingLeft: 0.8 + secondsGoingRight: 0.8 + movementSpeed: 2 playerCollider: {fileID: 0} + eventControls: {fileID: 0} --- !u!50 &3827363133515929334 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index bcf44c8..249c4eb 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -169,8 +169,9 @@ MonoBehaviour: tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} successTile: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} framesPerControlTile: 15 - nextControlYOffset: 4 - nextControlXOffset: 2.5 + nextControlYOffset: 2 + nextControlXOffset: -1 + tileMapClearDelayInSeconds: 0.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -935,456 +936,284 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 2120494080} m_ColliderPaths: - - - X: 710000100 - Y: 179999959 - - X: 710000100 - Y: 200000041 - - X: 710000041 - Y: 200000100 - - X: 689999959 - Y: 200000100 - - X: 689999900 - Y: 200000041 - - X: 689999900 - Y: 179999959 - - X: 689999959 - Y: 179999900 - - X: 710000041 - Y: 179999900 - - - X: 450000100 - Y: 159999959 - - X: 450000100 - Y: 180000041 - - X: 450000041 - Y: 180000100 - - X: 389999959 - Y: 180000100 - - X: 389999900 - Y: 180000041 - - X: 389999900 - Y: 159999959 - - X: 389999959 - Y: 159999900 - - X: 450000041 - Y: 159999900 - - - X: 730000100 - Y: 129999959 - - X: 730000100 - Y: 150000041 - - X: 730000041 - Y: 150000100 - - X: 709999959 - Y: 150000100 - - X: 709999900 - Y: 150000041 - - X: 709999900 - Y: 129999959 - - X: 709999959 - Y: 129999900 - - X: 730000041 - Y: 129999900 - - - X: 510000100 - Y: 119999959 - - X: 510000100 - Y: 140000041 - - X: 510000041 - Y: 140000100 - - X: 449999959 - Y: 140000100 - - X: 449999900 - Y: 140000041 - - X: 449999900 - Y: 119999959 - - X: 449999959 - Y: 119999900 - - X: 510000041 - Y: 119999900 - - - X: 540000100 - Y: 79999959 - - X: 540000100 - Y: 100000041 - - X: 540000041 - Y: 100000100 - - X: 519999959 - Y: 100000100 - - X: 519999900 - Y: 100000041 - - X: 519999900 - Y: 79999959 - - X: 519999959 - Y: 79999900 - - X: 540000041 - Y: 79999900 - - - X: 720000100 - Y: 79999959 - - X: 720000100 - Y: 100000041 - - X: 720000041 - Y: 100000100 - - X: 699999959 - Y: 100000100 - - X: 699999900 - Y: 100000041 - - X: 699999900 - Y: 79999959 - - X: 699999959 - Y: 79999900 - - X: 720000041 - Y: 79999900 - - - X: 980000100 - Y: 69999959 - - X: 980000100 - Y: 90000041 - - X: 980000041 - Y: 90000100 - - X: 859999959 - Y: 90000100 - - X: 859999900 - Y: 90000041 - - X: 859999900 - Y: 69999959 - - X: 859999959 - Y: 69999900 - - X: 980000041 - Y: 69999900 - - - X: 630000100 - Y: 59999959 - - X: 630000100 - Y: 80000041 - - X: 630000041 - Y: 80000100 - - X: 589999959 - Y: 80000100 - - X: 589999900 - Y: 80000041 - - X: 589999900 - Y: 59999959 - - X: 589999959 - Y: 59999900 - - X: 630000041 - Y: 59999900 - - - X: 560000100 - Y: 39999959 - - X: 560000100 - Y: 60000041 - - X: 560000041 - Y: 60000100 - - X: 489999959 - Y: 60000100 - - X: 489999900 - Y: 60000041 - - X: 489999900 - Y: 39999959 - - X: 489999959 - Y: 39999900 - - X: 560000041 - Y: 39999900 - - - X: 910000100 - Y: -170000041 - - X: 910000100 - Y: -19999959 - - X: 910000041 - Y: -19999900 - - X: 700000100 - Y: -19999900 - - X: 700000100 - Y: 20000041 - - X: 700000041 - Y: 20000100 - - X: 680000100 - Y: 20000100 - - X: 680000100 - Y: 60000041 - - X: 680000041 - Y: 60000100 - - X: 659999959 - Y: 60000100 - - X: 659999900 - Y: 60000041 - - X: 659999900 - Y: 40000100 - - X: 639999959 - Y: 40000100 - - X: 639999900 - Y: 40000041 - - X: 639999900 - Y: 20000100 - - X: 619999959 - Y: 20000100 - - X: 619999900 - Y: 20000041 - - X: 619999900 - Y: 100 - - X: 599999959 - Y: 100 - - X: 599999900 - Y: 41 - - X: 599999900 - Y: -19999900 - - X: 259999959 - Y: -19999900 - - X: 259999900 - Y: -19999959 - - X: 259999900 - Y: -170000041 - - X: 259999959 - Y: -170000100 - - X: 910000041 - Y: -170000100 - - - X: 1010000100 - Y: 29999959 - - X: 1010000100 - Y: 50000041 - - X: 1010000041 - Y: 50000100 - - X: 969999959 - Y: 50000100 - - X: 969999900 - Y: 50000041 - - X: 969999900 - Y: 29999959 - - X: 969999959 - Y: 29999900 - - X: 1010000041 - Y: 29999900 - - - X: 190000100 - Y: 19999959 - - X: 190000100 - Y: 40000041 - - X: 190000041 - Y: 40000100 - - X: 139999959 - Y: 40000100 - - X: 139999900 - Y: 40000041 - - X: 139999900 - Y: 19999959 - - X: 139999959 - Y: 19999900 - - X: 190000041 - Y: 19999900 - - - X: 470000100 - Y: 19999959 - - X: 470000100 - Y: 40000041 - - X: 470000041 - Y: 40000100 - - X: 399999959 - Y: 40000100 - - X: 399999900 - Y: 40000041 - - X: 399999900 - Y: 19999959 - - X: 399999959 - Y: 19999900 - - X: 470000041 - Y: 19999900 - - - X: 850000100 - Y: 19999959 - - X: 850000100 - Y: 40000041 - - X: 850000041 - Y: 40000100 - - X: 739999959 - Y: 40000100 - - X: 739999900 - Y: 40000041 - - X: 739999900 - Y: 19999959 - - X: 739999959 - Y: 19999900 - - X: 850000041 - Y: 19999900 - - - X: 380000100 - Y: -41 - - X: 380000100 - Y: 20000041 - - X: 380000041 - Y: 20000100 - - X: 309999959 - Y: 20000100 - - X: 309999900 - Y: 20000041 - - X: 309999900 - Y: -41 - - X: 309999959 - Y: -100 - - X: 380000041 - Y: -100 - - - X: 250000100 - Y: -20000041 - - X: 250000100 - Y: 41 - - X: 250000041 - Y: 100 - - X: 199999959 - Y: 100 - - X: 199999900 - Y: 41 - - X: 199999900 - Y: -20000041 - - X: 199999959 - Y: -20000100 - - X: 250000041 - Y: -20000100 - - - X: 1160000100 - Y: -30000041 - - X: 1160000100 - Y: -9999959 - - X: 1160000041 - Y: -9999900 - - X: 1089999959 - Y: -9999900 - - X: 1089999900 - Y: -9999959 - - X: 1089999900 - Y: -30000041 - - X: 1089999959 - Y: -30000100 - - X: 1160000041 - Y: -30000100 - - - X: 180000100 - Y: -40000041 - - X: 180000100 - Y: -19999959 - - X: 180000041 - Y: -19999900 - - X: 89999959 - Y: -19999900 - - X: 89999900 - Y: -19999959 - - X: 89999900 - Y: -40000041 - - X: 89999959 - Y: -40000100 - - X: 180000041 - Y: -40000100 - - - X: 80000100 - Y: -170000041 - - X: 80000100 - Y: -39999959 - - X: 80000041 - Y: -39999900 - - X: -180000041 - Y: -39999900 - - X: -180000100 - Y: -39999959 - - X: -180000100 - Y: -170000041 - - X: -180000041 - Y: -170000100 - - X: 80000041 - Y: -170000100 - - - X: 1090000100 - Y: -70000041 - - X: 1090000100 - Y: -49999959 - - X: 1090000041 - Y: -49999900 - - X: 999999959 - Y: -49999900 - - X: 999999900 - Y: -49999959 - - X: 999999900 - Y: -70000041 - - X: 999999959 - Y: -70000100 - - X: 1090000041 - Y: -70000100 + - - X: 710000000 + Y: 200000000 + - X: 690000000 + Y: 200000000 + - X: 690000000 + Y: 180000000 + - X: 710000000 + Y: 180000000 + - - X: 450000000 + Y: 180000000 + - X: 390000000 + Y: 180000000 + - X: 390000000 + Y: 160000000 + - X: 450000000 + Y: 160000000 + - - X: 730000000 + Y: 150000000 + - X: 710000000 + Y: 150000000 + - X: 710000000 + Y: 130000000 + - X: 730000000 + Y: 130000000 + - - X: 510000000 + Y: 140000000 + - X: 450000000 + Y: 140000000 + - X: 450000000 + Y: 120000000 + - X: 510000000 + Y: 120000000 + - - X: 720000000 + Y: 100000000 + - X: 700000000 + Y: 100000000 + - X: 700000000 + Y: 80000000 + - X: 720000000 + Y: 80000000 + - - X: 540000000 + Y: 100000000 + - X: 520000000 + Y: 100000000 + - X: 520000000 + Y: 80000000 + - X: 540000000 + Y: 80000000 + - - X: 980000000 + Y: 90000000 + - X: 860000000 + Y: 90000000 + - X: 860000000 + Y: 70000000 + - X: 980000000 + Y: 70000000 + - - X: 630000000 + Y: 80000000 + - X: 590000000 + Y: 80000000 + - X: 590000000 + Y: 60000000 + - X: 630000000 + Y: 60000000 + - - X: 910000000 + Y: -20000000 + - X: 700000000 + Y: -20000000 + - X: 700000000 + Y: 20000000 + - X: 680000000 + Y: 20000000 + - X: 680000000 + Y: 60000000 + - X: 660000000 + Y: 60000000 + - X: 660000000 + Y: 40000000 + - X: 640000000 + Y: 40000000 + - X: 640000000 + Y: 20000000 + - X: 620000000 + Y: 20000000 + - X: 620000000 + Y: 0 + - X: 600000000 + Y: 0 + - X: 600000000 + Y: -20000000 + - X: 260000000 + Y: -20000000 + - X: 260000000 + Y: -170000000 + - X: 910000000 + Y: -170000000 + - - X: 560000000 + Y: 60000000 + - X: 490000000 + Y: 60000000 + - X: 490000000 + Y: 40000000 + - X: 560000000 + Y: 40000000 + - - X: 1010000000 + Y: 50000000 + - X: 970000000 + Y: 50000000 + - X: 970000000 + Y: 30000000 + - X: 1010000000 + Y: 30000000 + - - X: 850000000 + Y: 40000000 + - X: 740000000 + Y: 40000000 + - X: 740000000 + Y: 20000000 + - X: 850000000 + Y: 20000000 + - - X: 470000000 + Y: 40000000 + - X: 400000000 + Y: 40000000 + - X: 400000000 + Y: 20000000 + - X: 470000000 + Y: 20000000 + - - X: 190000000 + Y: 40000000 + - X: 140000000 + Y: 40000000 + - X: 140000000 + Y: 20000000 + - X: 190000000 + Y: 20000000 + - - X: 380000000 + Y: 20000000 + - X: 310000000 + Y: 20000000 + - X: 310000000 + Y: 0 + - X: 380000000 + Y: 0 + - - X: 250000000 + Y: 0 + - X: 200000000 + Y: 0 + - X: 200000000 + Y: -20000000 + - X: 250000000 + Y: -20000000 + - - X: 1160000000 + Y: -10000000 + - X: 1090000000 + Y: -10000000 + - X: 1090000000 + Y: -30000000 + - X: 1160000000 + Y: -30000000 + - - X: 180000000 + Y: -20000000 + - X: 90000000 + Y: -20000000 + - X: 90000000 + Y: -40000000 + - X: 180000000 + Y: -40000000 + - - X: 80000000 + Y: -40000000 + - X: -180000000 + Y: -40000000 + - X: -180000000 + Y: -170000000 + - X: 80000000 + Y: -170000000 + - - X: 1090000000 + Y: -50000000 + - X: 1000000000 + Y: -50000000 + - X: 1000000000 + Y: -70000000 + - X: 1090000000 + Y: -70000000 m_CompositePaths: m_Paths: - - - {x: 70.99998, y: 17.99999} - - {x: 70.99998, y: 20.00001} - - {x: 68.999985, y: 19.999975} - - {x: 69.00002, y: 17.99999} - - - {x: 44.999973, y: 15.99999} - - {x: 44.999973, y: 18.00001} - - {x: 38.999992, y: 17.999975} - - {x: 39.000027, y: 15.99999} - - - {x: 72.99998, y: 12.99999} - - {x: 72.99998, y: 15.00001} - - {x: 70.999985, y: 14.999974} - - {x: 71.00002, y: 12.99999} - - - {x: 50.999973, y: 11.99999} - - {x: 50.999973, y: 14.00001} - - {x: 44.999992, y: 13.999974} - - {x: 45.000027, y: 11.99999} - - - {x: 53.999973, y: 7.9999905} - - {x: 53.999973, y: 10.00001} - - {x: 51.999992, y: 9.999974} - - {x: 52.000027, y: 7.9999905} - - - {x: 71.99998, y: 7.9999905} - - {x: 71.99998, y: 10.00001} - - {x: 69.999985, y: 9.999974} - - {x: 70.00002, y: 7.9999905} - - - {x: 97.99998, y: 6.9999905} - - {x: 97.99998, y: 9.00001} - - {x: 85.999985, y: 8.999974} - - {x: 86.00002, y: 6.9999905} - - - {x: 62.999973, y: 5.99999} - - {x: 62.999973, y: 8.00001} - - {x: 58.99999, y: 7.9999747} - - {x: 59.000027, y: 5.99999} - - - {x: 55.999973, y: 3.99999} - - {x: 55.999973, y: 6.00001} - - {x: 48.999992, y: 5.9999747} - - {x: 49.000027, y: 3.99999} - - - {x: 90.99998, y: -17.00001} - - {x: 90.99998, y: -1.99999} - - {x: 70.000015, y: -1.9999607} - - {x: 69.99998, y: 2.00001} - - {x: 68.000015, y: 2.0000393} - - {x: 67.99998, y: 6.00001} - - {x: 65.999985, y: 5.9999747} - - {x: 65.99996, y: 4.00001} - - {x: 63.99999, y: 3.9999747} - - {x: 63.99996, y: 2.00001} - - {x: 61.99999, y: 1.9999748} - - {x: 61.99996, y: 0.00001} - - {x: 59.99999, y: -0.0000252} - - {x: 59.99996, y: -1.99999} - - {x: 25.99999, y: -2.0000253} - - {x: 26.000027, y: -17.00001} - - - {x: 100.99998, y: 2.99999} - - {x: 100.99998, y: 5.00001} - - {x: 96.999985, y: 4.9999747} - - {x: 97.00003, y: 2.99999} - - - {x: 18.999975, y: 1.99999} - - {x: 18.999975, y: 4.00001} - - {x: 13.99999, y: 3.9999747} - - {x: 14.000026, y: 1.99999} - - - {x: 46.999973, y: 1.99999} - - {x: 46.999973, y: 4.00001} - - {x: 39.999992, y: 3.9999747} - - {x: 40.000027, y: 1.99999} - - - {x: 84.99998, y: 1.99999} - - {x: 84.99998, y: 4.00001} - - {x: 73.999985, y: 3.9999747} - - {x: 74.00002, y: 1.99999} - - - {x: 37.999973, y: -0.00001} - - {x: 37.999973, y: 2.00001} - - {x: 30.99999, y: 1.9999748} - - {x: 31.000027, y: -0.00001} - - - {x: 24.999975, y: -2.00001} - - {x: 24.999975, y: 0.00001} - - {x: 19.99999, y: -0.0000252} - - {x: 20.000027, y: -2.00001} - - - {x: 115.99998, y: -3.00001} - - {x: 115.99998, y: -0.99999} - - {x: 108.999985, y: -1.0000252} - - {x: 109.00003, y: -3.00001} - - - {x: 17.999975, y: -4.00001} - - {x: 17.999975, y: -1.99999} - - {x: 8.99999, y: -2.0000253} - - {x: 9.000026, y: -4.00001} - - - {x: 7.9999747, y: -17.00001} - - {x: 7.9999747, y: -3.99999} - - {x: -18.00001, y: -4.0000253} - - {x: -17.999975, y: -17.00001} - - - {x: 108.99998, y: -7.0000095} - - {x: 108.99998, y: -4.99999} - - {x: 99.999985, y: -5.0000253} - - {x: 100.00003, y: -7.0000095} + - - {x: 70.99997, y: 18} + - {x: 70.99997, y: 20} + - {x: 69, y: 19.999971} + - {x: 69.00003, y: 18} + - - {x: 44.999973, y: 16} + - {x: 44.999973, y: 18} + - {x: 39, y: 17.999971} + - {x: 39.00003, y: 16} + - - {x: 72.99997, y: 13} + - {x: 72.99997, y: 15} + - {x: 71, y: 14.999971} + - {x: 71.00003, y: 13} + - - {x: 50.999973, y: 12} + - {x: 50.999973, y: 14} + - {x: 45, y: 13.999971} + - {x: 45.00003, y: 12} + - - {x: 71.99997, y: 8} + - {x: 71.99997, y: 10} + - {x: 70, y: 9.99997} + - {x: 70.00003, y: 8} + - - {x: 53.99997, y: 8} + - {x: 53.99997, y: 10} + - {x: 52, y: 9.99997} + - {x: 52.00003, y: 8} + - - {x: 97.99997, y: 7} + - {x: 97.99997, y: 9} + - {x: 86, y: 8.99997} + - {x: 86.00003, y: 7} + - - {x: 62.99997, y: 6} + - {x: 62.99997, y: 8} + - {x: 59, y: 7.9999704} + - {x: 59.000034, y: 6} + - - {x: 90.99997, y: -17} + - {x: 90.99997, y: -2} + - {x: 70, y: -1.9999707} + - {x: 69.99997, y: 2} + - {x: 68, y: 2.0000293} + - {x: 67.99997, y: 6} + - {x: 66, y: 5.999971} + - {x: 65.99997, y: 4} + - {x: 64, y: 3.999971} + - {x: 63.99997, y: 2} + - {x: 62, y: 1.9999708} + - {x: 61.99997, y: 0} + - {x: 60, y: -0.000029300001} + - {x: 59.99997, y: -2} + - {x: 26, y: -2.0000293} + - {x: 26.000029, y: -17} + - - {x: 55.99997, y: 4} + - {x: 55.99997, y: 6} + - {x: 49, y: 5.999971} + - {x: 49.00003, y: 4} + - - {x: 100.99997, y: 3} + - {x: 100.99997, y: 5} + - {x: 97, y: 4.999971} + - {x: 97.00003, y: 3} + - - {x: 84.99997, y: 2} + - {x: 84.99997, y: 4} + - {x: 74, y: 3.999971} + - {x: 74.00003, y: 2} + - - {x: 46.999973, y: 2} + - {x: 46.999973, y: 4} + - {x: 40, y: 3.999971} + - {x: 40.00003, y: 2} + - - {x: 18.999971, y: 2} + - {x: 18.999971, y: 4} + - {x: 14, y: 3.999971} + - {x: 14.000029, y: 2} + - - {x: 37.999973, y: 0} + - {x: 37.999973, y: 2} + - {x: 31, y: 1.9999708} + - {x: 31.000029, y: 0} + - - {x: 24.999971, y: -2} + - {x: 24.999971, y: 0} + - {x: 20, y: -0.000029300001} + - {x: 20.000029, y: -2} + - - {x: 115.99998, y: -3} + - {x: 115.99998, y: -1} + - {x: 109, y: -1.0000293} + - {x: 109.00003, y: -3} + - - {x: 17.999971, y: -4} + - {x: 17.999971, y: -2} + - {x: 9, y: -2.0000293} + - {x: 9.00003, y: -4} + - - {x: 7.9999704, y: -17} + - {x: 7.9999704, y: -4} + - {x: -18, y: -4.000029} + - {x: -17.999971, y: -17} + - - {x: 108.99998, y: -7} + - {x: 108.99998, y: -5} + - {x: 100, y: -5.000029} + - {x: 100.00003, y: -7} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &2120494079 @@ -15892,5 +15721,10 @@ PrefabInstance: propertyPath: playerCollider value: objectReference: {fileID: 1671840919} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index 8ba32b7..40daa80 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -8,6 +8,7 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; [SerializeField] BoxCollider2D playerCollider; + [SerializeField] EventControls eventControls; private int leftAccumalator = 0; private int rightAccumalator = 0; @@ -17,13 +18,15 @@ public class BugMovement : MonoBehaviour private void Start() { - Physics2D.IgnoreCollision(GetComponent(), playerCollider); rigidBody = GetComponent(); } // Update is called once per frame private void Update() { + if (HasEncounteredPlayer()) + eventControls.TriggerEvent(playerCollider, GetComponent()); + var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; @@ -56,4 +59,9 @@ public class BugMovement : MonoBehaviour var actualSpeed = movementSpeed; rigidBody.velocity = new Vector2(actualSpeed, rigidBody.velocity.y); } + + private bool HasEncounteredPlayer() + { + return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Player)); + } } diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index 08dd965..6eadd5b 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -10,8 +10,8 @@ public class EventControls : MonoBehaviour [SerializeField] private Tile tile; [SerializeField] private Tile successTile; [SerializeField] private float framesPerControlTile = 15; - [SerializeField] private float nextControlYOffset = 0; - [SerializeField] private float nextControlXOffset = 0; + [SerializeField] private int nextControlYOffset = 0; + [SerializeField] private int nextControlXOffset = 0; [SerializeField] private float tileMapClearDelayInSeconds = 0.5f; private Tilemap tilemap; @@ -24,20 +24,38 @@ public class EventControls : MonoBehaviour private bool eventDrawn = false; private bool eventTriggered = false; - private int eventCycleInSeconds = 4; + private int eventCycleInSeconds = 2; private int eventCycleAccumalator = 0; private int tileMapClearDelayAccumalator = 0; private EventControlTile currentEventControl; + private Collider2D currentPlayerCollider; + private Collider2D currentEnemyCollider; + private Queue eventControlTilesInCycle; private int framesPerSecond => 60; + private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0); + + public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider) + { + currentPlayerCollider = playerCollider; + currentEnemyCollider = enemyCollider; + Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); + + eventTriggered = true; + } + + public bool IsEventTriggered() + { + + return eventTriggered; + } private void Start() { tilemap = GetComponent(); eventControlTilesInCycle = new Queue(); - eventTriggered = true; // TODO: TEST } private void Update() @@ -45,42 +63,17 @@ public class EventControls : MonoBehaviour if (eventTriggered) { SetTile(); - SetTileMapPosition(); - } - else - { - nextControlAccumalator = 0; + //SetTileMapPosition(); } if (eventDrawn && eventTriggered) { - if (currentEventControl == null) - currentEventControl = eventControlTilesInCycle.Dequeue(); - - if (Input.GetKeyDown(currentEventControl.keyCode)) - { - tilemap.SetTile(currentEventControl.position, currentEventControl.successTile); - - currentEventControl = null; - if (eventControlTilesInCycle.Count == 0) - { - eventTriggered = false; - } - } + PerformControlEvent(); } if (eventDrawn && !eventTriggered) { - if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond) - { - tilemap.ClearAllTiles(); - tileMapClearDelayAccumalator = 0; - eventDrawn = false; - } - else - { - tileMapClearDelayAccumalator++; - } + Reset(); } } @@ -92,7 +85,7 @@ public class EventControls : MonoBehaviour initialCameraPosition = GetCameraPosition(); // Store tiles for event cycle - var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition()); /* TODO: Hard code */ + var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */ eventControlTilesInCycle.Enqueue(eventControlTile); tilemap.SetTile(eventControlTile.position, tile); @@ -105,8 +98,10 @@ public class EventControls : MonoBehaviour initialCameraPosition = null; eventDrawn = true; } - - nextControlAccumalator++; + else + { + nextControlAccumalator++; + } } private Vector3Int GetCameraPosition() @@ -122,9 +117,56 @@ public class EventControls : MonoBehaviour .GetValueOrDefault(); } + private void PerformControlEvent() + { + nextControlAccumalator = 0; + + if (currentEventControl == null) + currentEventControl = eventControlTilesInCycle.Dequeue(); + + if (Input.GetKeyDown(currentEventControl.keyCode)) + { + tilemap.SetTile(currentEventControl.position, currentEventControl.successTile); + + currentEventControl = null; + if (eventControlTilesInCycle.Count == 0) + { + eventTriggered = false; + eventCycleAccumalator = 0; + } + } + else if (eventCycleAccumalator >= eventCycleInSeconds * framesPerSecond) + { + + } + else + { + eventCycleAccumalator++; + } + } + + private void Reset() + { + if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond) + { + tilemap.ClearAllTiles(); + tileMapClearDelayAccumalator = 0; + eventDrawn = false; + numberOfControlTilesSet = 0; + + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); + currentPlayerCollider = null; + currentEnemyCollider = null; + } + else + { + tileMapClearDelayAccumalator++; + } + } + private void SetTileMapPosition() { transform.position = camera.transform.position + - new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset + new Vector3Int(nextControlXOffset, nextControlYOffset, 0); // offset } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index c82d6d1..49e7e2d 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -10,9 +11,8 @@ public class Player : MonoBehaviour [SerializeField] private float groundErrorThreshold = 0.01f; private Rigidbody2D rigidBody; - private BoxCollider2D collider; + new private BoxCollider2D collider; private Animator animator; - private bool isInEncounter = false; private void Start() { @@ -23,8 +23,6 @@ public class Player : MonoBehaviour private void Update() { - //isInEncounter = HasEncounteredEnemy(); - //if (isInEncounter) MovePlayer(); } From 31434f7a04d087a96aa9df5a10045a1b8f40edc6 Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sat, 1 Feb 2020 15:12:00 -0500 Subject: [PATCH 10/11] add buttons asset --- Assets/Sprites/Controls/Buttons.png | Bin 0 -> 1044 bytes Assets/Sprites/Controls/Buttons.png.meta | 403 +++++++++++++++++++++++ 2 files changed, 403 insertions(+) create mode 100644 Assets/Sprites/Controls/Buttons.png create mode 100644 Assets/Sprites/Controls/Buttons.png.meta diff --git a/Assets/Sprites/Controls/Buttons.png b/Assets/Sprites/Controls/Buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..46aa53cf2ad3ff81a19e1352fefd77e855b4f2f5 GIT binary patch literal 1044 zcmeAS@N?(olHy`uVBq!ia0vp^20%Q4g9%6;tf{vHQtTz3zOL*~m>5Mkgs+&gdjo~U zOI#yLg7ec#$`gxH8QgtbfW|14r4}g|>zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5|ATavfC3&Vd9T(EcfWROTnkY6yv4~7Va8C^3giWwM~V?A9QLn`LH zofVyT$AHK6YHXTjte5!Y))LLnks_JQu1fm)^4pRc8tNX+d^jihsL}fqkH3C<9o@Td zpFv&6V}=X+-`7>2Jly$IG`cZu%Juj2PtVvGA+r32KxUZ;BezlOQMLs)w|Xq=xpARo zOK`6Cvm;>&KFWL2KYDlbhKqhyd3sc1!P5m=;flxRE&N#_(IGgw(IEI4&&(ukfx}z& zEn#Lo!m?neOq9JsK!gt)lh2bWtw;YcH_q-WYOD!kbYR@bdE(?3&(EwHx@K#yJiZ(L z?(x~*Ub3Q-^VZ4xJZRBf-}Se7`pazjOE!grwz0S<3I#XJ*z9mAHn*k&|xUll0%z{;#+6+cw zlbUz({Pn4<*V|lgwKsQvP64k*!l@3<->G~Gfrjc~JX6*m&ePpcx1Dj}u6b)&C!h3? zwcE+H(Yhg~R7!(wiEq8m^wtIowT)a1Tpf2e#y=CnZ&gm*kE6f&S|5oRe>;6f-dE7q zgXit^v#K#Zl7^OSoh)mT{6Ick{%PX+eD;u_LZ-LGWWshtS|Kh7=u@bfB;O zWlyHM^*=wES|eyWJ@BmM^wTj(ZalYUeltFQ;X{(vgkvp@pOV~;zeqjReN%T$Y~Krs zO0`wX%}y2S>S(r^#os6@@ju(KbN;1b*Ov_vvy5JKsW!wUy$PK*(`fpPxu<=ku7|q$ z-~76>M+Cp`d33*he{S@<%;ULHxS-keoimJ*roW$Fc~r*X)4}R*r?2$S+-a;E#u*Z{ zyfLfMD=9!SK!>gJXw7*;E|WS1E4D}nDrPuUHx3vIVCg!0OBRWhX4Qo literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Controls/Buttons.png.meta b/Assets/Sprites/Controls/Buttons.png.meta new file mode 100644 index 0000000..b5a3e01 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons.png.meta @@ -0,0 +1,403 @@ +fileFormatVersion: 2 +guid: 41e19859471e9554081441f3912fd642 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8894201953851282084 + second: Buttons_0 + - first: + 213: 7664807735657788756 + second: Buttons_1 + - first: + 213: -5402412272178277761 + second: Buttons_2 + - first: + 213: 2013261503205373015 + second: Buttons_3 + - first: + 213: 3760674464881954987 + second: Buttons_4 + - first: + 213: -7811504096720598664 + second: Buttons_5 + - first: + 213: -7814535901586335685 + second: Buttons_6 + - first: + 213: -3243065930256096816 + second: Buttons_7 + - first: + 213: -5316896731886317114 + second: Buttons_8 + - first: + 213: 7219830438018454713 + second: Buttons_9 + - first: + 213: 3100856887975758742 + second: Buttons_10 + - first: + 213: 4520375771122408675 + second: Buttons_11 + externalObjects: {} + serializedVersion: 10 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Buttons_0 + rect: + serializedVersion: 2 + x: 1 + y: 121 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 771983acc2d2d614590277d7ff3d4a12 + internalID: 8894201953851282084 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_1 + rect: + serializedVersion: 2 + x: 25 + y: 121 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c1c5ef53feb463f4e80d085366da3b4a + internalID: 7664807735657788756 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_2 + rect: + serializedVersion: 2 + x: 1 + y: 97 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 61d8869a701da1649b6221cb6c5e7669 + internalID: -5402412272178277761 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_3 + rect: + serializedVersion: 2 + x: 25 + y: 97 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c2b21a77049f7334ba16935e70fa3c04 + internalID: 2013261503205373015 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_4 + rect: + serializedVersion: 2 + x: 1 + y: 73 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8745ecc39f073ea49af751755b0e5ae3 + internalID: 3760674464881954987 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_5 + rect: + serializedVersion: 2 + x: 25 + y: 73 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eaae1ffb4ef4aeb4db0bd07f0b71eab6 + internalID: -7811504096720598664 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_6 + rect: + serializedVersion: 2 + x: 1 + y: 49 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4e94035bc6af70b429517d2fe6fa525e + internalID: -7814535901586335685 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_7 + rect: + serializedVersion: 2 + x: 25 + y: 49 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5e64ab545a490104c8b040fd70d59d1e + internalID: -3243065930256096816 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_8 + rect: + serializedVersion: 2 + x: 1 + y: 25 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ced29ff062e9d9549981d3399e85ef87 + internalID: -5316896731886317114 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_9 + rect: + serializedVersion: 2 + x: 25 + y: 25 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 692327ffefa56a34aa833cd3b7a6b559 + internalID: 7219830438018454713 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_10 + rect: + serializedVersion: 2 + x: 1 + y: 1 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: db9b987a7e2fb7341bb9565a6961c61a + internalID: 3100856887975758742 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_11 + rect: + serializedVersion: 2 + x: 25 + y: 1 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 41caa7ddfc35e804cb7899be46e9acb0 + internalID: 4520375771122408675 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 161190729cd742eba8231b6ae052291fa4b8250e Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sat, 1 Feb 2020 15:25:45 -0500 Subject: [PATCH 11/11] added plus asset --- Assets/Sprites/Controls/Plus.png | Bin 0 -> 249 bytes Assets/Sprites/Controls/Plus.png.meta | 115 ++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 Assets/Sprites/Controls/Plus.png create mode 100644 Assets/Sprites/Controls/Plus.png.meta diff --git a/Assets/Sprites/Controls/Plus.png b/Assets/Sprites/Controls/Plus.png new file mode 100644 index 0000000000000000000000000000000000000000..dee090ee6caf68ec115fd7ad19523a07beb13929 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9>?NMQuIx{k7)8X)ybIo31`3In zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwDAd!+FzhEHEz_4dc;SVz)?d0j=7*a7OIU(VO zvuaCllc2QH=>;9qiYGFzEO1N{xHjWhmcTrd#