Fix a negative mutator's bug in nexus coop mode; Delete "great wall" …

…in nexus and usuck.
B1ackSand · Oct 24, 2023 · 363402a · 363402a
1 parent bd9c0d2
commit 363402a
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 14 deletions.
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
diff --git 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>
diff --git 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>
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/...Cup/Resources/factor/nexusbattlefield.png → ...up/Resources/factor/Nexus_BattleField.png b/...Cup/Resources/factor/nexusbattlefield.png → ...up/Resources/factor/Nexus_BattleField.png
diff --git 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)，为我朋友创建的竞赛工具。