From e337fe650e1f81c63e99a4c7b8abc270feb4fc70 Mon Sep 17 00:00:00 2001 From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com> Date: Thu, 28 Jul 2022 17:16:20 -0500 Subject: [PATCH] Track 5 fully functional also fixed karate man's Set Background Effects --- Assets/Scenes/Editor.unity | 2 +- Assets/Scripts/Games/KarateMan/KarateMan.cs | 4 ++-- Assets/Scripts/LevelEditor/editortheme.json | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 85bb7786..e394f5a7 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -38340,7 +38340,7 @@ MonoBehaviour: SongPos: {fileID: 1567318397} CurrentTempo: {fileID: 1783963081} eventObjs: [] - LayerCount: 4 + LayerCount: 5 metronomeEnabled: 0 resizable: 0 snapInterval: 0.25 diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 0394dae5..6184d418 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -52,14 +52,14 @@ namespace HeavenStudio.Games.Loaders var c = KarateMan.instance.BackgroundColors[e.type]; if(e.type == (int)KarateMan.BackgroundType.Custom) c = e.colorA; KarateMan.instance.SetBackgroundColor(e.type, e.type2, c, e.colorB); - KarateMan.instance.SetBackgroundFX((KarateMan.BackgroundFXType)eventCaller.currentEntity.type); + KarateMan.instance.SetBackgroundFX((KarateMan.BackgroundFXType)eventCaller.currentEntity.type3); }, 0.5f, false, new List() { new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"), new Param("type2", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"), new Param("colorA", new Color(), "Custom Background Color", "The background color to use when background type is set to Custom"), new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom"), - new Param("type", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed") + new Param("type3", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed") }), diff --git a/Assets/Scripts/LevelEditor/editortheme.json b/Assets/Scripts/LevelEditor/editortheme.json index bb8bb9bd..7f69ad1d 100644 --- a/Assets/Scripts/LevelEditor/editortheme.json +++ b/Assets/Scripts/LevelEditor/editortheme.json @@ -9,10 +9,10 @@ "MusicLayerCol": "a663cc", "Layer1Col": "ef476f", - "Layer2Col": "ffd166", - "Layer3Col": "06d6a0", - "Layer4Col": "118ab2", - "Layer5Col": "34eb55", + "Layer2Col": "f5813d", + "Layer3Col": "ffd166", + "Layer4Col": "06d6a0", + "Layer5Col": "118ab2", "EventSelectedCol": "61e5ff", "EventNormalCol": "FFFFFF",