Skip to content

Commit e95ce2c

Browse files
nahida-mouonahida-mouo
committed
移除调整时间过程 #66 
1 parent 06e8084 commit e95ce2c

File tree

6 files changed

+44
-25
lines changed

6 files changed

+44
-25
lines changed

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Core/Setting/SettingKeys.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public static class SettingKeys
120120
public const string LaunchGamepadHotSwitchEnabled = "Snap::Hutao::Game::Island::InputDevice::GamepadHotSwitchEnabled";
121121
public const string LaunchForceUsingTouchScreen = "Snap::Hutao::Game::Island::InputDevice::TouchScreen::ForceWhenIntegratedTouchPresent";
122122
public const string LaunchRemoveOpenTeamProgress = "Snap::Hutao::Game::Island::OpenTeamProgress::Remove";
123+
public const string LaunchEnableInLevelClockPageSpeedUp = "Snap::Hutao::Game::Island::InLevelClockPage::SpeedUp";
123124
public const string LaunchHideQuestBanner = "Snap::Hutao::Game::Island::QuestBanner::Hide";
124125
public const string LaunchResinListItemId000106Allowed = "Snap::Hutao::Game::Island::Reward::000106";
125126
public const string LaunchResinListItemId000201Allowed = "Snap::Hutao::Game::Island::Reward::000201";

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Resource/Localization/SH.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,4 +4254,10 @@
42544254
<data name="ViewPageAvatarPropertyAddBothToPlan" xml:space="preserve">
42554255
<value>添加角色与武器到养成计划</value>
42564256
</data>
4257+
<data name="ViewPageLaunchGameEnableInLevelClockPageSpeedUpHeader" xml:space="preserve">
4258+
<value>移除调整时间动画</value>
4259+
</data>
4260+
<data name="ViewPageLaunchGameEnableInLevelClockPageSpeedUpDescription" xml:space="preserve">
4261+
<value>移除调整时间页面点击确定后时间缓慢变化的动画</value>
4262+
</data>
42574263
</root>

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Service/Game/Island/GameIslandInterop.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ private static unsafe IslandEnvironmentView UpdateIslandEnvironment(nint handle,
163163
pIslandEnvironment->DebugMode = options.DebugMode.Value;
164164
pIslandEnvironment->HidePlayerInfo = options.HidePlayerInfo.Value;
165165
pIslandEnvironment->GamepadHotSwitchEnabled = options.GamepadHotSwitchEnabled.Value;
166+
pIslandEnvironment->EnableInLevelClockPageSpeedUp = options.EnableInLevelClockPageSpeedUp.Value;
166167

167168
return pIslandEnvironment->View;
168169
}

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Service/Game/Island/IslandEnvironment.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) DGP Studio. All rights reserved.
22
// Licensed under the MIT license.
33

4-
using Snap.Hutao.Remastered.Web.Hoyolab.Takumi.Event.BbsSignReward;
54
using Snap.Hutao.Remastered.Win32.Foundation;
65
using System.Globalization;
76

@@ -38,6 +37,9 @@ public struct IslandEnvironment
3837
public BOOL HidePlayerInfo;
3938
public BOOL HideGrass;
4039
public BOOL GamepadHotSwitchEnabled;
40+
public BOOL EnableInLevelClockPageSpeedUp;
41+
public int Reversed1;
42+
public int Reversed2;
4143

4244
#pragma warning disable CS0649
4345
public HookFunctionOffsets Offsets;
@@ -92,12 +94,6 @@ public struct HookFunctionOffsets
9294
public uint SetupResinList;
9395
[JsonConverter(typeof(HexStringToNintConverter))]
9496
public uint ResinList;
95-
[JsonConverter(typeof(HexStringToNintConverter))]
96-
public uint ResinCount;
97-
[JsonConverter(typeof(HexStringToNintConverter))]
98-
public uint ResinItem;
99-
[JsonConverter(typeof(HexStringToNintConverter))]
100-
public uint ResinRemove;
10197

