diff --git a/App.xaml b/App.xaml index 827293f..e46efda 100644 --- a/App.xaml +++ b/App.xaml @@ -1,8 +1,7 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> diff --git a/App.xaml.cs b/App.xaml.cs index 97f83a8..b173afa 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -4,5 +4,9 @@ namespace Sheas_Cealer { public partial class App : Application { + protected override void OnStartup(StartupEventArgs e) + { + new MainWindow(e.Args).Show(); + } } } \ No newline at end of file diff --git a/Cealing-Clash.exe b/Cealing-Clash.exe new file mode 100644 index 0000000..1aa8488 Binary files /dev/null and b/Cealing-Clash.exe differ diff --git a/Cealing-Host.json b/Cealing-Host.json index 51cd23d..3a16097 100644 --- a/Cealing-Host.json +++ b/Cealing-Host.json @@ -1,11 +1,12 @@ [ + [["*pixiv.net"],"fanbox.cc","172.64.151.90"], + [["*pximg.net"],"pxi","210.140.92.149"], + [["*pinterest.com"],"pin","2.18.233.9"], [["*e-hentai.org"],"ehe","104.20.134.21"], [["*exhentai.org"],"exh","178.175.129.254"], [["*wikipedia.org","*wikimedia.org"],"wik","91.198.174.192"], [["*steamcommunity.com"],"ste","104.92.74.217"], [["*instagram.com"],"ins","157.240.236.174"], - [["*pinterest.com"],"pin","2.18.233.9"], [["*amazon.co.jp"],"ama","52.222.208.138"], - [["*pixiv.net"],"fanbox.cc","172.64.151.90"], - [["*pximg.net"],"pxi","210.140.92.149"] + [["*github.com"],"git","140.82.121.3"] ] \ No newline at end of file diff --git a/Commons/Clash.cs b/Commons/Clash.cs new file mode 100644 index 0000000..4ae2997 --- /dev/null +++ b/Commons/Clash.cs @@ -0,0 +1,23 @@ +using System; +using System.Diagnostics; +using SheasCore; + +namespace Sheas_Cealer +{ + internal class Clash : Proc + { + internal Clash() : base("Cealing-Clash.exe") + { + } + + public override void Process_OutputDataReceived(object sender, DataReceivedEventArgs e) + { + } + public override void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e) + { + } + public override void Process_Exited(object sender, EventArgs e) + { + } + } +} \ No newline at end of file diff --git a/Commons/Cmd.cs b/Commons/Cmd.cs index abbf975..3cf9542 100644 --- a/Commons/Cmd.cs +++ b/Commons/Cmd.cs @@ -6,9 +6,8 @@ namespace Sheas_Cealer { internal class Cmd : Proc { - public Cmd() : base("Cmd.exe") + internal Cmd() : base("Cmd.exe") { - //Control.CheckForIllegalCrossThreadCalls = false; } public override void Process_OutputDataReceived(object sender, DataReceivedEventArgs e) diff --git a/Sheas-Cealer.csproj b/Sheas-Cealer.csproj index f027b65..7f64f21 100644 --- a/Sheas-Cealer.csproj +++ b/Sheas-Cealer.csproj @@ -8,10 +8,10 @@ Just Ceal It Space Time Space Time - 1.0.0 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 + 1.0.1 Tool;Sheas;Cealer;Sni Sheas-Cealer-Logo.ico Sheas Cealer Logo.png @@ -48,6 +48,11 @@ + + + + + diff --git a/Windows/AboutWindow.xaml.cs b/Windows/AboutWindow.xaml.cs index 40132ac..e765c39 100644 --- a/Windows/AboutWindow.xaml.cs +++ b/Windows/AboutWindow.xaml.cs @@ -9,14 +9,13 @@ namespace Sheas_Cealer { public partial class AboutWindow : Window { - public AboutWindow() + internal AboutWindow() { InitializeComponent(); } private void AboutWin_Loaded(object sender, RoutedEventArgs e) { - try { UpdateButton.Content = "版本号: " + Assembly.GetExecutingAssembly().GetName().Version!.ToString()[0..^2]; } - catch (Exception ex) { MessageBox.Show("Error: " + ex.Message); return; } + UpdateButton.Content = "版本号: " + Assembly.GetExecutingAssembly().GetName().Version!.ToString()[0..^2]; } private void AboutButton_Click(object sender, RoutedEventArgs e) diff --git a/Windows/MainWindow.xaml b/Windows/MainWindow.xaml index 46b67ac..e056a05 100644 --- a/Windows/MainWindow.xaml +++ b/Windows/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" Style="{DynamicResource CommonWindow}" - WindowStartupLocation="CenterScreen" SizeToContent="Height" ResizeMode="CanMinimize" Width="500" MinWidth="500" Loaded="MainWin_Loaded" KeyDown="MainWin_KeyDown"> + WindowStartupLocation="CenterScreen" SizeToContent="Height" ResizeMode="CanMinimize" Width="500" MinWidth="500" AllowDrop="True" Loaded="MainWin_Loaded" Closing="MainWin_Closing" KeyDown="MainWin_KeyDown" DragEnter="MainWin_DragEnter" Drop="MainWin_Drop"> @@ -17,7 +17,7 @@ - +