From 363402a29e8fa535d5e9722094dee1162ff8a887 Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Wed, 25 Oct 2023 03:17:20 +0800
Subject: [PATCH] Fix a negative mutator's bug in nexus coop mode; Delete
 "great wall" in nexus and usuck.

---
 LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs |  13 +++++++++++--
 LiaoTian_Cup/Dictionary/I18n/Lang.resx        |   7 +++++--
 LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx     |   7 +++++--
 LiaoTian_Cup/LiaoTian_Cup.csproj              |   3 ++-
 LiaoTian_Cup/MainPage.xaml                    |   4 ++--
 LiaoTian_Cup/Mode/HubModeWindow.xaml          |   2 +-
 LiaoTian_Cup/Mode/HubModeWindow.xaml.cs       |   5 ++---
 LiaoTian_Cup/Resources/database.db            | Bin 43008 -> 43008 bytes
 ...sbattlefield.png => Nexus_BattleField.png} | Bin
 README_ZH.md                                  |   2 +-
 10 files changed, 29 insertions(+), 14 deletions(-)
 rename LiaoTian_Cup/Resources/factor/{nexusbattlefield.png => Nexus_BattleField.png} (100%)

diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
index 58ac5ff..6013b1a 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
@@ -187,7 +187,7 @@ public static string ConfirmMapBtn {
         }
         
         /// <summary>
-        ///   查找类似 Co-op mode 的本地化字符串。
+        ///   查找类似 Official co-op mode 的本地化字符串。
         /// </summary>
         public static string DoublesMode {
             get {
@@ -502,7 +502,7 @@ public static string ResetBtn {
         }
         
         /// <summary>
-        ///   查找类似 Solo mode 的本地化字符串。
+        ///   查找类似 Official solo mode 的本地化字符串。
         /// </summary>
         public static string SingleMode {
             get {
@@ -690,6 +690,15 @@ public static string 旧世步兵团 {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Nexus_BattleField 的本地化字符串。
+        /// </summary>
+        public static string 时空战场 {
+            get {
+                return ResourceManager.GetString("时空战场", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Shadow Tech 的本地化字符串。
         /// </summary>
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
index 8f65e95..4e09af2 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
@@ -124,10 +124,10 @@
     <value>Pure negative mode</value>
   </data>
   <data name="DoublesMode" xml:space="preserve">
-    <value>Co-op mode</value>
+    <value>Official co-op mode</value>
   </data>
   <data name="SingleMode" xml:space="preserve">
-    <value>Solo mode</value>
+    <value>Official solo mode</value>
   </data>
   <data name="About" xml:space="preserve">
     <value>About Me</value>
@@ -399,4 +399,7 @@
   <data name="铁甲钢拳" xml:space="preserve">
     <value>Real Steel</value>
   </data>
+  <data name="时空战场" xml:space="preserve">
+    <value>Nexus_BattleField</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
index ca80d22..ef88e87 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
@@ -124,10 +124,10 @@
     <value>纯正面因子模式</value>
   </data>
   <data name="DoublesMode" xml:space="preserve">
-    <value>双打模式</value>
+    <value>官方双打模式</value>
   </data>
   <data name="SingleMode" xml:space="preserve">
-    <value>正常单刷模式</value>
+    <value>官方单刷模式</value>
   </data>
   <data name="About" xml:space="preserve">
     <value>关于我</value>
@@ -399,4 +399,7 @@
   <data name="铁甲钢拳" xml:space="preserve">
     <value>铁甲钢拳</value>
   </data>
+  <data name="时空战场" xml:space="preserve">
+    <value>时空战场</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/LiaoTian_Cup/LiaoTian_Cup.csproj b/LiaoTian_Cup/LiaoTian_Cup.csproj
index 98ed956..01b1742 100644
--- a/LiaoTian_Cup/LiaoTian_Cup.csproj
+++ b/LiaoTian_Cup/LiaoTian_Cup.csproj
@@ -68,6 +68,7 @@
     <None Remove="Resources\commander\雷诺.png" />
     <None Remove="Resources\database.db" />
     <None Remove="Resources\factor\nexusbattlefield.png" />
+    <None Remove="Resources\factor\Nexus_BattleField.png" />
     <None Remove="Resources\factor\万钧皇权.png" />
     <None Remove="Resources\factor\不给糖果就捣蛋.png" />
     <None Remove="Resources\factor\丧尸大战.png" />
@@ -263,7 +264,7 @@
     <Resource Include="Resources\commander\赛兰蒂斯.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Resources\factor\nexusbattlefield.png">
+    <Resource Include="Resources\factor\Nexus_BattleField.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <Resource Include="Resources\factor\万钧皇权.png">
diff --git a/LiaoTian_Cup/MainPage.xaml b/LiaoTian_Cup/MainPage.xaml
index ec26a48..90370c2 100644
--- a/LiaoTian_Cup/MainPage.xaml
+++ b/LiaoTian_Cup/MainPage.xaml
@@ -106,13 +106,13 @@
                     FontSize="15" />
             </StackPanel>
             <Button
-                Width="200"
+                Width="160"
                 Height="40"
                 Margin="0,0,15,10"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Bottom"
                 Click="AddGroupBtn"
-                Content="聊天杯赛事群：437813472"
+                Content="赛事群：437813472"
                 FontSize="15" />
         </Grid>
     </Grid>
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml b/LiaoTian_Cup/Mode/HubModeWindow.xaml
index 7a29bf8..7719aa9 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml
@@ -187,7 +187,6 @@
                                 <Image x:Name="NegativeFactor3" />
                                 <Image x:Name="NegativeFactor4" />
                                 <Image x:Name="NegativeFactor5" />
-                                <Image x:Name="NegativeFactor15" />
                             </StackPanel>
                         </Grid>
                         <Grid Margin="0,15,0,0" Row="1">
@@ -201,6 +200,7 @@
                                 <Image x:Name="NegativeFactor12" />
                                 <Image x:Name="NegativeFactor13" />
                                 <Image x:Name="NegativeFactor14" />
+                                <Image x:Name="NegativeFactor15" />
                             </StackPanel>
                         </Grid>
                     </Grid>
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
index 9df05e9..fc3b938 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
@@ -264,7 +264,7 @@ private void ShowBaseNegativeFactor()
             NegativeFactor12.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[11] + ".png", UriKind.Relative));
             NegativeFactor13.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[12] + ".png", UriKind.Relative));
             NegativeFactor14.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[13] + ".png", UriKind.Relative));
-            NegativeFactor15.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[14] + ".png", UriKind.Relative));
+            NegativeFactor15.Source = new BitmapImage(new Uri(factorDir + Dictionary.I18n.Lang.ResourceManager.GetString("时空战场") + ".png", UriKind.Relative));
         }
 
         //多线因子显示
