From e3a4443d91a1fc7ba8dc6992977055ee96329fd7 Mon Sep 17 00:00:00 2001 From: KrispyDotlessI <92911290+KrispyDotlessI@users.noreply.github.com> Date: Tue, 6 Sep 2022 14:41:13 +0800 Subject: [PATCH] Cadets' heads and bodies separated, "keep-up" no more you have no use anymore keep-up --- Assets/Resources/Games/marchingOrders.prefab | 8 +- .../Games/MarchingOrders/CadetHead.prefab | 155 +++++ .../MarchingOrders/CadetHead.prefab.meta | 7 + .../Games/MarchingOrders/Cadets.prefab | 160 +++-- .../Editor/GameIcons/marchingOrders.png | Bin 580 -> 978 bytes .../MarchingOrders/Animations/Cadets/Bop.anim | 511 +++++++-------- .../Animations/Cadets/CadetHead.controller | 101 +++ .../Cadets/CadetHead.controller.meta | 8 + .../Animations/Cadets/FaceL.anim | 53 ++ .../Animations/Cadets/FaceL.anim.meta | 8 + .../Animations/Cadets/FaceR.anim | 53 ++ .../Animations/Cadets/FaceR.anim.meta | 8 + .../Animations/Cadets/Halt.anim | 589 ++++++++---------- .../Animations/Cadets/Idle.anim | 292 ++++----- .../Animations/Cadets/MarchL.anim | 469 +++++++------- .../Games/MarchingOrders/MarchingOrders.cs | 54 +- .../Scripts/Games/SpaceSoccer/SpaceSoccer.cs | 3 +- 17 files changed, 1345 insertions(+), 1134 deletions(-) create mode 100644 Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab create mode 100644 Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab.meta create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/CadetHead.controller create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/CadetHead.controller.meta create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/FaceL.anim create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/FaceL.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/FaceR.anim create mode 100644 Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/FaceR.anim.meta diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab index c2da4caa..27eb5e63 100644 --- a/Assets/Resources/Games/marchingOrders.prefab +++ b/Assets/Resources/Games/marchingOrders.prefab @@ -70,7 +70,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingOrder: -3 m_Sprite: {fileID: -3480662173297360594, guid: 846441fe5edbde04f9bafc98728df9b3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -733,7 +733,11 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 + m_SortingOrder: -3 m_Sprite: {fileID: 2782121640304946352, guid: 846441fe5edbde04f9bafc98728df9b3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 m_DrawMode: 0 m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 @@ -939,7 +943,7 @@ GameObject: - component: {fileID: 7150405460527854978} - component: {fileID: 68857249694856436} m_Layer: 0 - m_Name: bgFill + m_Name: bgFill1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab b/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab new file mode 100644 index 00000000..91e2eb3c --- /dev/null +++ b/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1254738395776798436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 433873525218291336} + - component: {fileID: 8714277536144134696} + - component: {fileID: 3807019065815778040} + m_Layer: 0 + m_Name: cadetHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &433873525218291336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254738395776798436} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5457875550793562857} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8714277536144134696 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254738395776798436} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + 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: 10 + m_Sprite: {fileID: -611560658681698378, guid: 07a712fc3a8592248b24d4108837306c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &3807019065815778040 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254738395776798436} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8861690166672522127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5457875550793562857} + - component: {fileID: 1636072313462817295} + m_Layer: 0 + m_Name: CadetHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5457875550793562857 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8861690166672522127} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 433873525218291336} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1636072313462817295 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8861690166672522127} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b7182ddf88753b74d9b76eb8d504ae35, 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 diff --git a/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab.meta b/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab.meta new file mode 100644 index 00000000..3258ff6d --- /dev/null +++ b/Assets/Resources/Prefabs/Games/MarchingOrders/CadetHead.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1f6dd9e6033236e4099da238db2758d9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/MarchingOrders/Cadets.prefab b/Assets/Resources/Prefabs/Games/MarchingOrders/Cadets.prefab index 1f9fc22a..ec0b9cc7 100644 --- a/Assets/Resources/Prefabs/Games/MarchingOrders/Cadets.prefab +++ b/Assets/Resources/Prefabs/Games/MarchingOrders/Cadets.prefab @@ -82,88 +82,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1240379293656630318 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5319488906539053294} - - component: {fileID: 2325312651278163355} - m_Layer: 0 - m_Name: cadetHead - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5319488906539053294 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240379293656630318} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.666, z: 0} - m_LocalScale: {x: 1.04, y: 1.04, z: 1} - m_Children: [] - m_Father: {fileID: 308962927016676861} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2325312651278163355 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240379293656630318} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - 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: 10 - m_Sprite: {fileID: -611560658681698378, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2486501137883457502 GameObject: m_ObjectHideFlags: 0 @@ -180,7 +98,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &161048534229830808 Transform: m_ObjectHideFlags: 0 @@ -262,7 +180,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4242949895883883619 Transform: m_ObjectHideFlags: 0 @@ -602,7 +520,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5319488906539053294} + - {fileID: 2039381362211550255} - {fileID: 2782604673486759644} - {fileID: 1000208939380644342} - {fileID: 8252745207487221176} @@ -823,7 +741,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9061429332552348868} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.166, y: -2.2257, z: 0} + m_LocalPosition: {x: 0.16599989, y: -2.2257, z: 0} m_LocalScale: {x: -1.04, y: 1.04, z: 1} m_Children: [] m_Father: {fileID: 308962927016676861} @@ -880,3 +798,73 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &6337429365394837190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 308962927016676861} + m_Modifications: + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalScale.x + value: 1.04 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalScale.y + value: 1.04 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalPosition.y + value: 0.666 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8861690166672522127, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + propertyPath: m_Name + value: CadetHead + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} +--- !u!4 &2039381362211550255 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5457875550793562857, guid: 1f6dd9e6033236e4099da238db2758d9, type: 3} + m_PrefabInstance: {fileID: 6337429365394837190} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png index 4d303863c17cb1a5dd6388acd85ccb3e5472d0f2..3631bfa71be146637455487075cca427082a98f6 100644 GIT binary patch literal 978 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7+9Er6kFKIlR%2GILO_JVcj{Imp~3nx}&cn z1H;CC?mvmFK)z^zPlzj!zByI@#|y?s+}wZ9wEte+E88sppmgm!paf@uM`SSr1K$A< zX3V7*cWT?cIZg%?1Jvfl&)sfoS^#u}k%wJ1xXh%fgr%3%>ljcvxq5 ze$6&<&q*qtlT7ko@BZ}p?Xqu^Q_EeyGXjl92FA=iR(r%9*g(!l0XyUqUfy{sfFj1g zaKMGZ-||BSnkYj<9YebKX@>8|Hhte}H(zhp93C_k6$S?`ZkzmeZj>9y^T^8af%aIleVVGo*&OhWVKMKWP-DK+c1@hKuMvU}z|0SnSXy z4~jYzutWCQ#&$P!cl_sA5R>!s0-rOw1cM!468|bW6eB@6BCLn^G?>THAj8Tra~aMGTu>%4=`Y zyA@?-ev2DjZUS?TP588P#fzP{4xj#u#RyFYHbL32=+|>H^wEuQuyuId zz3FK6)VIQKF&x*ycXLtk;jXNs2gnt0F2OrXAFFJ1M49!vbj@Nwa3vY zM1NQlL%s5p#6^%>Eh2`NBW8fp??qmHw>`aTVoQ}PffYtZ_&%3F`cK~)nP}S^HG3eJ z1vU_A6SQ>Qgv^YAuEL5E>Z}kcF?CEA7`#&$SnDFNYnAYc^2Kz_MAnfvOVZ zko2~V5o{THmEikfBScfU))qUqM9~05Frl3|wffvxrtvLcYTpAjsTWF_64XHI?C)Og zYcCTF58gFKpPCf+cr1^TfBCrf$U?CMDHA~Mabr^AIrJ2yUc-3k>0+#XZOQ=*usG(j zr$G#evNr#7ImZ5BZMg2!cn+T1o6ufMfR*E4i-lLw1w4n93(&yo() @@ -79,6 +86,7 @@ namespace HeavenStudio.Games public GameEvent bop = new GameEvent(); public GameEvent noBop = new GameEvent(); + public GameEvent marching = new GameEvent(); public static MarchingOrders instance; @@ -115,6 +123,17 @@ namespace HeavenStudio.Games } } + if (cond.ReportBeat(ref marching.lastReportedBeat, bop.startBeat % 1)) + { + if (cond.songPositionInBeats >= marching.startBeat && cond.songPositionInBeats < marching.startBeat + marching.length) + { + Jukebox.PlayOneShotGame("marchingOrders/step1"); + Cadet1.DoScaledAnimationAsync("MarchL", 0.5f); + Cadet2.DoScaledAnimationAsync("MarchL", 0.5f); + Cadet3.DoScaledAnimationAsync("MarchL", 0.5f); + } + } + if (PlayerInput.Pressed() && !IsExpectingInputNow()) { Jukebox.PlayOneShot("miss"); @@ -128,9 +147,10 @@ namespace HeavenStudio.Games bop.startBeat = beat; } - public void CadetsMarch(float beat) + public void CadetsMarch(float beat, float length) { - + marching.length = length; + marching.startBeat = beat; } public void SargeAttention(float beat) @@ -169,11 +189,15 @@ namespace HeavenStudio.Games MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("marchingOrders/halt1", beat), new MultiSound.Sound("marchingOrders/halt2", beat + 1f), + new MultiSound.Sound("marchingOrders/step1", beat + 1f), }, forcePlay:true); BeatAction.New(Player, new List() { new BeatAction.Action(beat, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { Cadet1.DoScaledAnimationAsync("Halt", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { Cadet2.DoScaledAnimationAsync("Halt", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { Cadet3.DoScaledAnimationAsync("Halt", 0.5f);}), }); } @@ -192,6 +216,14 @@ namespace HeavenStudio.Games new MultiSound.Sound("marchingOrders/march1", beat), new MultiSound.Sound("marchingOrders/march2", beat + 1f), }, forcePlay:true); + } + + public static void HaltSound(float beat) + { + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("marchingOrders/halt1", beat), + new MultiSound.Sound("marchingOrders/halt2", beat + 1f), + }, forcePlay:true); } } } diff --git a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs index 48101ffc..1ce348b3 100644 --- a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs +++ b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs @@ -34,7 +34,8 @@ namespace HeavenStudio.Games.Loaders new GameAction("keep-up", "") { defaultLength = 4f, - resizable = true + resizable = true, + hidden = true }, }); }