From d65953ec7b78993e9a9a76a330b0a0195bfab0b0 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Sun, 21 May 2023 19:54:06 +0200 Subject: [PATCH] die (#430) --- Assets/Scripts/Games/Tram&Pauline/Curtains.cs | 19 ----- .../Games/Tram&Pauline/Curtains.cs.meta | 11 --- Assets/Scripts/Games/Tram&Pauline/Pauline.cs | 21 ----- .../Games/Tram&Pauline/Pauline.cs.meta | 11 --- Assets/Scripts/Games/Tram&Pauline/Tram.cs | 21 ----- .../Scripts/Games/Tram&Pauline/Tram.cs.meta | 11 --- .../Games/Tram&Pauline/TramAndPauline.cs | 84 ------------------- .../Scripts/Games/Tram&Pauline/Trampoline.cs | 21 ----- .../Games/Tram&Pauline/Trampoline.cs.meta | 11 --- ...{Tram&Pauline.meta => TramAndPauline.meta} | 0 .../Games/TramAndPauline/TramAndPauline.cs | 31 +++++++ .../TramAndPauline.cs.meta | 0 12 files changed, 31 insertions(+), 210 deletions(-) delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Curtains.cs delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Curtains.cs.meta delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Pauline.cs delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Pauline.cs.meta delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Tram.cs delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Tram.cs.meta delete mode 100644 Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Trampoline.cs delete mode 100644 Assets/Scripts/Games/Tram&Pauline/Trampoline.cs.meta rename Assets/Scripts/Games/{Tram&Pauline.meta => TramAndPauline.meta} (100%) create mode 100644 Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs rename Assets/Scripts/Games/{Tram&Pauline => TramAndPauline}/TramAndPauline.cs.meta (100%) diff --git a/Assets/Scripts/Games/Tram&Pauline/Curtains.cs b/Assets/Scripts/Games/Tram&Pauline/Curtains.cs deleted file mode 100644 index 104a0259..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Curtains.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using HeavenStudio.Util; - -namespace HeavenStudio.Games.Scripts_TramAndPauline -{ - public class Curtains : MonoBehaviour - { - private Animator anim; - - - private void Awake() - { - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Games/Tram&Pauline/Curtains.cs.meta b/Assets/Scripts/Games/Tram&Pauline/Curtains.cs.meta deleted file mode 100644 index c7b68dfc..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Curtains.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e986f325614dad34f99276dcf3bd61ff -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/Tram&Pauline/Pauline.cs b/Assets/Scripts/Games/Tram&Pauline/Pauline.cs deleted file mode 100644 index 58eebd97..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Pauline.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio.Games.Scripts_TramAndPauline -{ - public class Pauline : MonoBehaviour - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Games/Tram&Pauline/Pauline.cs.meta b/Assets/Scripts/Games/Tram&Pauline/Pauline.cs.meta deleted file mode 100644 index 8e4d4a1c..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Pauline.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c9740a191998b7429be1f4ebee714f1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/Tram&Pauline/Tram.cs b/Assets/Scripts/Games/Tram&Pauline/Tram.cs deleted file mode 100644 index aa02edb1..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Tram.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio.Games.Scripts_TramAndPauline -{ - public class Tram : MonoBehaviour - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } -} diff --git a/Assets/Scripts/Games/Tram&Pauline/Tram.cs.meta b/Assets/Scripts/Games/Tram&Pauline/Tram.cs.meta deleted file mode 100644 index 073a60d8..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Tram.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6d9f0a0c395f5774abebc63146dd3534 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs b/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs deleted file mode 100644 index 642831dc..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs +++ /dev/null @@ -1,84 +0,0 @@ -using HeavenStudio.Util; -using System; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio.Games.Loaders -{ - using static Minigames; - public static class AgbTramLoader - { - public static Minigame AddGame(EventCaller eventCaller) - { - return new Minigame("tram&Pauline", "Tram & Pauline \n[INITIALIZATION ONLY]", "adb5e7", true, false, new List() - { - new GameAction("curtains", "Curtains") - { - function = delegate { TramAndPauline.instance.Curtains(eventCaller.currentEntity.beat); }, - defaultLength = 0.5f - }, - new GameAction("SFX", "SFX") - { - function = delegate { var e = eventCaller.currentEntity; TramAndPauline.instance.SFX(e.beat, e["toggle"]); }, - defaultLength = 2.5f, - parameters = new List() - { - new Param("type", TramAndPauline.SoundEffects.Henge, "calls", "the sound effects to choose from"), - } - }, - - } - ); - } - } -} -namespace HeavenStudio.Games -{ - using Scripts_TramAndPauline; - - public class TramAndPauline : Minigame - { - public enum CurtainState - { - Raised, - Lower - } - - public enum SoundEffects - { - Henge, //Shapeshift - Henshin, //Transform - Jump, - Seino //One Two Three Go - - } - public static TramAndPauline instance; - - [Header("Animators")] - public Animator RaiseCurtains; - public Animator LowerCurtains; - - - private void Awake() - { - instance = this; - } - - public void Curtains(float beat) - { - - } - - public void SFX(float beat, bool playSound) - { - playSound = false; - var sound = new[] - { - new MultiSound.Sound("tram&Pauline/trampoline_unused_henge", beat), - new MultiSound.Sound("tram&Pauline/trampoline_unused_henshin", beat + 1f), - new MultiSound.Sound("tram&Pauline/trampoline_unused_jump", beat + 2f), - new MultiSound.Sound("tram&Pauline/trampoline_unused_senio", beat + 3f) - }; - } - } -} diff --git a/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs b/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs deleted file mode 100644 index 4cae6fd5..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio.Games.Scripts_TramAndPauline -{ - public class Trampoline : MonoBehaviour - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs.meta b/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs.meta deleted file mode 100644 index 1fb8da6d..00000000 --- a/Assets/Scripts/Games/Tram&Pauline/Trampoline.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4ac862c09eaeaa64083a07ef7ca089f4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/Tram&Pauline.meta b/Assets/Scripts/Games/TramAndPauline.meta similarity index 100% rename from Assets/Scripts/Games/Tram&Pauline.meta rename to Assets/Scripts/Games/TramAndPauline.meta diff --git a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs new file mode 100644 index 00000000..6253c79b --- /dev/null +++ b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs @@ -0,0 +1,31 @@ +using HeavenStudio.Util; +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace HeavenStudio.Games.Loaders +{ + using static Minigames; + public static class AgbTramLoader + { + public static Minigame AddGame(EventCaller eventCaller) + { + return new Minigame("tramAndPauline", "Tram & Pauline \n[INITIALIZATION ONLY]", "adb5e7", true, false, new List() + { + + } + ); + } + } +} +namespace HeavenStudio.Games +{ + public class TramAndPauline : Minigame + { + public static TramAndPauline instance; + private void Awake() + { + instance = this; + } + } +} diff --git a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs.meta b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs.meta similarity index 100% rename from Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs.meta rename to Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs.meta