diff --git a/Assets/Resources/Games/lockstep.prefab.meta b/Assets/Resources/Games/lockstep.prefab.meta index 595ada9e6..11d407c49 100644 --- a/Assets/Resources/Games/lockstep.prefab.meta +++ b/Assets/Resources/Games/lockstep.prefab.meta @@ -3,5 +3,5 @@ guid: 40e3806f1b67dd845a9c1499b697b3e6 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav.meta b/Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav.meta index 94a996950..34cf69967 100644 --- a/Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/marchOffbeat1.ogg.meta b/Assets/Resources/Sfx/games/lockstep/marchOffbeat1.ogg.meta index 8de62ca97..9588f063c 100644 --- a/Assets/Resources/Sfx/games/lockstep/marchOffbeat1.ogg.meta +++ b/Assets/Resources/Sfx/games/lockstep/marchOffbeat1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/marchOffbeat2.ogg.meta b/Assets/Resources/Sfx/games/lockstep/marchOffbeat2.ogg.meta index 8b42795e5..7d31c717c 100644 --- a/Assets/Resources/Sfx/games/lockstep/marchOffbeat2.ogg.meta +++ b/Assets/Resources/Sfx/games/lockstep/marchOffbeat2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/marchOnbeat1.ogg.meta b/Assets/Resources/Sfx/games/lockstep/marchOnbeat1.ogg.meta index 250e602da..6cfd84a57 100644 --- a/Assets/Resources/Sfx/games/lockstep/marchOnbeat1.ogg.meta +++ b/Assets/Resources/Sfx/games/lockstep/marchOnbeat1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg.meta b/Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg.meta index 0f9b8ba04..db762a43e 100644 --- a/Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg.meta +++ b/Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/miss.ogg.meta b/Assets/Resources/Sfx/games/lockstep/miss.ogg.meta index 8ff021a83..3ff3766ff 100644 --- a/Assets/Resources/Sfx/games/lockstep/miss.ogg.meta +++ b/Assets/Resources/Sfx/games/lockstep/miss.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch1.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch1.wav.meta index 80244a05d..4fb20bca3 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch1.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch1.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch2.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch2.wav.meta index 4ecba3d2f..2c3e7a546 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch2.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch2.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch3.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch3.wav.meta index a39a53d3b..4b85baba7 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch3.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch3.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch4.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch4.wav.meta index f9e719cf2..ec0cc8587 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch4.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch4.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch5.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch5.wav.meta index 6a3e5ad63..8b6cf0f4d 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch5.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch5.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/switch6.wav.meta b/Assets/Resources/Sfx/games/lockstep/switch6.wav.meta index 3bd01de9c..bb4ab7025 100644 --- a/Assets/Resources/Sfx/games/lockstep/switch6.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/switch6.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/tink.mp3.meta b/Assets/Resources/Sfx/games/lockstep/tink.mp3.meta index 210a6c7d7..1f2d2925f 100644 --- a/Assets/Resources/Sfx/games/lockstep/tink.mp3.meta +++ b/Assets/Resources/Sfx/games/lockstep/tink.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lockstep/wayOff.wav.meta b/Assets/Resources/Sfx/games/lockstep/wayOff.wav.meta index 9a34d4e59..61a164465 100644 --- a/Assets/Resources/Sfx/games/lockstep/wayOff.wav.meta +++ b/Assets/Resources/Sfx/games/lockstep/wayOff.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/Animations.meta b/Assets/Resources/Sprites/Games/Lockstep/Animations.meta index 0bd95f247..6acd893ca 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/Animations.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta b/Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta index 520256391..d8f26ffb0 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta @@ -3,7 +3,7 @@ guid: c83ead9dcb4419e4db7a2688db66abb0 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -100,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta b/Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta index f7c497cd4..19b378dc8 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta @@ -3,7 +3,7 @@ guid: e7cdf4af68c99d54397759f6122e9e6e TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -100,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/RenderTextures.meta b/Assets/Resources/Sprites/Games/Lockstep/RenderTextures.meta index 25e5dd69c..9961cc4a4 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/RenderTextures.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/RenderTextures.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/lockstep.png.meta b/Assets/Resources/Sprites/Games/Lockstep/lockstep.png.meta index a84090715..4bf95a972 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/lockstep.png.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/lockstep.png.meta @@ -594,5 +594,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta b/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta index 0feaea378..f10cc7e95 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta @@ -617,5 +617,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Scripts/Games/Lockstep/Lockstep.cs b/Assets/Scripts/Games/Lockstep/Lockstep.cs index 6f846a17e..b86442fc0 100644 --- a/Assets/Scripts/Games/Lockstep/Lockstep.cs +++ b/Assets/Scripts/Games/Lockstep/Lockstep.cs @@ -68,7 +68,11 @@ namespace HeavenStudio.Games.Loaders }, defaultLength = 0.5f, } - }); + }, + new List() {"ntr", "keep"}, + "ntrbackbeat", "en", + new List() {} + ); } } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 244906182..cc13fbc8b 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 d50a411c7..7a3f282cc 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1738393271 +CRC: 1064319978 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -121,3 +121,6 @@ AssetBundleManifest: Info_38: Name: rvlrocket/common Dependencies: {} + Info_39: + Name: ntrbackbeat/common + Dependencies: {} diff --git a/Assets/StreamingAssets/ntrbackbeat.meta b/Assets/StreamingAssets/ntrbackbeat.meta new file mode 100644 index 000000000..b08608227 --- /dev/null +++ b/Assets/StreamingAssets/ntrbackbeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d3f2793913585a4f9535dfb82aaae43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ntrbackbeat/common b/Assets/StreamingAssets/ntrbackbeat/common new file mode 100644 index 000000000..141c91ea2 Binary files /dev/null and b/Assets/StreamingAssets/ntrbackbeat/common differ diff --git a/Assets/StreamingAssets/ntrbackbeat/common.manifest b/Assets/StreamingAssets/ntrbackbeat/common.manifest new file mode 100644 index 000000000..9b93dd58e --- /dev/null +++ b/Assets/StreamingAssets/ntrbackbeat/common.manifest @@ -0,0 +1,96 @@ +ManifestFileVersion: 0 +CRC: 3878722035 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 60d7a12f236cc857954030934eaa713c + TypeTreeHash: + serializedVersion: 2 + Hash: f54a1062817f77cb49f442d230fcc49b +HashAppended: 0 +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 20 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 83 + Script: {instanceID: 0} +- Class: 86 + Script: {instanceID: 0} +- Class: 91 + Script: {instanceID: 0} +- Class: 95 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 8b073f408da6b9a49a796d5ba8777d33, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 210 + Script: {instanceID: 0} +- Class: 212 + Script: {instanceID: 0} +- Class: 213 + Script: {instanceID: 0} +- Class: 222 + Script: {instanceID: 0} +- Class: 223 + Script: {instanceID: 0} +- Class: 224 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.UI + ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent +Assets: +- Assets/Resources/Sprites/Games/Lockstep/Animations/Idle.anim +- Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMiss.anim +- Assets/Resources/Sfx/games/lockstep/switch3.wav +- Assets/Resources/Sfx/games/lockstep/marchOffbeat2.ogg +- Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearBottom.asset +- Assets/Resources/Sprites/Games/Lockstep/Animations/BopReset.anim +- Assets/Resources/Sfx/games/lockstep/marchOnbeat2.ogg +- Assets/Resources/Sprites/Games/Lockstep/Animations/stepswitcher.anim +- Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMarch.anim +- Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMissRest.anim +- Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearTop.asset +- Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG +- Assets/Resources/Sprites/Games/Lockstep/Animations/Bop.anim +- Assets/Resources/Sprites/Games/Lockstep/Animations/stepswitcher.controller +- Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMarch.anim +- Assets/Resources/Sprites/Games/Lockstep/RenderTextures/Materials/SteppersTileable.mat +- Assets/Resources/Sfx/games/lockstep/GROUP_NTR_BACKBEAT_EN_00000000.wav +- Assets/Resources/Sfx/games/lockstep/wayOff.wav +- Assets/Resources/Sfx/games/lockstep/switch2.wav +- Assets/Resources/Sfx/games/lockstep/miss.ogg +- Assets/Resources/Sfx/games/lockstep/switch4.wav +- Assets/Resources/Sprites/Games/Lockstep/lockstep.png +- Assets/Resources/Sprites/Games/Lockstep/RenderTextures/StepperMaterial.mat +- Assets/Resources/Sfx/games/lockstep/marchOffbeat1.ogg +- Assets/Resources/Sfx/games/lockstep/switch5.wav +- Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png +- Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG +- Assets/Resources/Sfx/games/lockstep/switch6.wav +- Assets/Resources/Sprites/Games/Lockstep/Animations/BopIdle.anim +- Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMissRest.anim +- Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersTileable.asset +- Assets/Resources/Sfx/games/lockstep/switch1.wav +- Assets/Resources/Sfx/games/lockstep/marchOnbeat1.ogg +- Assets/Resources/Sfx/games/lockstep/tink.mp3 +- Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMiss.anim +- Assets/Resources/Games/lockstep.prefab +Dependencies: [] diff --git a/Assets/StreamingAssets/ntrbackbeat/common.manifest.meta b/Assets/StreamingAssets/ntrbackbeat/common.manifest.meta new file mode 100644 index 000000000..b4bd01a8a --- /dev/null +++ b/Assets/StreamingAssets/ntrbackbeat/common.manifest.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d43fb0bea8d1abc44b75c7a9c4ef3e3b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ntrbackbeat/common.meta b/Assets/StreamingAssets/ntrbackbeat/common.meta new file mode 100644 index 000000000..622783288 --- /dev/null +++ b/Assets/StreamingAssets/ntrbackbeat/common.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d249f625b3d192c409be376f9d5bc0d0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: