Skip to content

Commit b36534b

Browse files
committed
为更多注入添加开关 #50
1 parent 868de68 commit b36534b

File tree

6 files changed

+40
-3
lines changed

6 files changed

+40
-3
lines changed
13.1 KB
Loading

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4190,4 +4190,10 @@ Space Available: {2}</value>
41904190
<data name="ServiceGachaLogFactoryBeyondPermanentWishName" xml:space="preserve">
41914191
<value>Encounter Echoes</value>
41924192
</data>
4193+
<data name="ViewOverlayDisplayPaimonToolTip" xml:space="preserve">
4194+
<value>Display Paimon</value>
4195+
</data>
4196+
<data name="ViewOverlayHideGrassToolTip" xml:space="preserve">
4197+
<value>Hide Grass</value>
4198+
</data>
41934199
</root>

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
@@ -4236,4 +4236,10 @@
42364236
<data name="ServiceGachaLogFactoryBeyondPermanentWishName" xml:space="preserve">
42374237
<value>奇遇回声</value>
42384238
</data>
4239+
<data name="ViewOverlayDisplayPaimonToolTip" xml:space="preserve">
4240+
<value>显示派蒙</value>
4241+
</data>
4242+
<data name="ViewOverlayHideGrassToolTip" xml:space="preserve">
4243+
<value>隐藏草地</value>
4244+
</data>
42394245
</root>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Snap.Hutao.Remastered.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
</PropertyGroup>
5151
<ItemGroup>
5252
<None Remove="Resource\Icon\UI_BtnIcon_Beyond_GH.png" />
53+
<None Remove="Resource\Icon\UI_Icon_Paimon.png" />
5354
<None Remove="Resource\Icon\UI_Icon_UGC_Beyond.png" />
5455
<None Remove="Resource\Navigation\Plugin.png" />
5556
</ItemGroup>
@@ -169,6 +170,7 @@
169170
<Content Include="Resource\Icon\UI_IconKira.png" />
170171
<Content Include="Resource\Icon\UI_Icon_Fetter.png" />
171172
<Content Include="Resource\Icon\UI_Icon_Locked.png" />
173+
<Content Include="Resource\Icon\UI_Icon_Paimon.png" />
172174
<Content Include="Resource\Icon\UI_Icon_RelicType3.png" />
173175
<Content Include="Resource\Icon\UI_Icon_RelicType4.png" />
174176
<Content Include="Resource\Icon\UI_Icon_RelicType5.png" />

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/OverlayView.xaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@
205205
<ContentControl IsEnabled="{Binding LaunchOptions.IsSetTargetFrameRateEnabled.Value}">
206206
<StackPanel Orientation="Horizontal" Spacing="4">
207207
<Slider
208-
Width="180"
208+
Width="240"
209209
Margin="12,0"
210210
VerticalAlignment="Center"
211211
LargeChange="10"
212-
Maximum="120"
212+
Maximum="160"
213213
Minimum="1"
214214
SmallChange="1"
215215
Value="{Binding LaunchOptions.TargetFps.Value, Mode=TwoWay}"/>
@@ -334,6 +334,29 @@
334334
<FontIcon FontSize="16" Glyph="&#xE894;"/>
335335
</Grid>
336336
</ToggleButton>
337+
<ToggleButton
338+
Padding="8"
339+
VerticalAlignment="Stretch"
340+
BorderThickness="0"
341+
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
342+
IsChecked="{Binding LaunchOptions.DisplayPaimon.Value, Mode=TwoWay}"
343+
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewOverlayDisplayPaimonToolTip}">
344+
<Grid>
345+
<ImageIcon Source="ms-appx:///Resource/Icon/UI_Icon_Paimon.png"/>
346+
</Grid>
347+
</ToggleButton>
348+
<ToggleButton
349+
Padding="8"
350+
VerticalAlignment="Stretch"
351+
BorderThickness="0"
352+
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
353+
IsChecked="{Binding LaunchOptions.HideGrass.Value, Mode=TwoWay}"
354+
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewOverlayHideGrassToolTip}">
355+
<Grid>
356+
<ImageIcon Source="ms-appx:///Resource/Icon/UI_Gcg_Buff_Common_Element_Grass.png"/>
357+
<FontIcon FontSize="26" Glyph="&#xE894;"/>
358+
</Grid>
359+
</ToggleButton>
337360
</StackPanel>
338361
</ContentControl>
339362
</cwc:Case>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Window/LaunchExecutionOverlayWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public LaunchExecutionOverlayWindow(IServiceProvider serviceProvider)
3333
AppWindow.Title = "SnapHutaoLaunchExecutionOverlay";
3434
AppWindow.SafeIsShowInSwitchers(false);
3535

36-
SizeInt32 size = ScaledSizeInt32.CreateForWindow(386, 56, this);
36+
SizeInt32 size = ScaledSizeInt32.CreateForWindow(476, 56, this);
3737

3838
// Thanks to @Scighost for the following code
3939
if (AppWindow.Presenter is OverlappedPresenter presenter)

0 commit comments

Comments
 (0)