@@ -392,8 +392,7 @@ private void ShowRandomFactor()
             if (_modeName.Equals(Dictionary.I18n.Lang.ResourceManager.GetString("EightMutatorsMode")))
             {
                 SelectFactor7.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[6]] + ".png", UriKind.Relative));
-                // SelectFactor8.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[7]] + ".png", UriKind.Relative));
-                SelectFactor8.Source = new BitmapImage(new Uri("/LiaoTian_Cup;component/Resources/factor/此面向敌.png", UriKind.Relative));
+                SelectFactor8.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[7]] + ".png", UriKind.Relative));
             }
         }
 
diff --git a/LiaoTian_Cup/Resources/database.db b/LiaoTian_Cup/Resources/database.db
index 6294edc1db8036d4ae15758617bf5c4417290cdb..f073c6df203340041ad4c61c5afae572795f5044 100644
GIT binary patch
delta 201
zcmZp;z|?SoX@WH4t%)+ujJGx>ER<(qRAw-m%&HK_EzHQw@R{K;!)1oc6B|<}Used<
zVqjnZVIY`nP&#4rUPad+W;F)G$*d(|{9=r3%!e7iF+5|q#&C>b+vKd0JzR_jVCpv;
zlwMI{)Sb*aLu0c349m%BGiEdTZ)Te5%gD>LgMk-fD3IJ7Gixa)3v)Yz++@}zM*NeQ
m7c*~RKFWNV`5yCo=Jy*LH!^PizH|a3H&7`EgTUlT%kuz17dkxv

delta 174
zcmV;f08#&d&;o$a0+1U4*O44U0oSo$p&teS001)p(~}1*Vg>U6;{el<fn}4^AW*X-
zE#d;R1tk4X1Hb?>lLd5E4<-Q?0R{uZ0QLap0M-D;lWKIllOrvfv%qykA^|Rw1(+z4
zGY}(_PM8>zXqcG+xU&M8O#zcn5^1xznn?)+0000VlLe$Q4~GMi1ET}91H}W=1KtDg
cv4ODxv-hQt0SgKP83E~)zvZ8f7L$^vZc^<)L;wH)

diff --git a/LiaoTian_Cup/Resources/factor/nexusbattlefield.png b/LiaoTian_Cup/Resources/factor/Nexus_BattleField.png
similarity index 100%
rename from LiaoTian_Cup/Resources/factor/nexusbattlefield.png
rename to LiaoTian_Cup/Resources/factor/Nexus_BattleField.png
diff --git a/README_ZH.md b/README_ZH.md
index 17c54e0..4fd58cd 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -1,6 +1,6 @@
 # LiaoTian_Cup
 
-[聊天杯](https://github.com/B1ackSand/LiaoTianCup)是一个星际争霸2非官方的比赛赛事。
+[聊天杯](https://qm.qq.com/q/nS395vkauA)是一个星际争霸2非官方的比赛赛事。
 
 该项目基于WPF (C#/.NET 6.0)，为我朋友创建的竞赛工具。