Skip to content

Commit 64a146c

Browse files
WahealWaheal
committed
v3.6.5.0
优化软件设置界面引导 优化关键字日志屏蔽功能，增加多屏蔽词 ConPTY伪终端增加自动清屏功能 优化进入游戏玩家信息抓取功能，修复部分情况下无法抓取的bug 优化创建服务器引导，避免空白开服内存参数 布局和UI调整 功能优化
1 parent 010c23c commit 64a146c

File tree

9 files changed

+301
-94
lines changed

9 files changed

+301
-94
lines changed

‎MSL/MSL.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@
167167
<Compile Include="pages\frpProviders\Custom.xaml.cs">
168168
<DependentUpon>Custom.xaml</DependentUpon>
169169
</Compile>
170-
<Compile Include="pages\frpProviders\MSLFrp.xaml.cs">
171-
<DependentUpon>MSLFrp.xaml</DependentUpon>
172-
</Compile>
173170
<Compile Include="pages\frpProviders\OpenFrp.xaml.cs">
174171
<DependentUpon>OpenFrp.xaml</DependentUpon>
175172
</Compile>
@@ -288,10 +285,6 @@
288285
<SubType>Designer</SubType>
289286
<Generator>MSBuild:Compile</Generator>
290287
</Page>
291-
<Page Include="pages\frpProviders\MSLFrp.xaml">
292-
<SubType>Designer</SubType>
293-
<Generator>MSBuild:Compile</Generator>
294-
</Page>
295288
<Page Include="pages\frpProviders\MSLFrpNew.xaml">
296289
<SubType>Designer</SubType>
297290
<Generator>MSBuild:Compile</Generator>

‎MSL/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
5050
//通过使用 "*"，如下所示:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("3.6.4.9")]
53-
[assembly: AssemblyFileVersion("3.6.4.9")]
52+
[assembly: AssemblyVersion("3.6.5.0")]
53+
[assembly: AssemblyFileVersion("3.6.5.0")]

‎MSL/controls/dialogs/InputDialog.xaml.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using MSL.utils;
2+
using System;
23
using System.Windows;
34
using System.Windows.Controls;
45
using System.Windows.Media.Animation;
@@ -12,7 +13,8 @@ public partial class InputDialog
1213
{
1314
public event DeleControl CloseDialog;
1415
public string _dialogReturn = null;
15-
public InputDialog(string dialogText, string textboxText, bool passwordMode = false)
16+
private bool AcceptEmpty;
17+
public InputDialog(string dialogText, string textboxText, bool passwordMode = false,bool acceptEmpty=false)
1618
{
1719
InitializeComponent();
1820
Margin = new Thickness(50);
@@ -30,10 +32,12 @@ public InputDialog(string dialogText, string textboxText, bool passwordMode = fa
3032
textBox.Visibility = Visibility.Visible;
3133
textBox.Focus();
3234
}
35+
AcceptEmpty= acceptEmpty;
3336
}
3437

3538
private void primaryBtn_Click(object sender, RoutedEventArgs e)
3639
{
40+
3741
if (passBox.Visibility == Visibility.Visible)
3842
{
3943
_dialogReturn = passBox.Password;
@@ -43,8 +47,15 @@ private void primaryBtn_Click(object sender, RoutedEventArgs e)
4347
_dialogReturn = textBox.Text;
4448
}
4549
//_dialogReturn = true;
46-
//Close();
47-
CloseDialog();
50+
if (!AcceptEmpty)
51+
{
52+
if (string.IsNullOrEmpty(_dialogReturn))
53+
{
54+
MagicShow.ShowMsgDialog(Window.GetWindow(this),"请输入内容！","提示");
55+
return;
56+
}
57+
}
58+
Close();
4859
}
4960

5061
private void closeBtn_Click(object sender, RoutedEventArgs e)
@@ -59,6 +70,14 @@ private void textBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
5970
{
6071
//_dialogReturn = true;
6172
_dialogReturn = textBox.Text;
73+
if (!AcceptEmpty)
74+
{
75+
if (string.IsNullOrEmpty(_dialogReturn))
76+
{
77+
MagicShow.ShowMsgDialog(Window.GetWindow(this), "请输入内容！", "提示");
78+
return;
79+
}
80+
}
6281
Close();
6382
}
6483
}
@@ -69,6 +88,14 @@ private void passBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
6988
{
7089
//_dialogReturn = true;
7190
_dialogReturn = passBox.Password;
91+
if (!AcceptEmpty)
92+
{
93+
if (string.IsNullOrEmpty(_dialogReturn))
94+
{
95+
MagicShow.ShowMsgDialog(Window.GetWindow(this), "请输入内容！", "提示");
96+
return;
97+
}
98+
}
7299
Close();
73100
}
74101
}

‎MSL/forms/ServerRunner.xaml‎

Lines changed: 49 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -559,37 +559,64 @@
559559
</hc:UniformSpacingPanel>
560560
</Grid>
561561
<hc:Divider Margin="0"/>
562-
<Grid x:Name="Tradition_LogFunGrid">
562+
<Grid>
563563
<Grid.ColumnDefinitions>
564564
<ColumnDefinition Width="auto"/>
565565
<ColumnDefinition Width="*"/>
566566
</Grid.ColumnDefinitions>
567567
<Label Content="服务器终端：" Grid.Column="0" Style="{StaticResource MagicLabel16}"/>
568568
<hc:UniformSpacingPanel Spacing="10" Orientation="Vertical" Grid.Column="1">
569-
<StackPanel Orientation="Horizontal">
570-
<Label Content="日志输出：" Style="{StaticResource MagicLabel14}"/>
571-
<ToggleButton x:Name="showOutlog" IsChecked="True" Style="{StaticResource ToggleButtonSwitch.Content}" Click="showOutlog_Click"/>
572-
</StackPanel>
569+
<Grid x:Name="Tradition_LogFunGrid">
570+
<Grid.ColumnDefinitions>
571+
<ColumnDefinition Width="Auto"/>
572+
<ColumnDefinition Width="100"/>
573+
<ColumnDefinition Width="Auto"/>
574+
<ColumnDefinition/>
575+
</Grid.ColumnDefinitions>
576+
<hc:UniformSpacingPanel Grid.Column="0" Spacing="10" Orientation="Vertical">
577+
<StackPanel Orientation="Horizontal">
578+
<Label Content="日志输出：" Style="{StaticResource MagicLabel14}"/>
579+
<ToggleButton x:Name="showOutlog" IsChecked="True" Style="{StaticResource ToggleButtonSwitch.Content}" Click="showOutlog_Click"/>
580+
</StackPanel>
581+
<StackPanel Orientation="Horizontal">
582+
<Label Content="屏蔽堆栈追踪：" Style="{StaticResource MagicLabel14}"/>
583+
<ToggleButton x:Name="shieldStackOut" IsChecked="True" Style="{StaticResource ToggleButtonSwitch.Content}" Click="shieldStackOut_Click"/>
584+
</StackPanel>
585+
<StackPanel Orientation="Horizontal">
586+
<Label Content="输入编码：" Style="{StaticResource MagicLabel14}"/>
587+
<Button x:Name="inputCmdEncoding" Content="UTF8" Click="inputCmdEncoding_Click"/>
588+
</StackPanel>
589+
<StackPanel Orientation="Horizontal">
590+
<Label Content="输出编码：" Style="{StaticResource MagicLabel14}"/>
591+
<Button x:Name="outputCmdEncoding" Content="UTF8" Click="outputCmdEncoding_Click"/>
592+
</StackPanel>
593+
</hc:UniformSpacingPanel>
594+
<Grid Grid.Column="2">
595+
<Grid.RowDefinitions>
596+
<RowDefinition Height="Auto"/>
597+
<RowDefinition/>
598+
<RowDefinition Height="Auto"/>
599+
</Grid.RowDefinitions>
600+
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top">
601+
<Label Content="屏蔽关键字日志：" Style="{StaticResource MagicLabel14}"/>
602+
<ToggleButton x:Name="shieldLogBtn" Style="{StaticResource ToggleButtonSwitch.Content}" Click="shieldLogBtn_Click"/>
603+
</StackPanel>
604+
<ListBox x:Name="ShieldLogList" Grid.Row="1" Margin="0,5,0,5" MaxHeight="80"/>
605+
<Grid Grid.Row="2">
606+
<Grid.ColumnDefinitions>
607+
<ColumnDefinition/>
608+
<ColumnDefinition Width="5"/>
609+
<ColumnDefinition/>
610+
</Grid.ColumnDefinitions>
611+
<Button x:Name="LogShield_Add" Content="添加屏蔽词" Grid.Column="0" HorizontalAlignment="Stretch" Click="LogShield_Add_Click"/>
612+
<Button x:Name="LogShield_Del" Content="移除屏蔽词" Grid.Column="2" HorizontalAlignment="Stretch" Click="LogShield_Del_Click"/>
613+
</Grid>
614+
</Grid>
615+
</Grid>
573616
<StackPanel Orientation="Horizontal">
574617
<Label Content="自动清屏：" Style="{StaticResource MagicLabel14}"/>
575618
<ToggleButton x:Name="autoClearOutlog" IsChecked="True" Style="{StaticResource ToggleButtonSwitch.Content}" Click="autoClearOutlog_Click"/>
576619
</StackPanel>
577-
<StackPanel Orientation="Horizontal">
578-
<Label Content="屏蔽关键字日志：" Style="{StaticResource MagicLabel14}"/>
579-
<ToggleButton x:Name="shieldLogBtn" Style="{StaticResource ToggleButtonSwitch.Content}" Click="shieldLogBtn_Click"/>
580-
</StackPanel>
581-
<StackPanel Orientation="Horizontal">
582-
<Label Content="屏蔽堆栈追踪：" Style="{StaticResource MagicLabel14}"/>
583-
<ToggleButton x:Name="shieldStackOut" IsChecked="True" Style="{StaticResource ToggleButtonSwitch.Content}" Click="shieldStackOut_Click"/>
584-
</StackPanel>
585-
<StackPanel Orientation="Horizontal">
586-
<Label Content="输入编码：" Style="{StaticResource MagicLabel14}"/>
587-
<Button x:Name="inputCmdEncoding" Content="UTF8" Click="inputCmdEncoding_Click"/>
588-
</StackPanel>
589-
<StackPanel Orientation="Horizontal">
590-
<Label Content="输出编码：" Style="{StaticResource MagicLabel14}"/>
591-
<Button x:Name="outputCmdEncoding" Content="UTF8" Click="outputCmdEncoding_Click"/>
592-
</StackPanel>
593620
</hc:UniformSpacingPanel>
594621
</Grid>
595622
<hc:Divider x:Name="Tradition_LogFunDivider" Margin="0"/>
@@ -598,7 +625,7 @@
598625
<ColumnDefinition Width="auto"/>
599626
<ColumnDefinition Width="*"/>
600627
</Grid.ColumnDefinitions>
601-
<Label Content="其它功能项：" Grid.Column="0" Margin="0,0,10,0" Padding="10,0,10,0" BorderThickness="0" FontSize="16" VerticalAlignment="Top" HorizontalContentAlignment="Left"/>
628+
<Label Content="其它功能项：" Grid.Column="0" Style="{StaticResource MagicLabel16}"/>
602629
<WrapPanel Grid.Column="1">
603630
<Button x:Name="onlineMode" Content="关闭正版验证" Click="onlineMode_Click" FontSize="14" Margin="0,0,5,5"/>
604631
<Button x:Name="shareLog" Content="上传服务器控制台日志" FontSize="14" Margin="0,0,5,5" Click="shareLog_Click" MouseDoubleClick="controlServer_MouseDoubleClick"/>

0 commit comments

Comments
 (0)