Merge branch 'AttractVideoPlayer' of https://gitea.tendokyu.moe/jujuforce/mu3-mods into AttractVideoPlayer

# Conflicts:
#	AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs
#	AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs
#	AttractVideoPlayer/MU3/patch_AdvManager.cs

AttractVideoPlayer/AttractVideoPlayer.csproj

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>Assembly-CSharp.AttractVideoPlayer.mm</AssemblyName>
+    <Description>Control attract video</Description>
+  </PropertyGroup>
+  <Import Project="..\Mu3Mods.csproj" />
+</Project>

AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+
+namespace MU3.Operation;
+
+class patch_OperationManager: OperationManager {
+    private static readonly string _fname = "data_advert_cache.txt";
+    private ReadOnlyCollection<MovieData> _movieDataList;
+    private int _movieIndex;
+
+    ~patch_OperationManager() {
+        try {
+            File.WriteAllText(_fname, _movieIndex.ToString());
+        } catch(Exception) {}
+    }
+    public int MovieIndex {
+        set {
+            _movieIndex = (value + _movieDataList.Count) % _movieDataList.Count;
+        }
+        get {
+            return _movieIndex;
+        }
+    }
+    public new MovieData movieData {
+        get {
+            if(_movieDataList.Count > 0) {
+                return _movieDataList[_movieIndex];
+            }
+            return null;
+        }
+    }
+
+    public extern void orig_initialize();
+
+    public new void initialize() {
+        orig_initialize();
+        try {
+            _movieIndex = Math.Max(0, int.Parse(File.ReadAllText(_fname)));
+        } catch(Exception) {
+            _movieIndex = 0;
+        }
+
+    }
+}

AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs

@@ -0,0 +1,20 @@
+using MU3.Util;
+
+namespace MU3.Sequence;
+
+class patch_Advertise: Advertise {
+    // Exclude Back/Left/Right
+    private bool anyKeyDown() {
+        UIInput instance = Singleton<UIInput>.instance;
+        if(instance.getTriggerOn(UIInput.Key.Decision) 
+        || instance.getTriggerOn(UIInput.Key.OptionBackward) 
+        || instance.getTriggerOn(UIInput.Key.OptionForward) 
+        || instance.getTriggerOn(UIInput.Key.SkipLeft) 
+        || instance.getTriggerOn(UIInput.Key.SkipRight) 
+        || instance.getTriggerOn(UIInput.Key.MenuLeft) 
+        || instance.getTriggerOn(UIInput.Key.MenuRight)) {
+            return true;
+        }
+        return false;
+    }
+}

AttractVideoPlayer/MU3/patch_AdvManager.cs

@@ -0,0 +1,35 @@
+using MU3.Operation;
+using MU3.Util;
+using UnityEngine;
+
+namespace MU3;
+
+class patch_AdvManager: AdvManager {
+    private GameObject objMovie;
+    private CriManaMovieMaterial movieController;
+
+    private extern bool orig_exec();
+    public new bool exec() {
+        if(movieController?.player?.status == CriMana.Player.Status.Playing) {
+            if(Singleton<UIInput>.instance.getTriggerOn(UIInput.Key.Service)) {
+                movieController.player.Pause(!movieController.player.IsPaused());
+            } else if(Singleton<UIInput>.instance.getTriggerOn(UIInput.Key.L2)) {
+                addMovieOffset(-1);
+            } else if(Singleton<UIInput>.instance.getTriggerOn(UIInput.Key.L3)) {
+                addMovieOffset(1);
+            }
+        }
+
+        return orig_exec();
+    }
+    public void addMovieOffset(int offset) {
+        var om = (patch_OperationManager)Singleton<OperationManager>.instance;
+        om.MovieIndex += offset;
+
+        movieController.Stop();
+        Utility.destroyGameObject(ref movieController);
+        Utility.destroyGameObject(ref objMovie);
+
+        initMovie();
+    }
+}

Mu3Mods.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AttractVideoPlayer", "AttractVideoPlayer\AttractVideoPlayer.csproj", "{003AD3C6-07CA-4824-B4BD-4BEF6F3D8999}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterGiveUp", "BetterGiveUp\BetterGiveUp.csproj", "{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NaiveRating", "NaiveRating\NaiveRating.csproj", "{1FEA698E-DF5E-46CF-8023-F2B2F57885C5}"
@@ -39,12 +41,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnlockMemoryChapters", "Unl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatinumTiming", "PlatinumTiming\PlatinumTiming.csproj", "{099AD6AF-181A-4745-88C4-1D0466BECCB1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AttractVideoPlayer", "AttractVideoPlayer\AttractVideoPlayer.csproj", "{6889330F-2E7E-4778-ADFF-70AF036F1BD5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8999}.Debug|x64.ActiveCfg = Debug|x64
+		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8999}.Debug|x64.Build.0 = Debug|x64
+		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8999}.Release|x64.ActiveCfg = Release|x64
+		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8999}.Release|x64.Build.0 = Release|x64
 		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}.Debug|x64.ActiveCfg = Debug|x64
 		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}.Debug|x64.Build.0 = Debug|x64
 		{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}.Release|x64.ActiveCfg = Release|x64
@@ -117,6 +125,10 @@ Global
 		{099AD6AF-181A-4745-88C4-1D0466BECCB1}.Debug|x64.Build.0 = Debug|x64
 		{099AD6AF-181A-4745-88C4-1D0466BECCB1}.Release|x64.ActiveCfg = Release|x64
 		{099AD6AF-181A-4745-88C4-1D0466BECCB1}.Release|x64.Build.0 = Release|x64
+		{6889330F-2E7E-4778-ADFF-70AF036F1BD5}.Debug|x64.ActiveCfg = Debug|x64
+		{6889330F-2E7E-4778-ADFF-70AF036F1BD5}.Debug|x64.Build.0 = Debug|x64
+		{6889330F-2E7E-4778-ADFF-70AF036F1BD5}.Release|x64.ActiveCfg = Release|x64
+		{6889330F-2E7E-4778-ADFF-70AF036F1BD5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE