Reintegrate Melody Mania

.gitignore

@@ -6,6 +6,22 @@
 [Bb]uild/
 [Bb]uilds/
 Assets/AssetStoreTools*
+**/InitTestScene*
+
+# Spleeter models
+pretrained_models/
+
+# Generated classes
+# TODO: Cannot generate code in Unity from C#. Thus, all generated files need to be added to Git.
+#       See https://forum.unity.com/threads/generate-code-before-build-in-project-with-compiler-errors.1412511/#post-8878443.
+#R_PlaySharedUssClasses.cs
+#R_PlaySharedUxmlNames.cs
+#RUssClasses.cs
+#RUxmlNames.cs
+
+# Source maps
+*.*.map
+*.*.map.meta
 
 # Generated classes
 # TODO: Cannot generate code in Unity from C#. Thus, all generated files need to be added to Git.
@@ -25,6 +41,9 @@ Assets/AssetStoreTools*
 # Visual Studio cache directory
 .vs/
 
+# Visual Studio Code config
+.vscode/
+
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
@@ -51,6 +70,7 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+.utmp/
 
 # OS generated
 .DS_Store*
@@ -63,4 +83,8 @@ ehthumbs.db
 [Dd]esktop.ini
 
 # Custom files
-ToDo.txt.lnk
+ToDo.txt.lnk
+UltraStar Play - Data.lnk
+MelodyMania-Data.lnk
+Unity-Editor-Log.lnk
+Steam Workshop Content.lnk

UltraStar Play Companion/Assets/.gitignore

@@ -1,3 +1,5 @@
+VERSION.txt
+
 Plugins/UniRx/
 Plugins/UniRx.meta
 
@@ -17,3 +19,6 @@ Plugins/Serilog/Serilog.Sinks.File.meta
 
 Plugins/LeanTween/
 Plugins/LeanTween.meta
+
+Plugins/LiteNetLib/
+Plugins/LiteNetLib.meta

UltraStar Play Companion/Assets/Common/ApplicationManager.cs

