Skip to content

fix: 跳过乐曲开始与开场视频功能冲突 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clansty merged 1 commit into from
Oct 7, 2026
Merged

fix: 跳过乐曲开始与开场视频功能冲突 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 49 additions & 34 deletions AquaMai.Mods/Fancy/CustomIntroCinematic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,29 +907,65 @@ private void CleanupResources()
[HarmonyPatch(typeof(MusicSelectProcess), "GameStart")]
public static bool GameStartPrefix(MusicSelectProcess __instance)
{
if (!TryGetCurrentVideo(out var videoPath)) return true;
Comment thread
s-yh-china marked this conversation as resolved.

try
{
MelonLogger.Msg($"[CustomIntroCinematic] Play intro cinematic for music {GameManager.SelectMusicID[0]}");

// 使用反射获取 MusicSelectProcess 的 container 字段
var containerField = typeof(ProcessBase).GetField("container",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
var container = (ProcessDataContainer)containerField.GetValue(__instance);

// 使用自定义的 SimpleMovieTrackStartProcess 替换 TrackStartProcess
container.processManager.AddProcess(
new FadeProcess(container, __instance,
new SimpleMovieTrackStartProcess(container, videoPath),
releaseCustomMaterial: false), 50);

SoundManager.PreviewEnd();
SoundManager.StopBGM(2);

return false; // 阻止原方法执行
}
catch (Exception e)
{
MelonLogger.Msg($"[CustomIntroCinematic] GameStartPrefix error: {e}");
}

return true; // 正常执行原方法
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
}

public static bool WillTakeOver => TryGetCurrentVideo(out _);

public static bool TryGetCurrentVideo(out (string leftPath, string rightPath, string acbPath, string awbPath) videoPath)
{
videoPath = default;

try
{
if (!_isInitialized) return true;
if (!_isInitialized) return false;

// 复刻GameStart的检查逻辑
if (GameManager.IsCourseMode) return true;
if (GameManager.IsKaleidxScopeMode) return true;
if (Singleton<SpecialRomManager>.Instance.IsSpecialMovie()) return true;
if (GameManager.IsCourseMode) return false;
if (GameManager.IsKaleidxScopeMode) return false;
if (Singleton<SpecialRomManager>.Instance.IsSpecialMovie()) return false;

// 自由模式不生效
if (GameManager.IsFreedomMode) return true;
if (GameManager.IsFreedomMode) return false;

// 仅在 Normal 模式下生效
if (!GameManager.IsNormalMode) return true;
if (!GameManager.IsNormalMode) return false;

// 试玩模式不生效
if (GameManager.IsTrialPlay) return true;
if (GameManager.IsTrialPlay) return false;

// 联机对战不生效
Manager.Party.Party.IManager PartyManager = Manager.Party.Party.Party.Get();
if (SingletonStateMachine<AmManager, AmManager.EState>.Instance.Backup.gameSetting.MachineGroupID != DB.MachineGroupID.OFF && PartyManager != null && PartyManager.IsJoinAndActive())
return true;
return false;

//获取曲目ID
var musicId = GameManager.SelectMusicID[0];

Expand All @@ -945,40 +981,19 @@ public static bool GameStartPrefix(MusicSelectProcess __instance)
{
playerData.ScoreDic[j].TryGetValue(musicId, out UserScore musicScore);
if (musicScore != null)
return true;
return false;
}
}
}
}

// 检查当前选择的歌曲是否为目标歌曲
if (_targetIDMovieDict.TryGetValue(musicId, out var videoPath))
{
MelonLogger.Msg($"[CustomIntroCinematic] Play intro cinematic for music {musicId}");

// 使用反射获取 MusicSelectProcess 的 container 字段
var containerField = typeof(ProcessBase).GetField("container",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
var container = (ProcessDataContainer)containerField.GetValue(__instance);

// 使用自定义的 SimpleMovieTrackStartProcess 替换 TrackStartProcess
container.processManager.AddProcess(
new FadeProcess(container, __instance,
new SimpleMovieTrackStartProcess(container, videoPath),
releaseCustomMaterial: false), 50);

SoundManager.PreviewEnd();
SoundManager.StopBGM(2);

return false; // 阻止原方法执行
}
return _targetIDMovieDict.TryGetValue(musicId, out videoPath);
}
catch (Exception e)
{
MelonLogger.Msg($"[CustomIntroCinematic] GameStartPrefix error: {e}");
MelonLogger.Msg($"[CustomIntroCinematic] TryGetCurrentVideo error: {e}");
return false;
}

return true; // 正常执行原方法
}

}
3 changes: 3 additions & 0 deletions AquaMai.Mods/Tweaks/TimeSaving/SkipTrackStart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using AquaMai.Config.Attributes;
using AquaMai.Mods.Fancy;
using HarmonyLib;
using Manager;
using Process;
Expand All @@ -22,6 +23,8 @@ public static void OnStart(ref TrackStartProcess.TrackStartSequence ____state)
[HarmonyPatch(typeof (MusicSelectProcess), "GameStart")]
public static bool GameStart(MusicSelectProcess __instance, ProcessDataContainer ___container)
{
if (CustomIntroCinematic.WillTakeOver) return true;

___container.processManager.AddProcess(new TrackStartProcess(___container), 50);
___container.processManager.ReleaseProcess(__instance);
SoundManager.PreviewEnd();
Expand Down
Loading