diff --git a/Assets/Resources/Games/mrUpbeat.prefab.meta b/Assets/Resources/Games/mrUpbeat.prefab.meta index 3fb9e1747..5982ca5d9 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab.meta +++ b/Assets/Resources/Games/mrUpbeat.prefab.meta @@ -3,5 +3,5 @@ guid: 7b2532abb5b31af4a9f8fa7eab51932e PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta index 180c20e53..ae277bc77 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta index 1419c3e3a..003069d7a 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta index 324b3a5da..ffbcb8b9a 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta index 8b9e008fb..602858fb5 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta index 01496d6fc..259515393 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta index 4dee5199e..15f2649e6 100644 --- a/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta +++ b/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta index df8848651..7bf59ed48 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta index 3cfda5904..449bfe632 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta index 626b819d7..1430b3c8e 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta @@ -999,5 +999,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: agboffbeat/common assetBundleVariant: diff --git a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs index 7c57ee4af..d2a588157 100644 --- a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs +++ b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs @@ -61,7 +61,7 @@ namespace HeavenStudio.Games.Loaders priority = 4, }, }, - new List() {"pco", "normal"}, + new List() {"pco", "normal", "repeat"}, "pcomeat", "en", new List() {} ); diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index ccac35137..48bf8b287 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -80,7 +80,11 @@ namespace HeavenStudio.Games.Loaders new Param("blip", true, "Should Blip?", "Should Mr. Upbeat blip every offbeat?"), } }, - }); + }, + new List() {"agb", "keep"}, + "agboffbeat", "en", + new List() {} + ); } } } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 4abf6f7ad..629d0c7c6 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 877047d09..e760899fb 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 85108958 +CRC: 1744038138 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -127,3 +127,6 @@ AssetBundleManifest: Info_40: Name: pcomeat/common Dependencies: {} + Info_41: + Name: agboffbeat/common + Dependencies: {} diff --git a/Assets/StreamingAssets/agboffbeat.meta b/Assets/StreamingAssets/agboffbeat.meta new file mode 100644 index 000000000..9a442de2c --- /dev/null +++ b/Assets/StreamingAssets/agboffbeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 233dff20019f7dd468b49a704e74a56d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/agboffbeat/common b/Assets/StreamingAssets/agboffbeat/common new file mode 100644 index 000000000..864e17072 Binary files /dev/null and b/Assets/StreamingAssets/agboffbeat/common differ diff --git a/Assets/StreamingAssets/agboffbeat/common.manifest b/Assets/StreamingAssets/agboffbeat/common.manifest new file mode 100644 index 000000000..c3a7bac39 --- /dev/null +++ b/Assets/StreamingAssets/agboffbeat/common.manifest @@ -0,0 +1,110 @@ +ManifestFileVersion: 0 +CRC: 4204433912 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 097c0984f2d914db70914f14ac684d05 + TypeTreeHash: + serializedVersion: 2 + Hash: 34ccacf681bd423b54afdcbd80572bc4 +HashAppended: 0 +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 23 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 83 + Script: {instanceID: 0} +- Class: 91 + Script: {instanceID: 0} +- Class: 95 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: a258517e5332c824a8b81a03036fc2a8, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ab2114bdc8544297b417dfefe9f1e410, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 128 + Script: {instanceID: 0} +- Class: 212 + Script: {instanceID: 0} +- Class: 213 + Script: {instanceID: 0} +- Class: 224 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.FaceInfo_Legacy +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.FontAssetCreationSettings +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.KerningTable +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_Character +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_FontFeatureTable +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_FontWeightPair +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_Style +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.VertexGradient +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.FaceInfo +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.Glyph +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.GlyphMetrics +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.GlyphRect +- AssemblyName: UnityEngine.UI + ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent +Assets: +- Assets/Resources/Sfx/games/mrUpbeat/blip.ogg +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/MetronomeGoRight.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/MetronomeIdle.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim +- Assets/Resources/Sprites/Games/MrUpbeat/blip.mat +- Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg +- Assets/Resources/Games/mrUpbeat.prefab +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/MetronomeGoLeft.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Metronome.controller +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim +- Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png +- Assets/Resources/Sfx/games/mrUpbeat/applause.ogg +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/MetronomeIdleLeft.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim +- Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg +- Assets/Resources/Sfx/games/mrUpbeat/ding.ogg +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim +- Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim +- Assets/Resources/Sfx/games/mrUpbeat/step.ogg +Dependencies: [] diff --git a/Assets/StreamingAssets/agboffbeat/common.manifest.meta b/Assets/StreamingAssets/agboffbeat/common.manifest.meta new file mode 100644 index 000000000..ef6a29347 --- /dev/null +++ b/Assets/StreamingAssets/agboffbeat/common.manifest.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 880a950c8f6784145804e1fef4f22705 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/agboffbeat/common.meta b/Assets/StreamingAssets/agboffbeat/common.meta new file mode 100644 index 000000000..eaccd7a8c --- /dev/null +++ b/Assets/StreamingAssets/agboffbeat/common.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c8d66ff37a0e724487945aa1574a815 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: