feat(SkipNotice): merge SkipLoginReward back

Except it's now triggered by LMenu.
This commit is contained in:
あかニャン 2024-07-08 03:19:01 +09:00
parent 8a6ad2e523
commit 579790663e
5 changed files with 8 additions and 28 deletions

View File

@ -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

View File

@ -1,14 +0,0 @@
using MU3.Util;
namespace MU3;
class patch_Scene_30_NoticeReward: Scene_30_NoticeReward {
private Mode<Scene_30_NoticeReward, State> _mode;
private enum State {
RankingReward = 2,
FadeOut = 8,
}
private void RankingReward_Init() {
_mode.set(State.FadeOut);
}
}

View File

@ -1,7 +0,0 @@
<Project>
<PropertyGroup>
<AssemblyName>Assembly-CSharp.SkipLoginReward.mm</AssemblyName>
<Description>Skip event/login rewards</Description>
</PropertyGroup>
<Import Project="..\Mu3Mods.csproj" />
</Project>

View File

@ -13,4 +13,11 @@ class patch_Scene_30_NoticeReward: Scene_30_NoticeReward {
_mode.set(State.RankingReward);
SingletonMonoBehaviour<SystemUI>.instance.Panel.pushState(0, show: true);
}
private void Update() {
if(_mode.get() != (int)State.FadeOut && Singleton<UIInput>.instance.getStateOn(UIInput.Key.MenuLeft)) {
_mode.set(State.FadeOut);
} else {
_mode.update();
}
}
}

View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<AssemblyName>Assembly-CSharp.SkipNotice.mm</AssemblyName>
<Description>Skip event/safety notice</Description>
<Description>Skip event/safety notices</Description>
</PropertyGroup>
<Import Project="..\Mu3Mods.csproj" />
</Project>