diff --git a/Enhancements/AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs b/Enhancements/AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs index 05e185b..4d29c4f 100644 --- a/Enhancements/AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs +++ b/Enhancements/AttractVideoPlayer/MU3.OperationManager/patch_OperationManager.cs @@ -21,7 +21,7 @@ class patch_OperationManager: OperationManager { try { File.WriteAllText(_fileName, MovieIndex.ToString()); } catch(Exception ex) { - Debug.Log("Unable to write attract selection: " + ex); + Debug.Log("[AttractVideoPlayer] Unable to write: " + ex); } } get { diff --git a/Extras/PlatinumTiming/MU3/patch_UIResultTechScore.cs b/Extras/PlatinumTiming/MU3/patch_UIResultTechScore.cs index 39c7109..90d4006 100644 --- a/Extras/PlatinumTiming/MU3/patch_UIResultTechScore.cs +++ b/Extras/PlatinumTiming/MU3/patch_UIResultTechScore.cs @@ -2,14 +2,19 @@ using MU3.Game; using MU3.Sequence; using MU3.Util; +using System.Collections; using UnityEngine; namespace MU3; class patch_UIResultTechScore: UIResultTechScore { + private Animator animator_; private MU3UICounter counterFast_; private MU3UICounter counterLate_; + private static readonly int State_TechnicalScore_noLateFast_Loop = Animator.StringToHash("TechnicalScore_noLateFast_Loop"); + private static readonly int State_TechnicalScore_Loop = Animator.StringToHash("TechnicalScore_Loop"); + private void cloneCounter(MU3UICounter counter, Color color, int value) { var otherValue = counter.CounterAsInt; var offset = 12; @@ -27,7 +32,11 @@ class patch_UIResultTechScore: UIResultTechScore { cpy.CounterAsInt = value; } - private void drawCounters() { + private IEnumerator drawCounters() { + while(!AnimatorState.stateEquals(animator_, State_TechnicalScore_noLateFast_Loop) && !AnimatorState.stateEquals(animator_, State_TechnicalScore_Loop)) { + yield return null; + } + float posXf = counterFast_.gameObject.transform.localPosition.x + 5.0f; float posXl = counterLate_.gameObject.transform.localPosition.x + 5.0f; float posY = counterLate_.gameObject.transform.localPosition.y; @@ -53,6 +62,6 @@ class patch_UIResultTechScore: UIResultTechScore { private extern void orig_drawTimingInclination(int numNotesFast, int numNotesLate); private void drawTimingInclination(int numNotesFast, int numNotesLate) { orig_drawTimingInclination(numNotesFast, numNotesLate); - drawCounters(); + StartCoroutine(drawCounters()); } } diff --git a/Extras/SkipCutscenes/MU3.Sequence/patch_PlayMusic.cs b/Extras/SkipCutscenes/MU3.Sequence/patch_PlayMusic.cs index 705219a..1d516c5 100644 --- a/Extras/SkipCutscenes/MU3.Sequence/patch_PlayMusic.cs +++ b/Extras/SkipCutscenes/MU3.Sequence/patch_PlayMusic.cs @@ -29,15 +29,6 @@ class patch_PlayMusic: PlayMusic { } } - private extern void orig_Enter_PlayEnd(); - private void Enter_PlayEnd() { - using IniFile iniFile = new("mu3.ini"); - - if(iniFile.getValue("Sequence", "QuickEnd", false) && !isPartyPlay()) { - _nuclearSkip = true; - } - } - public extern bool orig_updateState(float deltaTime); public override bool updateState(float deltaTime = -1f) { var state = getCurrentState(); @@ -49,6 +40,7 @@ class patch_PlayMusic: PlayMusic { if(_nuclearSkip) { bool isTutorial = SingletonMonoBehaviour.instance.sessionInfo.isTutorial; if(!isTutorial) { + Singleton.instance.SkipItemFrame = true; if(state < EState.CalcResult) { setNextState(EState.CalcResult); } diff --git a/Extras/SkipCutscenes/MU3/patch_BattleUI.cs b/Extras/SkipCutscenes/MU3/patch_BattleUI.cs index 9fd205b..2ebf658 100644 --- a/Extras/SkipCutscenes/MU3/patch_BattleUI.cs +++ b/Extras/SkipCutscenes/MU3/patch_BattleUI.cs @@ -1,5 +1,4 @@ using MonoMod; -using MU3.Sequence; using MU3.Util; using System; using UnityEngine; diff --git a/Extras/SortByInternalDifficulty/MU3.User/patch_UserDetail.cs b/Extras/SortByInternalDifficulty/MU3.User/patch_UserDetail.cs index a5d1972..69d8e1c 100644 --- a/Extras/SortByInternalDifficulty/MU3.User/patch_UserDetail.cs +++ b/Extras/SortByInternalDifficulty/MU3.User/patch_UserDetail.cs @@ -52,7 +52,7 @@ class patch_UserDetail: UserDetail { try { File.WriteAllText(path, entries.Aggregate("", (acc, s) => acc + s + "\n").Trim()); } catch(Exception e) { - UnityEngine.Debug.Log("Unable to write tab selection: " + e.ToString()); + UnityEngine.Debug.Log("[SortByInternal] Unable to write tab selection: " + e.ToString()); } } diff --git a/Unlockers/UnlockGameEvents/MU3.Client/patch_PacketGetGameEvent.cs b/Unlockers/UnlockGameEvents/MU3.Client/patch_PacketGetGameEvent.cs index 98fb7cd..6f84cc0 100644 --- a/Unlockers/UnlockGameEvents/MU3.Client/patch_PacketGetGameEvent.cs +++ b/Unlockers/UnlockGameEvents/MU3.Client/patch_PacketGetGameEvent.cs @@ -9,6 +9,7 @@ namespace MU3.Client; class patch_PacketGetGameEvent: Packet { public Operation.GameEvent _gameEvent; public Operation.GameEvent gameEvent => _gameEvent; + public extern State orig_proc(); public override State proc() { State state = orig_proc();