diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab index b34b766a..99727efb 100644 --- a/Assets/Resources/Games/marchingOrders.prefab +++ b/Assets/Resources/Games/marchingOrders.prefab @@ -328,6 +328,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3995609567128879372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6128300493106227402} + - component: {fileID: 9016564786410716591} + m_Layer: 0 + m_Name: A1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6128300493106227402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3995609567128879372} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.01, y: -0.513, z: 0} + m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054} + m_Children: [] + m_Father: {fileID: 708937727427539446} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9016564786410716591 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3995609567128879372} + 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: 0 + m_Sprite: {fileID: 1858988956656276017, 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 &4721136555746708586 GameObject: m_ObjectHideFlags: 0 @@ -488,7 +570,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: -7114735164637011585, guid: 846441fe5edbde04f9bafc98728df9b3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -592,13 +674,14 @@ GameObject: m_Component: - component: {fileID: 708937727427539446} - component: {fileID: 4811943280779304315} + - component: {fileID: 2588778952987738506} m_Layer: 0 m_Name: Sarge m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &708937727427539446 Transform: m_ObjectHideFlags: 0 @@ -607,9 +690,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6498552583844289483} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -6.65, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 6128300493106227402} + - {fileID: 7162401519775036327} m_Father: {fileID: 4161079182365989534} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -653,8 +738,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -664,6 +749,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &2588778952987738506 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6498552583844289483} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1271034aef9ca3c42a149ce300e01eb2, 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!1 &6782522466276628430 GameObject: m_ObjectHideFlags: 0 @@ -734,7 +838,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: -7114735164637011585, guid: 846441fe5edbde04f9bafc98728df9b3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -828,6 +932,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7465949559389362926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7162401519775036327} + - component: {fileID: 8141615606550365401} + m_Layer: 0 + m_Name: A2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7162401519775036327 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7465949559389362926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.072, y: 1.421, z: 0} + m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054} + m_Children: [] + m_Father: {fileID: 708937727427539446} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8141615606550365401 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7465949559389362926} + 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: 0 + m_Sprite: {fileID: 1304300742628370139, 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 &7932591990038472721 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations.meta new file mode 100644 index 00000000..7c92ea1b --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 340b41583a6fa0a4396db6cb87ee4538 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets.meta new file mode 100644 index 00000000..b2ae3e83 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 500827529c3fe23418926f3683db4ff0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge.meta new file mode 100644 index 00000000..6b8cf9e9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9409c58180374684ca10d9d1a3fef703 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Idle.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Idle.anim new file mode 100644 index 00000000..a5394fa3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Idle.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: Idle + 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/Sarge/Idle.anim.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Idle.anim.meta new file mode 100644 index 00000000..972faec6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6658ddf85f0198046b84a6a5d91743df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller new file mode 100644 index 00000000..f7dfcf39 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sarge + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller.meta b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller.meta new file mode 100644 index 00000000..5af89a63 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1271034aef9ca3c42a149ce300e01eb2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta index 2015086d..69def803 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta +++ b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta @@ -1,7 +1,22 @@ fileFormatVersion: 2 guid: 07a712fc3a8592248b24d4108837306c TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 1858988956656276017 + second: sargeBody + - first: + 213: 1304300742628370139 + second: sargeHeadNormal + - first: + 213: -6800957712821089183 + second: sargeHeadTalk + - first: + 213: 8520552564985074897 + second: sargeHeadAngry + - first: + 213: 5111450833538845265 + second: sargeHeadIrritate externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,7 +56,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -75,9 +90,138 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: sargeBody + rect: + serializedVersion: 2 + x: 1824 + y: 16 + width: 208 + height: 400 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1321fd25b947cc910800000000000000 + internalID: 1858988956656276017 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sargeHeadNormal + rect: + serializedVersion: 2 + x: 1808 + y: 448 + width: 224 + height: 208 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd664ac6d9ec91210800000000000000 + internalID: 1304300742628370139 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sargeHeadTalk + rect: + serializedVersion: 2 + x: 1808 + y: 1184 + width: 224 + height: 224 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 16c88d24ef42e91a0800000000000000 + internalID: -6800957712821089183 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sargeHeadAngry + rect: + serializedVersion: 2 + x: 1808 + y: 688 + width: 224 + height: 208 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d49afdf9651f3670800000000000000 + internalID: 8520552564985074897 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sargeHeadIrritate + rect: + serializedVersion: 2 + x: 1808 + y: 928 + width: 224 + height: 224 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15a05f393758fe640800000000000000 + internalID: 5111450833538845265 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index 0e0e4871..13031eef 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -1,3 +1,10 @@ +//notes: +//1. see space soccer, mr upbeat, tunnel for keep-the-beat codes +//2. see fan club for separate prefabs +//3. temporarily take sounds from rhre, wait until someone records the full code, including misses, or record it myself (unlikely) +//4. figure how to do custom bg changes when the upscaled textures are finished (see karate man, launch party once it releases) +//5. delete all notes once the minigame is considered feature-complete + using HeavenStudio.Util; using System; using System.Collections.Generic; @@ -20,7 +27,7 @@ namespace HeavenStudio.Games.Loaders //the cues do nothing at the moment, so i temporarily disabled them - //new GameAction("marching", delegate {}, 4f, true), + //new GameAction("marching", delegate { MarchingOrders.instance.CadetsMarch(eventCaller.currentEntity.beat); }, 4f, true), //new GameAction("attention", delegate {}, 2f, false), //new GameAction("march", delegate {}, 2f, false), @@ -28,7 +35,7 @@ namespace HeavenStudio.Games.Loaders //new GameAction("face turn", delegate {}, 4f, false, parameters: new List() //{ // new Param("type", MarchingOrders.DirectionFaceTurn.Right, "Direction", "The direction sarge wants the cadets to face"), - // new Param("type2", MarchingOrders.FaceTurnLength.Normal, "Length", "How fast or slow the event lasts"), + // new Param("type2", MarchingOrders.FaceTurnLength.Normal, "Length", "How fast or slow the event lasts"), //}), }); } @@ -49,10 +56,12 @@ namespace HeavenStudio.Games Fast, } + public static MarchingOrders instance; + // Start is called before the first frame update void Awake() { - + instance = this; } // Update is called once per frame @@ -60,6 +69,11 @@ namespace HeavenStudio.Games { } + + public void CadetsMarch(float beat) + { + + } } }