diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab index 672415ca5..d0dc26511 100644 --- a/Assets/Resources/Games/marchingOrders.prefab +++ b/Assets/Resources/Games/marchingOrders.prefab @@ -1351,7 +1351,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 20 - m_Sprite: {fileID: 21300000, guid: 9cd3b6e1f65b8924cb61f2bff440c703, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a0b0e8ac9906194b855397e01ca63f9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.5254902} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchL.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchL.anim index 51fdda322..f0674ade1 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchL.anim +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchL.anim @@ -1510,13 +1510,7 @@ AnimationClip: - time: 0 value: {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - time: 0.033333335 - value: {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.06666667 - value: {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.8333333 - value: {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.8666667 - value: {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} + value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - time: 0.9 value: {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} attribute: m_Sprite @@ -1757,10 +1751,7 @@ AnimationClip: - {fileID: -7998149598989480986, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: -7998149598989480986, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: -854871192670245052, guid: 07a712fc3a8592248b24d4108837306c, type: 3} + - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} m_AnimationClipSettings: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchR.anim b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchR.anim index a92c5b11f..f6e9bbb49 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchR.anim +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/MarchR.anim @@ -1806,16 +1806,6 @@ AnimationClip: value: {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - time: 0.033333335 value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.06666667 - value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.1 - value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.8333333 - value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.8666667 - value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - time: 0.9 - value: {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - time: 0.93333334 value: {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} attribute: m_Sprite @@ -2072,11 +2062,6 @@ AnimationClip: - {fileID: -7998149598989480986, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - - {fileID: 3603139382469830057, guid: 07a712fc3a8592248b24d4108837306c, type: 3} - {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3} m_AnimationClipSettings: serializedVersion: 2 diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index f55dbe3f2..ba87b782b 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -1,15 +1,13 @@ //notes: -// BEFORE NEW PROPS -// - minenice will also use this to test out randomly named parameters so coding has to rest until the new props update [DONE] -// - see fan club for separate prefabs (cadets) [DONE] -// - temporarily take sounds from rhre, wait until someone records the full code, including misses, or record it myself (unlikely) [IN PROGRESS] -// AFTER NEW PROPS -// - testmod marching orders using speed +// CURRENT STATE +// - rework on the marching cadet code (it sucks) // - see space soccer, mr upbeat, tunnel for keep-the-beat codes // - figure how to do custom bg changes when the upscaled textures are finished (see karate man, launch party once it releases) // - will use a textbox without going through the visual options but i wonder how..?? (see first contact if ever textboxes are implemented in said minigame) // AFTER FEATURE COMPLETION // - delete all notes once the minigame is considered feature-complete +// - polish. like a lot of polish +// - of course, assetbundles! using HeavenStudio.Util; using System;