diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 10a80c709..43b96326b 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -370,9 +370,10 @@ MonoBehaviour: perfect: 0 late: 0 createBeat: 0 - isEligible: 0 eligibleHitsList: [] aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 kicked: 0 Holder: {fileID: 279641605354570890} RotHolder: {fileID: 7503168023327542540} @@ -7019,9 +7020,10 @@ MonoBehaviour: perfect: 0 late: 0 createBeat: 0 - isEligible: 0 eligibleHitsList: [] aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 startBeat: 0 createBeat: 0 anim: {fileID: 0} @@ -17804,9 +17806,13 @@ MonoBehaviour: - Sprites: - {fileID: 21300000, guid: 72431c7c58f54e848bcb7527635bb72b, type: 3} - {fileID: 21300000, guid: f05694d1ff974fe4387e487d025edede, type: 3} + - Sprites: + - {fileID: 21300000, guid: 02bb4d7e097a4524db553cfabcdbcf10, type: 3} + - {fileID: 21300000, guid: c19e325e2bac3e44d9464debd23372c5, type: 3} BGSprite: {fileID: 7248900333330862853} BGFXSprite: {fileID: 7037067448840752386} BGType: 0 + BGFXType: 0 BGColor: {r: 0.94117653, g: 0.91372555, b: 0.43921572, a: 1} Shadow: 0 ShadowColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png new file mode 100644 index 000000000..620d27c60 Binary files /dev/null and b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png differ diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta new file mode 100644 index 000000000..4b897b2db --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 02bb4d7e097a4524db553cfabcdbcf10 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 72 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: Standalone + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png new file mode 100644 index 000000000..a5fd89b5b Binary files /dev/null and b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png differ diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta new file mode 100644 index 000000000..69243ae5e --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c19e325e2bac3e44d9464debd23372c5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 72 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: Standalone + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_1.png b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png similarity index 100% rename from Assets/Resources/Sprites/Games/KarateMan/karate_bg_1.png rename to Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_1.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/KarateMan/karate_bg_1.png.meta rename to Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_2.png b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png similarity index 100% rename from Assets/Resources/Sprites/Games/KarateMan/karate_bg_2.png rename to Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_2.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/KarateMan/karate_bg_2.png.meta rename to Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index b99edfe00..f1c16bb3b 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -39,7 +39,8 @@ namespace RhythmHeavenMania.Games.KarateMan public enum BackgroundFXType { None, - Sunburst + Sunburst, + Rings } public enum ShadowType @@ -227,13 +228,14 @@ namespace RhythmHeavenMania.Games.KarateMan { if (BGFXSprite.enabled) { + var type = (int)BGFXType - 1; if (bgBeat % 2 == 0) { - BGFXSprite.sprite = BGSprites[0].Sprites[0]; + BGFXSprite.sprite = BGSprites[type].Sprites[0]; } else { - BGFXSprite.sprite = BGSprites[0].Sprites[1]; + BGFXSprite.sprite = BGSprites[type].Sprites[1]; } bgBeat++; } @@ -279,14 +281,15 @@ namespace RhythmHeavenMania.Games.KarateMan public void SetBackgroundFX(BackgroundFXType type) { BGFXType = type; - - if(BGFXType == BackgroundFXType.None) + + if (BGFXType == BackgroundFXType.None) { BGFXSprite.enabled = false; } else { BGFXSprite.enabled = true; + BGFXSprite.sprite = BGSprites[(int)type - 1].Sprites[0]; } }