diff --git a/Assets/Resources/Sfx/games/marchingOrders.meta b/Assets/Resources/Sfx/games/marchingOrders.meta new file mode 100644 index 00000000..f391029e --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7f38b2a59eb7a0469b61778ba2e8310 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/!README.txt.meta b/Assets/Resources/Sfx/games/marchingOrders/!README.txt.meta new file mode 100644 index 00000000..c679e522 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/!README.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e03e800352232d54bafdb38be88de99d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/attention1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/attention1.ogg.meta new file mode 100644 index 00000000..f0bee9e9 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/attention1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fe85c757ab795a0459b759f980e7ddf9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/attention2.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/attention2.ogg.meta new file mode 100644 index 00000000..fca6218d --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/attention2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 78ab873c8b8d1ec40a610282e98a9087 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/attention3.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/attention3.ogg.meta new file mode 100644 index 00000000..716ff55f --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/attention3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bbfdce9f4e3087f4a95005194f1f842f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/halt1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/halt1.ogg.meta new file mode 100644 index 00000000..f4f90c0d --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/halt1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a2396dcbdfa1f5e46a340b85bcc0a0e4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/halt2.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/halt2.ogg.meta new file mode 100644 index 00000000..7f5c5542 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/halt2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a05533c6dea3a0c4eb4cadca20267276 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn1.ogg.meta new file mode 100644 index 00000000..caa54554 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 61a91604b9f5bcb4084b7cf5acf11420 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn2.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn2.ogg.meta new file mode 100644 index 00000000..77aea382 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6b166e5ef7e64d04ebc2f2d95fc5b1f8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn3.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn3.ogg.meta new file mode 100644 index 00000000..6f5806e6 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bb016c0313ebdc041a749ee996f0dd97 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta new file mode 100644 index 00000000..5ff8474b --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 68bc11fbde502954bac98356e27ebf0a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/march1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/march1.ogg.meta new file mode 100644 index 00000000..d32f22ab --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/march1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4df19c853fac1574b9b86b722a0f6e04 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/march2.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/march2.ogg.meta new file mode 100644 index 00000000..859d7853 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/march2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 05fcebf8448fd4541b8af22970503702 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn1.ogg.meta new file mode 100644 index 00000000..a668a2b2 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5eedb67e8a8b2754ca70a554be43859b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn2.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn2.ogg.meta new file mode 100644 index 00000000..1cb9cb2d --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6ab58a5e4e682ca47a6bee0f4bdc2782 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn3.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn3.ogg.meta new file mode 100644 index 00000000..51aad660 --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f9c36440f6ec732409b43b588533f673 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta new file mode 100644 index 00000000..0fdf155f --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a309c402deb4cec409b80f448812886f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta new file mode 100644 index 00000000..94136d4d --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 072598f0f25ee574098a1c1a912d02b0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Cadets.controller b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Cadets.controller index a99b22f7..82a53c38 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Cadets.controller +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Cadets/Cadets.controller @@ -1,5 +1,53 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8216641228084125082 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: b35f8b0a572f51d4baa06eaefa117fac, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-7248248035339531585 +AnimatorStateMachine: + serializedVersion: 6 + 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: -8216641228084125082} + 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: -8216641228084125082} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +57,16 @@ AnimatorController: m_Name: Cadets serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7248248035339531585} + 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/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller index f7dfcf39..3d74a0be 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller +++ b/Assets/Resources/Sprites/Games/MarchingOrders/Animations/Sarge/Sarge.controller @@ -9,4 +9,64 @@ AnimatorController: m_Name: Sarge serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5496941573075515448} + 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 &5496941573075515448 +AnimatorStateMachine: + serializedVersion: 6 + 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: 6881271345893438890} + 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: 6881271345893438890} +--- !u!1102 &6881271345893438890 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 6658ddf85f0198046b84a6a5d91743df, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png index bdef6d5c..8b3a09cf 100644 Binary files a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png and b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png differ