Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion AquaMai.Mods/UX/OneKeyEntryEnd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static void DoQuickSkip()
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, process.Process,
new UnlockMusicProcess(SharedInstances.ProcessDataContainer)));
}
break;
return; // 执行上面的AddProcess操作,会引起processList中链表中内容的改变,foreach继续遍历就会`System.InvalidOperationException: Collection was modified`. 但是反正该做的事已经做完了,所以直接return就好
}
}

Expand All @@ -97,4 +97,16 @@ public static void DoQuickSkip()
new MusicSelectProcess(SharedInstances.ProcessDataContainer)));
}
}

[EnableGameVersion(26500, noWarn: true)]
[HarmonyPatch(typeof(NetDataManager), "GetGuestLogId")]
[HarmonyFinalizer]
public static Exception GetGuestLogIdFix(Exception __exception, ref ulong __result)
{
// 如果在游客模式下,一首歌都没打就跳关了:
// NetDataManager.GetGuestLogId中会调用Singleton<GamePlayManager>.Instance.GetGameScore,这个函数查不到对应的GameScoreList对象,就会返回null;于是就NPE了
// 我们则捕获这里的异常,返回数字0(这正是1.60之前的行为)
if (__exception != null) __result = 0L;
Comment thread
clansty marked this conversation as resolved.
return null;
Comment thread
clansty marked this conversation as resolved.
}
}
Loading