diff --git a/Mu3Mods.sln b/Mu3Mods.sln index 0fb92ee..d2924d7 100644 --- a/Mu3Mods.sln +++ b/Mu3Mods.sln @@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InfiniteGP", "InfiniteGP\In EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockSelectionTime", "LockSelectionTime\LockSelectionTime.csproj", "{66DE85AD-58AD-467C-B1C0-6B98BB27265D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkipLoginReward", "SkipLoginReward\SkipLoginReward.csproj", "{6E078B7E-7965-4CFF-9590-5C27A009BA7A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pause", "Pause\Pause.csproj", "{627B3AA0-25E2-4C3E-A211-66BAB0E997E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnlockAndSetJewelBoostNine", "UnlockAndSetJewelBoostNine\UnlockAndSetJewelBoostNine.csproj", "{70C775D7-8C47-4CFE-B91D-6AAEB17389F2}" @@ -69,10 +67,6 @@ Global {66DE85AD-58AD-467C-B1C0-6B98BB27265D}.Debug|x64.Build.0 = Debug|x64 {66DE85AD-58AD-467C-B1C0-6B98BB27265D}.Release|x64.ActiveCfg = Release|x64 {66DE85AD-58AD-467C-B1C0-6B98BB27265D}.Release|x64.Build.0 = Release|x64 - {6E078B7E-7965-4CFF-9590-5C27A009BA7A}.Debug|x64.ActiveCfg = Debug|x64 - {6E078B7E-7965-4CFF-9590-5C27A009BA7A}.Debug|x64.Build.0 = Debug|x64 - {6E078B7E-7965-4CFF-9590-5C27A009BA7A}.Release|x64.ActiveCfg = Release|x64 - {6E078B7E-7965-4CFF-9590-5C27A009BA7A}.Release|x64.Build.0 = Release|x64 {627B3AA0-25E2-4C3E-A211-66BAB0E997E2}.Debug|x64.ActiveCfg = Debug|x64 {627B3AA0-25E2-4C3E-A211-66BAB0E997E2}.Debug|x64.Build.0 = Debug|x64 {627B3AA0-25E2-4C3E-A211-66BAB0E997E2}.Release|x64.ActiveCfg = Release|x64 diff --git a/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs b/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs deleted file mode 100644 index a472405..0000000 --- a/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs +++ /dev/null @@ -1,14 +0,0 @@ -using MU3.Util; - -namespace MU3; - -class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { - private Mode _mode; - private enum State { - RankingReward = 2, - FadeOut = 8, - } - private void RankingReward_Init() { - _mode.set(State.FadeOut); - } -} \ No newline at end of file diff --git a/SkipLoginReward/SkipLoginReward.csproj b/SkipLoginReward/SkipLoginReward.csproj deleted file mode 100644 index 90b6bcc..0000000 --- a/SkipLoginReward/SkipLoginReward.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - Assembly-CSharp.SkipLoginReward.mm - Skip event/login rewards - - - \ No newline at end of file diff --git a/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs b/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs index a4f4590..39d92d5 100644 --- a/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs +++ b/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs @@ -13,4 +13,11 @@ class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { _mode.set(State.RankingReward); SingletonMonoBehaviour.instance.Panel.pushState(0, show: true); } + private void Update() { + if(_mode.get() != (int)State.FadeOut && Singleton.instance.getStateOn(UIInput.Key.MenuLeft)) { + _mode.set(State.FadeOut); + } else { + _mode.update(); + } + } } \ No newline at end of file diff --git a/SkipNotice/SkipNotice.csproj b/SkipNotice/SkipNotice.csproj index 52fc144..bd36f2f 100644 --- a/SkipNotice/SkipNotice.csproj +++ b/SkipNotice/SkipNotice.csproj @@ -1,7 +1,7 @@  Assembly-CSharp.SkipNotice.mm - Skip event/safety notice + Skip event/safety notices \ No newline at end of file