From 575fec115e3ca40abba0b4bb454e183122c43de6 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Tue, 26 Mar 2024 19:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=8D=E9=A6=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=92=8C=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Windows/App.xaml.cs                           | 5 ++++-
 VPet-Simulator.Windows/WinDesign/winReport.xaml              | 2 ++
 VPet-Simulator.Windows/WinDesign/winReport.xaml.cs           | 2 +-
 VPet-Simulator.Windows/mod/0000_core/lang/en/Base2403.lps    | 3 ++-
 .../mod/0000_core/lang/zh-Hans/Base2403.lps                  | 3 ++-
 .../mod/0000_core/lang/zh-Hant/Base2403.lps                  | 3 ++-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/VPet-Simulator.Windows/App.xaml.cs b/VPet-Simulator.Windows/App.xaml.cs
index ded0adc..83c2cd4 100644
--- a/VPet-Simulator.Windows/App.xaml.cs
+++ b/VPet-Simulator.Windows/App.xaml.cs
@@ -48,7 +48,10 @@ namespace VPet_Simulator.Windows
         private void UnhandledException(Exception e, bool isFatality)
         {
             var expt = e.ToString();
-            if (expt.ToLower().Contains("value") && expt.ToLower().Contains("nan"))
+            if (expt.Contains("MainWindow.Close"))
+                return;
+            else if ((expt.ToLower().Contains("value") && expt.ToLower().Contains("nan")) ||
+                expt.Contains("System.OverflowException") || expt.Contains("System.DivideByZeroException"))
             {
                 MessageBox.Show("由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD".Translate());
                 return;
diff --git a/VPet-Simulator.Windows/WinDesign/winReport.xaml b/VPet-Simulator.Windows/WinDesign/winReport.xaml
index e7e47f8..d45176b 100644
--- a/VPet-Simulator.Windows/WinDesign/winReport.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winReport.xaml
@@ -41,6 +41,8 @@
             <TextBox x:Name="tContact" pu:TextBoxHelper.Watermark="{ll:Str '提供联系方式以获得反馈,可不填\&#13;eg:QQ430081239'}"
                     AcceptsReturn="True" MaxHeight="44" />
         </pu:FormGroup>
+        <Label
+                Content="{ll:Str '如果比较重要或需要反馈,请联系:\&#13;B站: 虚拟桌宠模拟器 \&#13;邮箱: service@exlb.net \&#13;Github: https://github.com/LorisYounger/VPet'}" Background="{x:Null}" />
         <Button x:Name="btn_Report" Content="{ll:Str '提交'}" Margin="10,10,0,10" FontSize="16"
                 Background="{DynamicResource DARKPrimary}" BorderThickness="1" pu:ButtonHelper.CornerRadius="5"
                 BorderBrush="{DynamicResource DARKPrimaryDarker}" Foreground="{DynamicResource DARKPrimaryText}"
diff --git a/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs b/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
index 031e3c3..b75b5c0 100644
--- a/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
@@ -51,7 +51,7 @@ namespace VPet_Simulator.Windows
         {
             if (tDescription.Text == "" && tType.SelectedIndex != 0)
             {
-                MessageBoxX.Show("请填写问题描述".Translate(), "问题详细描述是反馈具体问题\n例如如何触发这个报错,游戏有什么地方不合理等".Translate());
+                MessageBoxX.Show("问题详细描述是反馈具体问题\n例如如何触发这个报错,游戏有什么地方不合理等".Translate(), "请填写问题描述".Translate());
                 return;
             }
             if (!mw.IsSteamUser)
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2403.lps b/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2403.lps
index cfc6994..82e846e 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2403.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2403.lps
@@ -53,4 +53,5 @@ theme#Theme:|
 好友{0}已退出访客表#Friend {0} has exited the Guest List:|
 好友{0}已加入访客表#Friend {0} has joined the Guest List:|
 您以前遭遇过数据溢出, 已根据游戏时长自动添加进当前数值#You have encountered data overflow before, and the current value has been automatically added according to the game duration:|
-数据溢出恢复#Data overflow recovery:|
\ No newline at end of file
+数据溢出恢复#Data overflow recovery:|
+如果比较重要或需要反馈,请联系:\rB站: 虚拟桌宠模拟器 \r邮箱: service@exlb.net \rGithub: https://github.com/LorisYounger/VPet#If it is important or needs feedback, please contact:\rMail: service@exlb.net\rGithub: https://github.com/LorisYounger/VPet:|
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2403.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2403.lps
index 785a051..c93a42b 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2403.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2403.lps
@@ -53,4 +53,5 @@ theme#主题:|
 好友{0}已退出访客表#好友{0}已退出访客表:|
 好友{0}已加入访客表#好友{0}已加入访客表:|
 您以前遭遇过数据溢出, 已根据游戏时长自动添加进当前数值#您以前遭遇过数据溢出, 已根据游戏时长自动添加进当前数值:|
-数据溢出恢复#数据溢出恢复:|
\ No newline at end of file
+数据溢出恢复#数据溢出恢复:|
+如果比较重要或需要反馈,请联系:\rB站: 虚拟桌宠模拟器 \r邮箱: service@exlb.net \rGithub: https://github.com/LorisYounger/VPet#如果比较重要或需要反馈,请联系:\rB站: 虚拟桌宠模拟器 \r邮箱: service@exlb.net \rGithub: https://github.com/LorisYounger/VPet:|
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2403.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2403.lps
index e44bf9b..0ab41c1 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2403.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2403.lps
@@ -53,4 +53,5 @@ theme#主題:|
 好友{0}已退出访客表#好友{0}已退出訪客表:|
 好友{0}已加入访客表#好友{0}已加入訪客表:|
 您以前遭遇过数据溢出, 已根据游戏时长自动添加进当前数值#您以前遭遇過數據溢出, 已根據遊戲時長自動添加進目前數值:|
-数据溢出恢复#數據溢出恢復:|
\ No newline at end of file
+数据溢出恢复#數據溢出恢復:|
+如果比较重要或需要反馈,请联系:\rB站: 虚拟桌宠模拟器 \r邮箱: service@exlb.net \rGithub: https://github.com/LorisYounger/VPet#如果比較重要或需要反饋,請聯繫:\rB站: 虛擬桌寵模擬器 \r郵箱: service@exlb.net \rGithub: https://github.com/LorisYounger/VPet:|
\ No newline at end of file