Merge pull request #473 from UltraStar-Deluxe/anst/reintegrate-melody…

…mania-2024-10-06

Reintegrate Melody Mania up to 2024-10-06

.github/workflows/acquire-unity-license-request.yml

@@ -9,10 +9,10 @@ jobs:
  # Request manual activation file
  - name: Request manual activation file
  id: getManualLicenseFile
- uses: game-ci/unity-request-activation-file@v2
+ uses: game-ci/unity-request-activation-file@v2.1.0
  # Upload artifact (Unity_v20XX.X.XXXX.alf)
  - name: Expose as artifact
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ steps.getManualLicenseFile.outputs.filePath }}
  path: ${{ steps.getManualLicenseFile.outputs.filePath }}

.github/workflows/build-companion-app.yml

@@ -8,6 +8,8 @@ on:
 
 env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  PROJECT_PATH: UltraStar Play Companion
 
 jobs:
@@ -18,7 +20,7 @@ jobs:
  fail-fast: false
  matrix:
  unityVersion:
- - 2022.2.4f1
+ - 2023.2.12f1
  targetPlatform:
  # - StandaloneWindows64
  # - StandaloneLinux64
@@ -30,11 +32,11 @@ jobs:
  # - WebGL
  steps:
  # Clone repo and restore cache
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  lfs: true
- - uses: actions/cache@v2
+ - uses: actions/cache@v4
  with:
  path: ${{ env.PROJECT_PATH }}/Library
  key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
@@ -49,16 +51,18 @@ jobs:
  run: sh setup.sh
 
  # Build Executables.
- - uses: game-ci/unity-builder@v2.1.2
+ - uses: game-ci/unity-builder@v4
  env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  with:
  projectPath: ${{ env.PROJECT_PATH }}
  unityVersion: ${{ matrix.unityVersion }}
  targetPlatform: ${{ matrix.targetPlatform }}
  customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
  allowDirtyBuild: true
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
  with:
  name: ${{ matrix.targetPlatform }}-build
  path: build/${{ matrix.targetPlatform }}

.github/workflows/build-main-game.yml

@@ -8,6 +8,8 @@ on:
 
 env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  PROJECT_PATH: UltraStar Play
 
 jobs:
@@ -18,7 +20,7 @@ jobs:
  fail-fast: false
  matrix:
  unityVersion:
- - 2022.2.4f1
+ - 2023.2.12f1
  targetPlatform:
  - StandaloneWindows64
  - StandaloneLinux64
@@ -29,11 +31,11 @@ jobs:
  # - WebGL
  steps:
  # Clone repo and restore cache
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  lfs: true
- - uses: actions/cache@v2
+ - uses: actions/cache@v4
  with:
  path: ${{ env.PROJECT_PATH }}/Library
  key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
@@ -48,16 +50,18 @@ jobs:
  run: sh setup.sh
 
  # Build Executables.
- - uses: game-ci/unity-builder@v2.1.2
+ - uses: game-ci/unity-builder@v4
  env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  with:
  projectPath: ${{ env.PROJECT_PATH }}
  unityVersion: ${{ matrix.unityVersion }}
  targetPlatform: ${{ matrix.targetPlatform }}
  customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
  allowDirtyBuild: true
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
  with:
  name: ${{ matrix.targetPlatform }}-build
  path: build/${{ matrix.targetPlatform }}

.github/workflows/test-companion-app.yml

@@ -11,6 +11,8 @@ on:
 
 env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  PROJECT_PATH: UltraStar Play Companion
 
 jobs:
@@ -21,17 +23,17 @@ jobs:
  fail-fast: false
  matrix:
  unityVersion:
- - 2022.2.4f1
+ - 2023.2.12f1
  targetPlatform:
  - Android
  - iOS
  steps:
  # Clone repo and restore cache
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  lfs: true
- - uses: actions/cache@v2
+ - uses: actions/cache@v4
  with:
  path: ${{ env.PROJECT_PATH }}/Library
  key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
@@ -46,17 +48,19 @@ jobs:
  run: sh setup.sh
 
  # Test Unity project
- - uses: game-ci/unity-test-runner@v2.1.1
+ - uses: game-ci/unity-test-runner@v4
  id: testRunner
  env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  with:
  projectPath: ${{ env.PROJECT_PATH }}
  unityVersion: ${{ matrix.unityVersion }}
  testMode: all
  githubToken: ${{ secrets.GITHUB_TOKEN }}
  customParameters: "-nographics"
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
  name: Test results (all modes)

.github/workflows/test-main-game.yml

@@ -11,6 +11,8 @@ on:
 
 env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  PROJECT_PATH: UltraStar Play
 
 jobs:
@@ -21,17 +23,17 @@ jobs:
  fail-fast: false
  matrix:
  unityVersion:
- - 2022.2.4f1
+ - 2023.2.12f1
  targetPlatform:
  # At the moment, tests are target platform independent. Thus only build one.
  - StandaloneWindows64
  steps:
  # Clone repo and restore cache
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  lfs: true
- - uses: actions/cache@v2
+ - uses: actions/cache@v4
  with:
  path: ${{ env.PROJECT_PATH }}/Library
  key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
