From 0ea5d40c7982dd24fc6c66eae83f8580b9b26748 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Tue, 24 Jan 2023 17:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Windows/MainWindow.xaml.cs     |  7 +++-
 .../VPet-Simulator.Windows.csproj             |  2 +-
 .../WinDesign/winGameSetting.xaml             | 33 ++++++++++++-------
 .../WinDesign/winGameSetting.xaml.cs          | 11 +++++++
 .../WinDesign/winReport.xaml                  |  2 +-
 .../WinDesign/winReport.xaml.cs               | 18 +++++-----
 6 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index 9999fb0..0744ec2 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -63,7 +63,10 @@ namespace VPet_Simulator.Windows
             }
             else
                 Set = new Setting("Setting#VPET:|\n");
-
+            //this.Width = 400 * ZoomSlider.Value;
+            //this.Height = 450 * ZoomSlider.Value;
+            this.Height = 500 * Set.ZoomLevel;
+            this.Width = 500 * Set.ZoomLevel;
             InitializeComponent();
 
             //不存在就关掉
@@ -145,6 +148,7 @@ namespace VPet_Simulator.Windows
                 Main.SetLogicInterval((int)(Set.LogicInterval * 1000));
                 //加载图标
                 notifyIcon = new NotifyIcon();
+                notifyIcon.Text = "虚拟桌宠模拟器";
                 ContextMenu m_menu;
 
                 m_menu = new ContextMenu();
@@ -197,6 +201,7 @@ namespace VPet_Simulator.Windows
         {
             Save();
             Main?.Dispose();
+            notifyIcon.Visible = false;
             notifyIcon?.Dispose();
             System.Environment.Exit(0);
         }
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index b38e268..ac6b825 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -37,7 +37,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;X64</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index 9752d29..221dfa0 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -484,18 +484,6 @@
                     <Run x:Name="runActivate">已通过Steam[uid]激活服务注册</Run><LineBreak />
                         </TextBlock>
                         <TextBlock Margin="0,100,0,0" Text="制作组名单" FontSize="20" FontWeight="Bold" />
-                        <TextBlock Margin="0,130,0,0" FontWeight="Bold">
-                    <Run>游戏策划</Run><LineBreak />
-                    <Run>UI&amp;程序</Run><LineBreak />
-                    <Run>动画绘制</Run><LineBreak />                    
-                    <Run>开源项目</Run><LineBreak /><LineBreak /><LineBreak />
-                    <Run>项目页面</Run><LineBreak />
-                    <LineBreak /><LineBreak />
-                    <LineBreak /><Run xml:space="preserve">Power By        </Run>
-                    <Hyperlink TextDecorations="Underline" Foreground="Black" Click="VPET_Click">exLB.net</Hyperlink>
-                    <Run> </Run>
-                    <Hyperlink TextDecorations="Underline" Foreground="Black" Click="LB_Click">LBGame</Hyperlink>
-                        </TextBlock>
                         <TextBlock Margin="100,130,0,0">
                     <Run>杨远洛里斯, 广大MOD作者</Run><LineBreak />
                     <Run>洛里斯杨远, トニーちゃん</Run> <Hyperlink Click="Git_Click">Git贡献名单</Hyperlink><LineBreak />
@@ -512,6 +500,27 @@
                         </TextBlock>
                         <Image Source="/Res/TopLogo2018.PNG" Width="38" Margin="208,257,0,0" HorizontalAlignment="Left"
                                 VerticalAlignment="Top" Height="38" />
+
+                        <TextBlock Margin="0,130,0,0" FontWeight="Bold">
+                    <Run>游戏策划</Run><LineBreak />
+                    <Run>UI&amp;程序</Run><LineBreak />
+                    <Run>动画绘制</Run><LineBreak />                    
+                    <Run>开源项目</Run><LineBreak /><LineBreak /><LineBreak />
+                    <Run>项目页面</Run><LineBreak />
+                    <LineBreak /><LineBreak />
+                    <LineBreak /><Run xml:space="preserve">Power By        </Run>
+                    <Hyperlink TextDecorations="Underline" Foreground="Black" Click="VPET_Click">exLB.net</Hyperlink>
+                    <Run> </Run>
+                    <Hyperlink TextDecorations="Underline" Foreground="Black" Click="LB_Click">LBGame</Hyperlink>
+                            <LineBreak /><LineBreak />
+                            <Run xml:space="preserve">相关链接          </Run>
+                            <Hyperlink TextDecorations="Underline"
+                                    Foreground="{DynamicResource DARKPrimaryDarker}"
+                                    Click="VUP_Click" FontWeight="Normal">虚拟主播模拟器</Hyperlink>
+                            <Hyperlink TextDecorations="Underline" Foreground="{DynamicResource DARKPrimaryDarker}"
+                                    Click="Group_Click" FontWeight="Normal">相关群</Hyperlink>
+
+                        </TextBlock>
                     </Grid>
                 </TabItem>
             </TabControl>
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
index 33929bc..50b4dad 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
@@ -482,6 +482,15 @@ namespace VPet_Simulator.Windows
         {
             Process.Start("https://www.exlb.net/");
         }
+        private void VUP_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start("https://store.steampowered.com/app/1352140/_/");
+        }
+
+        private void Group_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start("https://jq.qq.com/?_wv=1027&k=zmeWNHyI");
+        }
         #endregion
         private void sDesktopAlignment_Checked_1(object sender, RoutedEventArgs e)
         {
@@ -525,5 +534,7 @@ namespace VPet_Simulator.Windows
         {
             mw.Main.SetMoveMode(mw.Set.AllowMove, mw.Set.SmartMove, mw.Set.SmartMoveInterval * 1000);
         }
+
+  
     }
 }
diff --git a/VPet-Simulator.Windows/WinDesign/winReport.xaml b/VPet-Simulator.Windows/WinDesign/winReport.xaml
index 806ab20..bdb005a 100644
--- a/VPet-Simulator.Windows/WinDesign/winReport.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winReport.xaml
@@ -38,7 +38,7 @@
             <TextBox x:Name="tContact" pu:TextBoxHelper.Watermark="提供联系方式以获得反馈,可不填&#13;eg:QQ430081239"
                     AcceptsReturn="True" MaxHeight="44" />
         </pu:FormGroup>
-        <Button Content="提交" Margin="10,10,0,10" FontSize="16" Background="{DynamicResource DARKPrimary}"
+        <Button x:Name="btn_Report" Content="提交" Margin="10,10,0,10" FontSize="16" Background="{DynamicResource DARKPrimary}"
                 BorderThickness="1" pu:ButtonHelper.CornerRadius="5" BorderBrush="{DynamicResource DARKPrimaryDarker}"
                 Foreground="{DynamicResource DARKPrimaryText}" Padding="2" Click="btn_upload" />
     </StackPanel>
diff --git a/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs b/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
index 842408c..c20bdd6 100644
--- a/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
@@ -19,6 +19,7 @@ using System.Windows.Shapes;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using VPet_Simulator.Core;
 using System.Web;
+using System.Threading;
 
 namespace VPet_Simulator.Windows
 {
@@ -46,11 +47,10 @@ namespace VPet_Simulator.Windows
 
             if (!mw.IsSteamUser)
             {
-                IsEnabled = false;
                 MessageBoxX.Show("您不是Steam用户，无法使用反馈中心\n欢迎加入虚拟主播模拟器群430081239反馈问题", "非Steam用户无法使用反馈中心", MessageBoxButton.OK, MessageBoxIcon.Info);
             }
         }
-        
+
         private void tUpload_Click(object sender, RoutedEventArgs e)
         {
             if (tUpload.IsChecked == true)
@@ -63,12 +63,14 @@ namespace VPet_Simulator.Windows
         {
             if (tDescription.Text == "" && tType.SelectedIndex != 0)
             {
-                 MessageBoxX.Show("请填写问题描述", "问题详细描述是反馈具体问题\n例如如何触发这个报错,游戏有什么地方不合理等");
+                MessageBoxX.Show("请填写问题描述", "问题详细描述是反馈具体问题\n例如如何触发这个报错,游戏有什么地方不合理等");
                 return;
             }
             if (!mw.IsSteamUser)
+            {
+                MessageBoxX.Show("您不是Steam用户，无法使用反馈中心\n欢迎加入虚拟主播模拟器群430081239反馈问题", "非Steam用户无法使用反馈中心", MessageBoxButton.OK, MessageBoxIcon.Info);
                 return;//不遥测非Steam用户
-
+            }
             try
             {
                 string _url = "http://cn.exlb.org:5810/VPET/Report";
@@ -103,22 +105,22 @@ namespace VPet_Simulator.Windows
                 }
                 if (responseString == "Report Error Success")
                 {
-                     MessageBoxX.Show("您的反馈已提交成功,感谢您的反馈与提交\nVOS将会尽快处理您的反馈并做的更好", "感谢您的反馈和提交");
+                    MessageBoxX.Show("您的反馈已提交成功,感谢您的反馈与提交\nVOS将会尽快处理您的反馈并做的更好", "感谢您的反馈和提交");
                     Close();
                 }
                 else if (responseString == "IP times Max")
                 {
                     mw.Set.DiagnosisDayEnable = false;
-                     MessageBoxX.Show( "您今天的反馈次数已达上限,请明天再来反馈.\n或欢迎加入虚拟主播模拟器群430081239反馈问题", "您今天的反馈次数已达上限", MessageBoxButton.OK, MessageBoxIcon.Error);
+                    MessageBoxX.Show("您今天的反馈次数已达上限,请明天再来反馈.\n或欢迎加入虚拟主播模拟器群430081239反馈问题", "您今天的反馈次数已达上限", MessageBoxButton.OK, MessageBoxIcon.Error);
                 }
                 else
                 {
-                     MessageBoxX.Show( "反馈上传失败\n欢迎加入虚拟主播模拟器群430081239手动反馈问题\n服务器消息:" + responseString, "反馈提交失败,遇到错误", MessageBoxButton.OK, MessageBoxIcon.Error);
+                    MessageBoxX.Show("反馈上传失败\n欢迎加入虚拟主播模拟器群430081239手动反馈问题\n服务器消息:" + responseString, "反馈提交失败,遇到错误", MessageBoxButton.OK, MessageBoxIcon.Error);
                 }
             }
             catch (Exception exp)
             {
-                 MessageBoxX.Show( "反馈上传失败,可能是网络或其他问题导致无法上传\n欢迎加入虚拟主播模拟器群430081239手动反馈问题\n" + exp.ToString(), "反馈提交失败,遇到错误", MessageBoxButton.OK, MessageBoxIcon.Error);
+                MessageBoxX.Show("反馈上传失败,可能是网络或其他问题导致无法上传\n欢迎加入虚拟主播模拟器群430081239手动反馈问题\n" + exp.ToString(), "反馈提交失败,遇到错误", MessageBoxButton.OK, MessageBoxIcon.Error);
             }
 
         }