10298
[JsonConverter(typeof(HexStringToNintConverter))]
10399
public uint FindString;
@@ -130,6 +126,10 @@ public struct HookFunctionOffsets
130126
public uint GetName;
131127
[JsonConverter(typeof(HexStringToNintConverter))]
132128
public uint CheckCanOpenMap;
129+
[JsonConverter(typeof(HexStringToNintConverter))]
130+
public uint InLevelClockPageOkButtonClicked;
131+
[JsonConverter(typeof(HexStringToNintConverter))]
132+
public uint InLevelClockPageCloseButtonClicked;
133133
#pragma warning restore CS0649
134134
}
135135

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Service/Game/LaunchOptions.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ public sealed partial class LaunchOptions : DbStoreOptions, IRestrictedGamePathA
111111
[field: MaybeNull]
112112
public IObservableProperty<bool> RemoveOpenTeamProgress { get => field ??= CreateProperty(SettingKeys.LaunchRemoveOpenTeamProgress, false); }
113113

114+
[field: MaybeNull]
115+
public IObservableProperty<bool> EnableInLevelClockPageSpeedUp { get => field ??= CreateProperty(SettingKeys.LaunchEnableInLevelClockPageSpeedUp, false); }
116+
114117
[field: MaybeNull]
115118
public IObservableProperty<bool> HideQuestBanner { get => field ??= CreateProperty(SettingKeys.LaunchHideQuestBanner, false); }
116119

‎src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/LaunchGamePage.xaml‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,14 @@
778778
<ToggleSwitch
779779
Grid.Row="2"
780780
Grid.Column="2"
781+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameEnableInLevelClockPageSpeedUpHeader}"
782+
IsOn="{Binding LaunchOptions.EnableInLevelClockPageSpeedUp.Value, Mode=TwoWay}"
783+
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
784+
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
785+
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameEnableInLevelClockPageSpeedUpDescription}"/>
786+
<ToggleSwitch
787+
Grid.Row="3"
788+
Grid.Column="0"
781789
Header="{shuxm:ResourceString Name=ViewPageLaunchGameEventCameraMoveHotSwitchHeader}"
782790
IsOn="{Binding LaunchOptions.DisableEventCameraMove.Value, Mode=TwoWay}"
783791
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
@@ -786,7 +794,7 @@
786794

787795
<ToggleSwitch
788796
Grid.Row="3"
789-
Grid.Column="0"
797+
Grid.Column="1"
790798
Header="{shuxm:ResourceString Name=ViewOverlayDisableShowDamageTextToolTip}"
791799
IsOn="{Binding LaunchOptions.DisableShowDamageText.Value, Mode=TwoWay}"
792800
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
@@ -795,7 +803,7 @@
795803
<ToggleSwitch
796804
x:Name="RedirectCombineEntryToggleSwitch"
797805
Grid.Row="3"
798-
Grid.Column="1"
806+
Grid.Column="2"
799807
IsOn="{Binding LaunchOptions.RedirectCombineEntry.Value, Mode=TwoWay}"
800808
Style="{ThemeResource DefaultToggleSwitchStyle}"
801809
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandRedirectCombineEntryDescription}">
@@ -828,7 +836,7 @@
828836
x:Name="RedirectCombineEntryTeachingTip"
829837
Title="{shuxm:ResourceString Name=ViewPageLaunchGameIslandRedirectCombineEntryHeader}"
830838
Grid.Row="3"
831-
Grid.Column="1"
839+
Grid.Column="2"
832840
IsLightDismissEnabled="True"
833841
Subtitle="{shuxm:ResourceString Name=ViewPageLaunchGameIslandRedirectCombineEntryDescription}"
834842
Target="{x:Bind RedirectCombineEntryToggleSwitch}">
@@ -838,58 +846,58 @@
838846
</TeachingTip>
839847

