From 76254bb38d492a9cde32b1824b0f9b0586498cee Mon Sep 17 00:00:00 2001 From: KrispyDotlessI <92911290+KrispyDotlessI@users.noreply.github.com> Date: Sat, 27 Aug 2022 10:20:48 +0800 Subject: [PATCH] Animation started, attempt to code "eVeNt NoT fOuNd! MaY bE sPeLlEd WrOnG oR iT iS nOt ImPlEmEnTeD." --- Assets/Resources/Games/marchingOrders.prefab | 2 +- .../Animations/Cadets/Anger.anim | 53 +++++++++++++++++++ .../Animations/Cadets/Anger.anim.meta | 8 +++ .../Animations/Cadets/Irritate.anim | 53 +++++++++++++++++++ .../Animations/Cadets/Irritate.anim.meta | 8 +++ .../Animations/Cadets/Talk.anim | 53 +++++++++++++++++++ .../Animations/Cadets/Talk.anim.meta | 8 +++ .../Games/MarchingOrders/MarchingOrders.cs | 13 ++++- 8 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim.meta diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab index fa1ade45..86c08e09 100644 --- a/Assets/Resources/Games/marchingOrders.prefab +++ b/Assets/Resources/Games/marchingOrders.prefab @@ -180,7 +180,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1645939037775820338 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim new file mode 100644 index 00000000..1999ad19 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim @@ -0,0 +1,53 @@ +%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: Anger + 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: [] + 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: [] + pptrCurveMapping: [] + 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/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim.meta new file mode 100644 index 00000000..478d0c10 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Anger.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 210af45ada135d24e8529a473a7676e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim new file mode 100644 index 00000000..9a6edffb --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim @@ -0,0 +1,53 @@ +%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: Irritate + 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: [] + 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: [] + pptrCurveMapping: [] + 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/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim.meta new file mode 100644 index 00000000..c6dbb144 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Irritate.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be97e7ff2134a7e479851787919689d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim new file mode 100644 index 00000000..4b0ade24 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim @@ -0,0 +1,53 @@ +%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: Talk + 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: [] + 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: [] + pptrCurveMapping: [] + 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/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim.meta new file mode 100644 index 00000000..08b0ba9d --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Talk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c66519c30e8584840a96f98b014918f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index 0fca3515..b0f3b605 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -34,7 +34,7 @@ namespace HeavenStudio.Games.Loaders //the cues do nothing at the moment, so i temporarily disabled them //new GameAction("marching", delegate { MarchingOrders.instance.CadetsMarch(eventCaller.currentEntity.beat); }, 4f, true), - //new GameAction("attention", delegate {}, 2f, false), + new GameAction("attention", delegate { MarchingOrders.instance.SargeAttention(eventCaller.currentEntity.beat); }, 2f, false), //new GameAction("march", delegate {}, 2f, false), //new GameAction("halt", delegate {}, 2f, false), //new GameAction("face turn", delegate {}, 4f, false, parameters: new List() @@ -79,6 +79,17 @@ namespace HeavenStudio.Games { } + + public void SargeAttention(float beat) + { + //ScheduleInput(beat, 1f, InputType.DIRECTION_DOWN_DOWN, SitSuccess, SitMiss, SitEmpty); + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("marchingOrders/attention1", beat - 0.25f), + new MultiSound.Sound("marchingOrders/attention2", beat), + new MultiSound.Sound("marchingOrders/attention3", beat + 0.5f), + }); + + } } }