@@ -1,99 +1,145 @@
-using System;
-using System.Collections.Generic;
-using UniInject;
-using UnityEngine;
-
-public class ApplicationManager : AbstractSingletonBehaviour, INeedInjection
-{
-    public static ApplicationManager Instance
-    {
-        get
-        {
-            return GameObjectUtils.FindComponentWithTag<ApplicationManager>("ApplicationManager");
-        }
-    }
-
-    public List<string> simulatedCommandLineArguments = new List<string>();
-
-    [Range(-1, 60)]
-    public int targetFrameRate = 30;
-
-
-    [Inject]
-    private Settings settings;
-
-    protected override object GetInstance()
-    {
-        return Instance;
-    }
-
-    protected override void StartSingleton()
-    {
-        targetFrameRate = settings.TargetFps;
-        QualitySettings.vSyncCount = 0;
-        Application.targetFrameRate = targetFrameRate;
-    }
-
-    protected override void OnEnableSingleton()
-    {
-        Application.logMessageReceivedThreaded += Log.HandleUnityLog;
-    }
-
-    protected override void OnDisableSingleton()
-    {
-        Application.logMessageReceivedThreaded -= Log.HandleUnityLog;
-    }
-
-    void Update()
-    {
-        if (Application.targetFrameRate != targetFrameRate)
-        {
-            Application.targetFrameRate = targetFrameRate;
-        }
-    }
-
-    public bool HasCommandLineArgument(string argumentName)
-    {
-        string[] args = GetCommandLineArguments();
-        for (int i = 0; i < args.Length; i++)
-        {
-            if (string.Equals(args[i], argumentName, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public string GetCommandLineArgument(string argumentName)
-    {
-        string[] args = GetCommandLineArguments();
-        for (int i = 0; i < (args.Length - 1); i++)
-        {
-            if (string.Equals(args[i], argumentName, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return args[i + 1];
-            }
-        }
-        return "";
-    }
-
-    public string[] GetCommandLineArguments()
-    {
-        if (Application.isEditor)
-        {
-            return simulatedCommandLineArguments.ToArray();
-        }
-        else
-        {
-            if (PlatformUtils.IsStandalone)
-            {
-                return System.Environment.GetCommandLineArgs();
-            }
-            else
-            {
-                return Array.Empty<string>();
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using UniInject;
+using UniRx;
+using UnityEngine;
+using UnityEngine.InputSystem.EnhancedTouch;
+using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch;
+
+public class ApplicationManager : AbstractSingletonBehaviour, INeedInjection
+{
+    public static ApplicationManager Instance
+    {
+        get
+        {
+            return GameObjectUtils.FindComponentWithTag<ApplicationManager>("ApplicationManager");
+        }
+    }
+
+    public List<string> simulatedCommandLineArguments = new List<string>();
+
+    [Range(-1, 60)]
+    public int targetFrameRate = 30;
+
+    [Inject]
+    private Settings settings;
+
+    private readonly Subject<Finger> fingerUpEventStream = new();
+    public IObservable<Finger> FingerUpEventStream => fingerUpEventStream;
+
+    private readonly Subject<Finger> fingerDownEventStream = new();
+    public IObservable<Finger> FingerDownEventStream => fingerDownEventStream;
+
+    protected override object GetInstance()
+    {
+        return Instance;
+    }
+
+    protected override void AwakeSingleton()
+    {
+        EnhancedTouchSupport.Enable();
+    }
+
+    protected override void StartSingleton()
+    {
+        UpdateTargetFps();
+        settings.ObserveEveryValueChanged(it => it.TargetFps)
+            .Subscribe(_ => UpdateTargetFps())
+            .AddTo(gameObject);
+    }
+
+    private void UpdateTargetFps()
+    {
+        if (!Application.isPlaying)
+        {
+            return;
+        }
+
+        targetFrameRate = settings.TargetFps;
+        if (targetFrameRate > 0)
+        {
+            Application.targetFrameRate = targetFrameRate;
+            QualitySettings.vSyncCount = 0;
+        }
+        else
+        {
+            Application.targetFrameRate = -1;
+            QualitySettings.vSyncCount = 1;
+        }
+    }
+
+    protected override void OnEnableSingleton()
+    {
+        Touch.onFingerDown += OnFingerDown;
+        Touch.onFingerUp += OnFingerUp;
+    }
+
+    protected override void OnDisableSingleton()
+    {
+        Touch.onFingerDown -= OnFingerDown;
+        Touch.onFingerUp -= OnFingerUp;
+    }
+
+    void Update()
+    {
+        if (Application.targetFrameRate != targetFrameRate)
+        {
+            Application.targetFrameRate = targetFrameRate;
+        }
+    }
+
+    public bool HasCommandLineArgument(string argumentName)
+    {
+        string[] args = GetCommandLineArguments();
+        for (int i = 0; i < args.Length; i++)
+        {
+            if (string.Equals(args[i], argumentName, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public string GetCommandLineArgument(string argumentName)
+    {
+        string[] args = GetCommandLineArguments();
+        for (int i = 0; i < (args.Length - 1); i++)
+        {
+            if (string.Equals(args[i], argumentName, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return "";
+    }
+
+    public string[] GetCommandLineArguments()
+    {
+        if (Application.isEditor)
+        {
+            return simulatedCommandLineArguments.ToArray();
+        }
+        else
+        {
+            if (PlatformUtils.IsStandalone)
+            {
+                return Environment.GetCommandLineArgs();
+            }
+            else
+            {
+                return Array.Empty<string>();
+            }
+        }
+    }
+
+    private void OnFingerUp(Finger obj)
+    {
+       fingerUpEventStream.OnNext(obj);
+    }
+
+    private void OnFingerDown(Finger obj)
+    {
+       fingerDownEventStream.OnNext(obj);
+    }
+}

UltraStar Play Companion/Assets/Common/Common.asmdef

@@ -10,7 +10,8 @@
         "com.achimmihca.primeinputactions",
         "Unity.InputSystem",
         "playshared",
-        "playsharedui"
+        "playsharedui",
+        "LiteNetLib"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],