840848
<ToggleSwitch
841-
Grid.Row="3"
842-
Grid.Column="2"
849+
Grid.Row="4"
850+
Grid.Column="0"
843851
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDisplayPaimonHeader}"
844852
IsOn="{Binding LaunchOptions.DisplayPaimon.Value, Mode=TwoWay}"
845853
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDisplayPaimonDescription}"/>
846854
<ToggleSwitch
847855
Grid.Row="4"
848-
Grid.Column="0"
856+
Grid.Column="1"
849857
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandUsingTouchScreenHeader}"
850858
IsEnabled="{Binding LaunchOptions.IsGameRunning.Value, Converter={StaticResource BoolNegationConverter}}"
851859
IsOn="{Binding LaunchOptions.UsingTouchScreen.Value, Mode=TwoWay}"/>
852860
<ToggleSwitch
853861
Grid.Row="4"
854-
Grid.Column="1"
862+
Grid.Column="2"
855863
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandGamepadHotSwitchEnabledHeader}"
856864
IsOn="{Binding LaunchOptions.GamepadHotSwitchEnabled.Value, Mode=TwoWay}"
857865
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandGamepadHotSwitchEnabledDescription}"/>
858866
<ToggleSwitch
859-
Grid.Row="4"
860-
Grid.Column="2"
867+
Grid.Row="5"
868+
Grid.Column="0"
861869
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHideGrassHeader}"
862870
IsOn="{Binding LaunchOptions.HideGrass.Value, Mode=TwoWay}"
863871
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHideGrassDescription}"/>
864872

865873
<ToggleSwitch
866874
Grid.Row="5"
867-
Grid.Column="0"
875+
Grid.Column="1"
868876
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowOriginalResinHeader}"
869877
IsOn="{Binding LaunchOptions.ResinListItemId000106Allowed.Value, Mode=TwoWay}"/>
870878
<ToggleSwitch
871879
Grid.Row="5"
872-
Grid.Column="1"
880+
Grid.Column="2"
873881
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowPrimogemHeader}"
874882
IsOn="{Binding LaunchOptions.ResinListItemId000201Allowed.Value, Mode=TwoWay}"/>
875883
<ToggleSwitch
876-
Grid.Row="5"
877-
Grid.Column="2"
884+
Grid.Row="6"
885+
Grid.Column="0"
878886
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowFragileResinHeader}"
879887
IsOn="{Binding LaunchOptions.ResinListItemId107009Allowed.Value, Mode=TwoWay}"/>
880888
<ToggleSwitch
881889
Grid.Row="6"
882-
Grid.Column="0"
890+
Grid.Column="1"
883891
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowTransientResinHeader}"
884892
IsOn="{Binding LaunchOptions.ResinListItemId107012Allowed.Value, Mode=TwoWay}"/>
885893
<ToggleSwitch
886894
Grid.Row="6"
887-
Grid.Column="1"
895+
Grid.Column="2"
888896
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowCondensedResinHeader}"
889897
IsOn="{Binding LaunchOptions.ResinListItemId220007Allowed.Value, Mode=TwoWay}"/>
890898
<ToggleSwitch
891-
Grid.Row="6"
892-
Grid.Column="2"
899+
Grid.Row="7"
900+
Grid.Column="0"
893901
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeHeader}"
894902
IsOn="{Binding LaunchOptions.DebugMode.Value, Mode=TwoWay}"
895903
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeDescription}"/>
@@ -898,7 +906,7 @@
898906
<ToggleSwitch
899907
Visibility="{Binding IsDeveloperAndLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"
900908
Grid.Row="7"
901-
Grid.Column="0"
909+
Grid.Column="1"
902910
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoHeader}"
903911
IsOn="{Binding LaunchOptions.HidePlayerInfo.Value, Mode=TwoWay}"
904912
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoDescription}"/>

0 commit comments

Comments
 (0)