@@ -46,17 +48,19 @@ jobs:
  run: sh setup.sh
 
  # Test Unity project
- - uses: game-ci/unity-test-runner@v2.1.1
+ - uses: game-ci/unity-test-runner@v4
  id: testRunner
  env:
  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+ UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+ UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
  with:
  projectPath: ${{ env.PROJECT_PATH }}
  unityVersion: ${{ matrix.unityVersion }}
  testMode: all
  githubToken: ${{ secrets.GITHUB_TOKEN }}
  customParameters: "-nographics"
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
  name: Test results (all modes)

.gitignore

@@ -23,18 +23,6 @@ pretrained_models/
 *.*.map
 *.*.map.meta
 
-# 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
-
 # Rider (JetBrains IDE) data
 .idea/
 
@@ -84,7 +72,7 @@ ehthumbs.db
 
 # Custom files
 ToDo.txt.lnk
-UltraStar Play - Data.lnk
 MelodyMania-Data.lnk
+UltraStar Play - Data.lnk
 Unity-Editor-Log.lnk
 Steam Workshop Content.lnk

UltraStar Play Companion/Assets/.gitignore

@@ -1,24 +1,24 @@
-VERSION.txt
-
-Plugins/UniRx/
-Plugins/UniRx.meta
-
-Plugins/FullSerializer/
-Plugins/FullSerializer.meta
-
-Plugins/CompileTimeTracker/
-Plugins/CompileTimeTracker.meta
-
-Plugins/SharpZipLib/
-Plugins/SharpZipLib.meta
-
-Plugins/Serilog/Serilog/
-Plugins/Serilog/Serilog.meta
-Plugins/Serilog/Serilog.Sinks.File/
-Plugins/Serilog/Serilog.Sinks.File.meta
-
-Plugins/LeanTween/
-Plugins/LeanTween.meta
-
-Plugins/LiteNetLib/
-Plugins/LiteNetLib.meta
+VERSION.txt
+
+Plugins/UniRx/
+Plugins/UniRx.meta
+
+Plugins/FullSerializer/
+Plugins/FullSerializer.meta
+
+Plugins/CompileTimeTracker/
+Plugins/CompileTimeTracker.meta
+
+Plugins/SharpZipLib/
+Plugins/SharpZipLib.meta
+
+Plugins/Serilog/Serilog/
+Plugins/Serilog/Serilog.meta
+Plugins/Serilog/Serilog.Sinks.File/
+Plugins/Serilog/Serilog.Sinks.File.meta
+
+Plugins/LeanTween/
+Plugins/LeanTween.meta
+
+Plugins/LiteNetLib/
+Plugins/LiteNetLib.meta

UltraStar Play Companion/Assets/Common/ApplicationManager.cs

@@ -8,13 +8,7 @@
 
 public class ApplicationManager : AbstractSingletonBehaviour, INeedInjection
 {
- public static ApplicationManager Instance
- {
- get
- {
- return GameObjectUtils.FindComponentWithTag<ApplicationManager>("ApplicationManager");
- }
- }
+ public static ApplicationManager Instance => DontDestroyOnLoadManager.Instance.FindComponentOrThrow<ApplicationManager>();
 
  public List<string> simulatedCommandLineArguments = new List<string>();
 
@@ -29,7 +23,7 @@ public static ApplicationManager Instance
 
  private readonly Subject<Finger> fingerDownEventStream = new();
  public IObservable<Finger> FingerDownEventStream => fingerDownEventStream;
- 
+
  protected override object GetInstance()
  {
  return Instance;
@@ -54,7 +48,7 @@ private void UpdateTargetFps()
  {
  return;
  }
- 
+
  targetFrameRate = settings.TargetFps;
  if (targetFrameRate > 0)
  {
@@ -132,12 +126,12 @@ public string[] GetCommandLineArguments()
  }
  }
  }
- 
+
  private void OnFingerUp(Finger obj)
  {
  fingerUpEventStream.OnNext(obj);
  }
- 
+
  private void OnFingerDown(Finger obj)
  {
  fingerDownEventStream.OnNext(obj);

UltraStar Play Companion/Assets/Common/CommonSceneObjects.prefab

@@ -57,7 +57,7 @@ GameObject:
  - component: {fileID: 5626457258006968070}
  m_Layer: 0
  m_Name: TranslationManager
- m_TagString: TranslationManager
+ m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -304,7 +304,7 @@ GameObject:
  - component: {fileID: 1770134915371172135}
  m_Layer: 0
  m_Name: MainGameHttpClient
- m_TagString: MainGameHttpClient
+ m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -348,7 +348,7 @@ GameObject:
  - component: {fileID: 7793846927334274922}
  m_Layer: 0
  m_Name: ApplicationManager
- m_TagString: ApplicationManager
+ m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -486,7 +486,7 @@ GameObject:
  - component: {fileID: 7793846928232682640}
  m_Layer: 0
  m_Name: SettingsManager
- m_TagString: SettingsManager
+ m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -530,7 +530,7 @@ GameObject:
  - component: {fileID: 5134610190192529917}
  m_Layer: 0
  m_Name: SceneInjectionManager
- m_TagString: SceneInjectionManager
+ m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0