diff --git a/Extras/MoreProfileOptions/MU3.Battle/patch_Counters.cs b/Extras/MoreProfileOptions/MU3.Battle/patch_Counters.cs index 452d86b..cacd6ea 100644 --- a/Extras/MoreProfileOptions/MU3.Battle/patch_Counters.cs +++ b/Extras/MoreProfileOptions/MU3.Battle/patch_Counters.cs @@ -1,6 +1,7 @@ using MU3.DB; using MU3.User; using MU3.Util; +using System; namespace MU3.Battle; class patch_Counters: Counters { @@ -27,7 +28,7 @@ class patch_Counters: Counters { GameEngine ge = SingletonMonoBehaviour.instance; UserManager userManager = Singleton.instance; _userFumen = userManager.getUserFumen(ge.sessionInfo.musicData.id, ge.sessionInfo.musicLevel, create: false); - _previousPb = _userFumen?.TechScoreMax ?? 0; + _previousPb = Math.Max(_userFumen?.TechScoreMax ?? 0, TechnicalRankID.AA.getLower()); } switch(_eAbort) { @@ -37,6 +38,10 @@ class patch_Counters: Counters { case patch_UserOption.eAbort.PB: self = _previousPb; break; + case patch_UserOption.eAbort.FB: + case patch_UserOption.eAbort.AA: + self = TechnicalRankID.AA.getLower(); + break; default: break; } diff --git a/Extras/MoreProfileOptions/MU3.Notes/patch_NotesManager.cs b/Extras/MoreProfileOptions/MU3.Notes/patch_NotesManager.cs index aebdb5d..fb1bdd0 100644 --- a/Extras/MoreProfileOptions/MU3.Notes/patch_NotesManager.cs +++ b/Extras/MoreProfileOptions/MU3.Notes/patch_NotesManager.cs @@ -1,6 +1,8 @@ using MU3.Battle; +using MU3.DB; using MU3.User; using MU3.Util; +using System; namespace MU3.Notes; @@ -17,19 +19,20 @@ class patch_NotesManager: NotesManager { var abort = (patch_UserOption.eAbort)GameOption.abort; switch(abort) { case patch_UserOption.eAbort.SSS1: - threshold = 1007500; - break; - case patch_UserOption.eAbort.FB: - threshold = 970000; + threshold = TechnicalRankID.SSS1.getLower(); break; case patch_UserOption.eAbort.PB: if(_userFumen == null) { UserManager userManager = Singleton.instance; _userFumen = userManager.getUserFumen(_sessionInfo.musicData.id, _sessionInfo.musicLevel, create: false); - _previousPb = _userFumen?.TechScoreMax ?? 0; + _previousPb = Math.Max(TechnicalRankID.AA.getLower(), _userFumen?.TechScoreMax ?? 0); } threshold = _previousPb; break; + case patch_UserOption.eAbort.FB: + case patch_UserOption.eAbort.AA: + threshold = TechnicalRankID.AA.getLower(); + break; default: break; } diff --git a/Extras/MoreProfileOptions/MU3.User/patch_UserOption.cs b/Extras/MoreProfileOptions/MU3.User/patch_UserOption.cs index 675a23f..a0c8539 100644 --- a/Extras/MoreProfileOptions/MU3.User/patch_UserOption.cs +++ b/Extras/MoreProfileOptions/MU3.User/patch_UserOption.cs @@ -22,7 +22,7 @@ class patch_UserOption: UserOption { SSS1 = 4, PB = 5, FB = 6, - ZERO = 7, + AA = 7, MAX = 7, Default = 0 } @@ -49,7 +49,7 @@ class patch_UserOption: UserOption { } public void set_Abort(eAbort value) { if(eAbort.MAX < value) { - abort = eAbort.ZERO; + abort = eAbort.AA; } else if(value < eAbort.OFF) { abort = eAbort.OFF; } else { diff --git a/Extras/MoreProfileOptions/MU3/patch_BattleUI.cs b/Extras/MoreProfileOptions/MU3/patch_BattleUI.cs index 4cedd9a..17e9450 100644 --- a/Extras/MoreProfileOptions/MU3/patch_BattleUI.cs +++ b/Extras/MoreProfileOptions/MU3/patch_BattleUI.cs @@ -2,6 +2,7 @@ using MU3.Game; using MU3.User; using MU3.Util; +using System; namespace MU3; class patch_BattleUI: BattleUI { @@ -34,12 +35,12 @@ class patch_BattleUI: BattleUI { var userFumen = userManager.getUserFumen(_sessionInfo.musicData.id, _sessionInfo.musicLevel, create: false); var previousPb = userFumen?.TechScoreMax ?? 0; rank = UIRetireInfo.Rank.S; - num = 1010000 - previousPb; + num = 1010000 - Math.Max(previousPb, TechnicalRankID.AA.getLower()); break; case patch_UserOption.eAbort.FB: - case patch_UserOption.eAbort.ZERO: + case patch_UserOption.eAbort.AA: rank = UIRetireInfo.Rank.S; - num = 1010000; + num = 1010000 - TechnicalRankID.AA.getLower(); break; default: rank = UIRetireInfo.Rank.MAX; diff --git a/Extras/MoreProfileOptions/MU3/patch_OptionMiniSummaryController.cs b/Extras/MoreProfileOptions/MU3/patch_OptionMiniSummaryController.cs index 7a1b6e1..b554243 100644 --- a/Extras/MoreProfileOptions/MU3/patch_OptionMiniSummaryController.cs +++ b/Extras/MoreProfileOptions/MU3/patch_OptionMiniSummaryController.cs @@ -48,7 +48,7 @@ class patch_OptionMiniSummaryController: OptionMiniSummaryController { comp.text = "FB未達で中断"; break; case 7: - comp.text = "スコア表示"; + comp.text = "AA未達で中断"; break; } } else { diff --git a/Fixes/FrameRate/MU3.Sys/patch_Config.cs b/Fixes/FrameRate/MU3.Sys/patch_Config.cs index 57dd863..0764ba9 100644 --- a/Fixes/FrameRate/MU3.Sys/patch_Config.cs +++ b/Fixes/FrameRate/MU3.Sys/patch_Config.cs @@ -22,16 +22,16 @@ class patch_Config: Config { if(isVsync) { QualitySettings.vSyncCount = 1; framerate = -1; - Debug.Log("[UnlockFrameRate] VSync on"); + Debug.Log("[FrameRate] VSync on"); } else { Application.targetFrameRate = framerate; QualitySettings.vSyncCount = 0; if(framerate == 60) { - Debug.Log("[UnlockFrameRate] Framerate locked to 60 (vanilla)"); + Debug.Log("[FrameRate] Framerate locked to 60 (vanilla)"); } else if(framerate == -1) { - Debug.Log("[UnlockFrameRate] Framerate unlocked"); + Debug.Log("[FrameRate] Framerate unlocked"); } else { - Debug.Log("[UnlockFrameRate] Framerate locked to " + framerate); + Debug.Log("[FrameRate] Framerate locked to " + framerate); } } }