From c557c62b329fe2fa4c863e4027d3e84095ceb87d Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 25 Feb 2022 23:57:18 -0500 Subject: [PATCH 1/2] Added Light to the Light Bulb if colour is changed with right click You can now right click on bulb in the editor to change the colour of the light emitted. If the colour is set to black then no light is drawn. --- Assets/Resources/Games/karateman.prefab | 94 ++++++++++++++++- .../Games/KarateMan/karateman_bulb_light.png | Bin 0 -> 18566 bytes .../KarateMan/karateman_bulb_light.png.meta | 96 ++++++++++++++++++ Assets/Scripts/Games/KarateMan/KarateMan.cs | 8 +- Assets/Scripts/Games/KarateMan/Pot.cs | 2 + Assets/Scripts/Minigames.cs | 5 +- 6 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png create mode 100644 Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 06be357f..a3294769 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -6719,7 +6719,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 7180297105842423010} m_Father: {fileID: 7248900332475218834} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7022,6 +7023,7 @@ MonoBehaviour: anim: {fileID: 0} Holder: {fileID: 7248900331917783119} Sprite: {fileID: 7248900332269585492} + BottomSprite: {fileID: 8301297041882507163} Shadow: {fileID: 7248900331919671867} isThrown: 0 isHit: 0 @@ -17767,6 +17769,14 @@ MonoBehaviour: - {fileID: 8671423413994339737, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: -6341196331951941137, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + ObjectBottomSprites: + - {fileID: 0} + - {fileID: 21300000, guid: 2dcc4a0e0420a8e4097445cac4b2e1ab, type: 3} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} BarrelSprites: - {fileID: 6524922379630696755, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 1156572009758090512, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} @@ -18154,6 +18164,88 @@ Transform: m_Father: {fileID: 8457699647532782750} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8301297041882507163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7180297105842423010} + - component: {fileID: 1579546270015444335} + m_Layer: 0 + m_Name: BottomSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7180297105842423010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8301297041882507163} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.26, y: 0.15, z: 0} + m_LocalScale: {x: 1.3307, y: 1.3307, z: 1.3307} + m_Children: [] + m_Father: {fileID: 7248900332269585493} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1579546270015444335 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8301297041882507163} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 59 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.4, y: 1.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8746018100916256658 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png new file mode 100644 index 0000000000000000000000000000000000000000..b4691cd9de3a918a05f81c21bbd80280be41430d GIT binary patch literal 18566 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 RO2GgC002ovPDHLkV1f>O836zQ literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta new file mode 100644 index 00000000..6727345d --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 2dcc4a0e0420a8e4097445cac4b2e1ab +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: 100 + 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 + 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/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index aa5696e8..d21ba4ba 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -18,6 +18,7 @@ namespace RhythmHeavenMania.Games.KarateMan public static KarateMan instance { get; set; } public Sprite[] ObjectSprites; + public Sprite[] ObjectBottomSprites; public Sprite[] BarrelSprites; public List BGSprites; @@ -73,7 +74,7 @@ namespace RhythmHeavenMania.Games.KarateMan }); } - public void Shoot(float beat, int type, bool combo = false, string throwAnim = "", int comboIndex = 0, Vector2 endShadowPos = new Vector2()) + public void Shoot(float beat, int type, bool combo = false, string throwAnim = "", int comboIndex = 0, Vector2 endShadowPos = new Vector2(), UnityEngine.Color tint = default) { GameObject pot = Instantiate(Pot); pot.transform.parent = Pot.transform.parent; @@ -115,6 +116,11 @@ namespace RhythmHeavenMania.Games.KarateMan case 1: outSnd = "karateman/lightbulbOut"; p.hitSnd = "karateman/lightbulbHit"; + SpriteRenderer sr = p.BottomSprite.GetComponent(); + if (tint != default && tint != Color.black) { + sr.sprite = ObjectBottomSprites[type]; + sr.color = tint; + } break; case 2: if (Starpelly.Mathp.GetDecimalFromFloat(beat) == 0f) diff --git a/Assets/Scripts/Games/KarateMan/Pot.cs b/Assets/Scripts/Games/KarateMan/Pot.cs index 46d032fa..5ff8c4cc 100644 --- a/Assets/Scripts/Games/KarateMan/Pot.cs +++ b/Assets/Scripts/Games/KarateMan/Pot.cs @@ -15,6 +15,7 @@ namespace RhythmHeavenMania.Games.KarateMan public GameObject Holder; private GameObject newHolder; public GameObject Sprite; + public GameObject BottomSprite; private SpriteRenderer spriteComp; public GameObject Shadow; private SpriteRenderer shadowSpriteComp; @@ -60,6 +61,7 @@ namespace RhythmHeavenMania.Games.KarateMan shadowSpriteComp = Shadow.GetComponent(); Sprite.transform.eulerAngles = new Vector3(0, 0, Random.Range(0, 360)); + BottomSprite.transform.eulerAngles = Sprite.transform.eulerAngles; if (type == 2) hitLength = 14f; diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index a6eb31d3..cdb75265 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -230,7 +230,10 @@ namespace RhythmHeavenMania { new GameAction("bop", delegate { KarateMan.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 0.5f, true), new GameAction("pot", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 0); }, 2), - new GameAction("bulb", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 1); }, 2), + new GameAction("bulb", delegate { var e = eventCaller.currentEntity; KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 1, tint: e.colorA); }, 2, false, new List() + { + new Param("colorA", Color.white, "Light Bulb Color") + }), new GameAction("rock", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 2); }, 2), new GameAction("ball", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 3); }, 2), new GameAction("kick", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 4); }, 4.5f), From 26b9497114a6ed5eb21469ba7bc82ab3a191bcba Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Sat, 26 Feb 2022 01:31:35 -0500 Subject: [PATCH 2/2] Implemented proper sprite, flickering, and dropdown menu There's now a "type" dropdown menu that allows you to choose between "Normal", "Yellow", "Blue", and "Custom". Custom will use the color specified in the Custom Color field --- Assets/Resources/Games/karateman.prefab | 187 ++++++++++-------- .../Games/KarateMan/karateman_bulb_light.png | Bin 18566 -> 4917 bytes .../KarateMan/karateman_bulb_light.png.meta | 14 +- Assets/Scripts/Games/KarateMan/KarateMan.cs | 21 +- Assets/Scripts/Games/KarateMan/Pot.cs | 13 +- Assets/Scripts/Minigames.cs | 10 +- Assets/Scripts/SpriteFlicker.cs | 24 +++ Assets/Scripts/SpriteFlicker.cs.meta | 11 ++ 8 files changed, 187 insertions(+), 93 deletions(-) create mode 100644 Assets/Scripts/SpriteFlicker.cs create mode 100644 Assets/Scripts/SpriteFlicker.cs.meta diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index a3294769..2452b4e5 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -6720,7 +6720,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7180297105842423010} + - {fileID: 2894176741642927925} m_Father: {fileID: 7248900332475218834} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7023,7 +7023,7 @@ MonoBehaviour: anim: {fileID: 0} Holder: {fileID: 7248900331917783119} Sprite: {fileID: 7248900332269585492} - BottomSprite: {fileID: 8301297041882507163} + BulbLightSprite: {fileID: 8800416197462662414} Shadow: {fileID: 7248900331919671867} isThrown: 0 isHit: 0 @@ -17757,6 +17757,11 @@ MonoBehaviour: m_EditorClassIdentifier: EligibleHits: [] firstEnable: 0 + LightBulbColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0.007843138, g: 0.8117647, b: 1, a: 1} + - {r: 233, g: 233, b: 0, a: 1} + - {r: 0, g: 0, b: 0, a: 0} Pot: {fileID: 7248900332380919981} Bomb: {fileID: 1878496493894552565} KarateJoe: {fileID: 7248900332013002443} @@ -18164,88 +18169,6 @@ Transform: m_Father: {fileID: 8457699647532782750} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8301297041882507163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7180297105842423010} - - component: {fileID: 1579546270015444335} - m_Layer: 0 - m_Name: BottomSprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7180297105842423010 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8301297041882507163} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.26, y: 0.15, z: 0} - m_LocalScale: {x: 1.3307, y: 1.3307, z: 1.3307} - m_Children: [] - m_Father: {fileID: 7248900332269585493} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1579546270015444335 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8301297041882507163} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 59 - m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.4, y: 1.4} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &8746018100916256658 GameObject: m_ObjectHideFlags: 0 @@ -18328,3 +18251,99 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8800416197462662414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2894176741642927925} + - component: {fileID: 7700154717549798099} + - component: {fileID: 8377832867748690547} + m_Layer: 0 + m_Name: BulbLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2894176741642927925 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800416197462662414} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.26, y: 0.02, z: 0} + m_LocalScale: {x: 2.1, y: 2.1, z: 2.1} + m_Children: [] + m_Father: {fileID: 7248900332269585493} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7700154717549798099 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800416197462662414} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 60 + m_Sprite: {fileID: 21300000, guid: 2dcc4a0e0420a8e4097445cac4b2e1ab, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.9444444, y: 1.9444444} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8377832867748690547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800416197462662414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e61c91c33ba01f1409c503668f734047, type: 3} + m_Name: + m_EditorClassIdentifier: + flickerInterval: 0.1 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png index b4691cd9de3a918a05f81c21bbd80280be41430d..8c4060dff8381ae27a7466b26b748519b39f3eee 100644 GIT binary patch literal 4917 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 Uj_8kVzq$ZxD+kLWb87Ve0l1UP3jhEB literal 18566 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 RO2GgC002ovPDHLkV1f>O836zQ diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta index 6727345d..c5d63061 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 72 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,6 +75,18 @@ TextureImporter: 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: [] diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index d21ba4ba..3ea5dafe 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -8,6 +8,22 @@ namespace RhythmHeavenMania.Games.KarateMan { public class KarateMan : Minigame { + public enum LightBulbType + { + Normal = 0, + Blue = 1, + Yellow = 2, + Custom = 3 + } + + public Color[] LightBulbColors = new Color[] + { + new Color(0, 0, 0, 0), + new Color(2, 207, 255), + new Color(233, 233, 0), + new Color(0, 0, 0, 0) + }; + const float hitVoiceOffset = 0.042f; public GameObject Pot, Bomb; @@ -116,10 +132,9 @@ namespace RhythmHeavenMania.Games.KarateMan case 1: outSnd = "karateman/lightbulbOut"; p.hitSnd = "karateman/lightbulbHit"; - SpriteRenderer sr = p.BottomSprite.GetComponent(); if (tint != default && tint != Color.black) { - sr.sprite = ObjectBottomSprites[type]; - sr.color = tint; + p.BulbLightSprite.SetActive(true); + p.BulbLightSprite.GetComponent().color = tint; } break; case 2: diff --git a/Assets/Scripts/Games/KarateMan/Pot.cs b/Assets/Scripts/Games/KarateMan/Pot.cs index 5ff8c4cc..1e0692c4 100644 --- a/Assets/Scripts/Games/KarateMan/Pot.cs +++ b/Assets/Scripts/Games/KarateMan/Pot.cs @@ -15,10 +15,11 @@ namespace RhythmHeavenMania.Games.KarateMan public GameObject Holder; private GameObject newHolder; public GameObject Sprite; - public GameObject BottomSprite; + public GameObject BulbLightSprite; private SpriteRenderer spriteComp; public GameObject Shadow; private SpriteRenderer shadowSpriteComp; + private SpriteRenderer bulbLightSpriteComp; public bool isThrown; public bool isHit = false; @@ -59,9 +60,10 @@ namespace RhythmHeavenMania.Games.KarateMan anim = GetComponent(); spriteComp = Sprite.GetComponent(); shadowSpriteComp = Shadow.GetComponent(); + bulbLightSpriteComp = BulbLightSprite.GetComponent(); Sprite.transform.eulerAngles = new Vector3(0, 0, Random.Range(0, 360)); - BottomSprite.transform.eulerAngles = Sprite.transform.eulerAngles; + BulbLightSprite.transform.eulerAngles = Sprite.transform.eulerAngles; if (type == 2) hitLength = 14f; @@ -201,12 +203,15 @@ namespace RhythmHeavenMania.Games.KarateMan if (normalizedBeat > 1) { spriteComp.sortingOrder = -20; + bulbLightSpriteComp.sortingOrder = -20; shadowSpriteComp.sortingOrder = -30; } else { // Pots closer to Joe are sorted further back. - spriteComp.sortingOrder = 60 - Mathf.RoundToInt(10f * normalizedBeat); + int newOrder = 60 - Mathf.RoundToInt(10f * normalizedBeat); + spriteComp.sortingOrder = newOrder; + bulbLightSpriteComp.sortingOrder = newOrder; } } @@ -291,6 +296,7 @@ namespace RhythmHeavenMania.Games.KarateMan isHit = true; spriteComp.sortingOrder = 49; + bulbLightSpriteComp.sortingOrder = 49; } public void Miss() @@ -307,6 +313,7 @@ namespace RhythmHeavenMania.Games.KarateMan isThrown = false; anim.enabled = false; spriteComp.sortingOrder = 49; + bulbLightSpriteComp.sortingOrder = 49; } private void NewHolder() diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index cdb75265..c2d8e684 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -230,9 +230,15 @@ namespace RhythmHeavenMania { new GameAction("bop", delegate { KarateMan.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 0.5f, true), new GameAction("pot", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 0); }, 2), - new GameAction("bulb", delegate { var e = eventCaller.currentEntity; KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 1, tint: e.colorA); }, 2, false, new List() + new GameAction("bulb", delegate { + var e = eventCaller.currentEntity; + var c = KarateMan.instance.LightBulbColors[e.type]; + if(e.type == 3) c = e.colorA; + KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 1, tint: c); + }, 2, false, new List() { - new Param("colorA", Color.white, "Light Bulb Color") + new Param("type", KarateMan.LightBulbType.Normal, "Type"), + new Param("colorA", new Color(), "Custom Color") }), new GameAction("rock", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 2); }, 2), new GameAction("ball", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 3); }, 2), diff --git a/Assets/Scripts/SpriteFlicker.cs b/Assets/Scripts/SpriteFlicker.cs new file mode 100644 index 00000000..244735a8 --- /dev/null +++ b/Assets/Scripts/SpriteFlicker.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpriteFlicker : MonoBehaviour +{ + + public float flickerInterval; + + SpriteRenderer sr; + + // Start is called before the first frame update + void Start() + { + sr = GetComponent(); + InvokeRepeating("ToggleVisibility", 0f, flickerInterval); + } + + // Update is called once per frame + void ToggleVisibility() + { + sr.enabled = !sr.enabled; + } +} diff --git a/Assets/Scripts/SpriteFlicker.cs.meta b/Assets/Scripts/SpriteFlicker.cs.meta new file mode 100644 index 00000000..202164cd --- /dev/null +++ b/Assets/Scripts/SpriteFlicker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e61c91c33ba01f1409c503668f734047 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: