From 5fd102c0dc2e89194feb3b3bba471b4aaeb879a4 Mon Sep 17 00:00:00 2001
From: 1415ddfer <1783488228@qq.com>
Date: Fri, 22 Mar 2024 22:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.xaml             |  5 +--
 MainWindow.xaml.cs          |  4 ++
 Manager/AccountManager.cs   |  1 +
 Manager/CloundMananger.cs   |  2 +-
 Manager/EngineManager.cs    | 88 ++++++++++++++++++-------------------
 controls/MemberControl.xaml |  4 +-
 6 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index dcb43a1..f3369bf 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -4,7 +4,6 @@
         xmlns:MyNamespace="clr-namespace:Zerolauncher.controls"
         AllowsTransparency="True" WindowStyle="None" Background="Transparent"
         Title="零蛋登陆器" Height="300" Width="500" MouseLeftButtonDown="Window_MouseLeftButtonDown">
-
     <Grid>
         <!-- 使用透明背景的PNG图片作为窗口的背景 -->
         <Image Source="/res/1.png" Stretch="Fill"/>
@@ -20,7 +19,7 @@
                 <MyNamespace:AirButton Background="Transparent" Height="21" Width="30" Click="Button_Click_3" DockPanel.Dock="Right" BorderBrush="Transparent" Style="{StaticResource ChangeButtonIsMouseOver}">
                     <Image Source="/res/btn_close1.png"/>
                 </MyNamespace:AirButton>
-                <MyNamespace:AirButton Background="Transparent" Height="21" Width="30" DockPanel.Dock="Right" BorderBrush="Transparent" Style="{StaticResource ChangeButtonIsMouseOver}">
+                <MyNamespace:AirButton Background="Transparent" Height="21" Width="30" DockPanel.Dock="Right" BorderBrush="Transparent" Style="{StaticResource ChangeButtonIsMouseOver}" Click="AirButton_Click_1">
                     <Image Source="/res/btn_mini1.png"/>
                 </MyNamespace:AirButton>
                 <MyNamespace:AirButton Background="Transparent" Height="20" Width="30" BorderBrush="Transparent" Style="{StaticResource ChangeButtonIsMouseOver}" Margin="5,0,0,0" Click="AirButton_Click">
@@ -28,7 +27,7 @@
                 </MyNamespace:AirButton>
                 <Label/>
             </DockPanel>
-            <ScrollViewer x:Name="memberBG"  VerticalScrollBarVisibility="Auto" Margin="10,3,10,10">
+            <ScrollViewer x:Name="memberBG"  VerticalScrollBarVisibility="Auto" Margin="15,3,10,10">
                 <WrapPanel Name="mLayout">
                 </WrapPanel>
             </ScrollViewer>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ea470c8..ec516e8 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -133,5 +133,9 @@ namespace Zerolauncher
             ab.ShowDialog();
         }
 
+        private void AirButton_Click_1(object sender, RoutedEventArgs e)
+        {
+            WindowState = WindowState.Minimized;
+        }
     }
 }
\ No newline at end of file
diff --git a/Manager/AccountManager.cs b/Manager/AccountManager.cs
index c4fe811..3f801bc 100644
--- a/Manager/AccountManager.cs
+++ b/Manager/AccountManager.cs
@@ -81,6 +81,7 @@ namespace Zerolauncher.Manager
             var group = DataStream.dataStream.Groups[teamIndex];
             group.Accounts.RemoveAt(memberId);
             DataStream.write();
+            reloadData();
             MainWindow.Instance.ReloadBtn();
         }
 
diff --git a/Manager/CloundMananger.cs b/Manager/CloundMananger.cs
index bb17770..17e8fb0 100644
--- a/Manager/CloundMananger.cs
+++ b/Manager/CloundMananger.cs
@@ -37,7 +37,7 @@ namespace Zerolauncher.Manager
             try
             {
                 client.Timeout = TimeSpan.FromMinutes(3);
-                response = await client.GetAsync($"{StaticUrl.QMessageMain}{StaticUrl.LoveMessage}");
+                response = await client.GetAsync($"{StaticUrl.QMessageMain}{StaticUrl.MasterMessage}");
             }
             catch (Exception _ex)
             {
diff --git a/Manager/EngineManager.cs b/Manager/EngineManager.cs
index 284a40a..52bd12f 100644
--- a/Manager/EngineManager.cs
+++ b/Manager/EngineManager.cs
@@ -24,11 +24,11 @@ namespace Zerolauncher.Manager
                 MessageBox.Show("正在更新游戏数据，请等待1-3秒。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return true;
             }
-            //if (UpDateManager.state)
-            //{
-            //    UpDateManager.DoUpdate();
-            //    return true;
-            //}
+            if (UpDateManager.state)
+            {
+                UpDateManager.DoUpdate();
+                return true;
+            }
             var key = AccToKey(account);
             if (mGame.ContainsKey(key)) { return false; }
             if (CacheSha.errorCode != 0) {
@@ -242,45 +242,45 @@ namespace Zerolauncher.Manager
         {
             bool is_first_luancher = EngineManager.CheckEmpy();
             #region 检测代码
-            //if (mod == StaticHandleA.UpdateMode)
-            //{
-            //    if (DataStream.dataStream.ecs.Length > 10)
-            //    {
-            //        string? now_bit;
-            //        using (SHA256 sha256 = SHA256.Create())
-            //        {
-            //            using (FileStream fileStream = File.OpenRead(engine_file))
-            //            {
-            //                byte[] hashBytes = sha256.ComputeHash(fileStream);
-            //                now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
-            //            }
-            //        }
-            //        if (DataStream.dataStream.ecs != now_bit)
-            //        {
-            //            Trace.WriteLine("lalalala" + DataStream.dataStream.ecs);
-            //            throw new FileReadException("error esu1!");
-            //        }
-            //    }
-            //}
-            //else if (!is_check && is_first_luancher)
-            //{
-            //    string? now_bit;
-            //    using (SHA256 sha256 = SHA256.Create())
-            //    {
-            //        using (FileStream fileStream = File.OpenRead(engine_file))
-            //        {
-            //            byte[] hashBytes = sha256.ComputeHash(fileStream);
-            //            now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
-            //        }
-            //    }
-            //    if (CacheSha.GetE() != now_bit)
-            //    {
-            //        Trace.WriteLine("lalalala1");
-            //        throw new FileReadException("error esu0!");
-            //    }
-            //    if (DataStream.dataStream.ecs != now_bit) { DataStream.dataStream.ecs = now_bit; DataStream.write(); }
-            //    is_check = true;
-            //}
+            if (mod == StaticHandleA.UpdateMode)
+            {
+                if (DataStream.dataStream.ecs.Length > 10)
+                {
+                    string? now_bit;
+                    using (SHA256 sha256 = SHA256.Create())
+                    {
+                        using (FileStream fileStream = File.OpenRead(engine_file))
+                        {
+                            byte[] hashBytes = sha256.ComputeHash(fileStream);
+                            now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
+                        }
+                    }
+                    if (DataStream.dataStream.ecs != now_bit)
+                    {
+                        Trace.WriteLine("lalalala" + DataStream.dataStream.ecs);
+                        throw new FileReadException("error esu1!");
+                    }
+                }
+            }
+            else if (!is_check && is_first_luancher)
+            {
+                string? now_bit;
+                using (SHA256 sha256 = SHA256.Create())
+                {
+                    using (FileStream fileStream = File.OpenRead(engine_file))
+                    {
+                        byte[] hashBytes = sha256.ComputeHash(fileStream);
+                        now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
+                    }
+                }
+                if (CacheSha.GetE() != now_bit)
+                {
+                    Trace.WriteLine("lalalala1");
+                    throw new FileReadException("error esu0!");
+                }
+                if (DataStream.dataStream.ecs != now_bit) { DataStream.dataStream.ecs = now_bit; DataStream.write(); }
+                is_check = true;
+            }
             #endregion
 
             var process = new Process
diff --git a/controls/MemberControl.xaml b/controls/MemberControl.xaml
index 31a05be..af96a3f 100644
--- a/controls/MemberControl.xaml
+++ b/controls/MemberControl.xaml
@@ -4,11 +4,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
-             d:DesignHeight="75" d:DesignWidth="60" Margin="5">
+             d:DesignHeight="75" d:DesignWidth="65" Margin="5">
     <Grid>
         <DockPanel>
             <Image Name="icon" DockPanel.Dock="Top" Source="/res/player_ico1.png" Width="60" Height="60"/>
-            <Label Name="text" DockPanel.Dock="Bottom" Content="43-测试账号" FontSize="9" Padding="0"/>
+            <Label Name="text" DockPanel.Dock="Bottom" Content="43-测试账号" FontSize="9" Padding="0" Width="65"/>
         </DockPanel>
     </Grid>
 </UserControl>