Tram&Pauline

Assets/Scripts/Games/Tram&Pauline.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d755047a6e62b7140bebccbfc3ef370c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs

@@ -1,22 +0,0 @@
-using HeavenStudio.Util;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace HeavenStudio.Games
-{
-    public class TramAndPauline : Minigame
-    {
-        // Start is called before the first frame update
-        void Start()
-    {
-
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
-}
-}

Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8850749af64f82b44a728e2c273157e1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Minigames.cs

@@ -9,7 +9,6 @@ using HeavenStudio.Games;
 
 namespace HeavenStudio
 {
-    
     public class Minigames
     {
         public class Minigame
@@ -461,9 +460,12 @@ namespace HeavenStudio
                     new GameAction("play stage animation",   delegate { var e = eventCaller.currentEntity; FanClub.instance.PlayAnimStage(e.beat, e.type); }, 1, true, parameters: new List<Param>()
                     {
                         new Param("type", FanClub.StageAnimations.Reset, "Animation", "Animation to play")
+<<<<<<< HEAD
                     })
                 }),
                   new Minigame("Tram&Pauline", "Tram&Pauline \n<color=#eb5454>[WIP don't use]</color>", "000000", false, false, new List<GameAction>()
+=======
+>>>>>>> parent of 092240a (Tram&Pauline)
                     }),
                 }),
                 /*new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>()