Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Commit

Permalink
Fix bug; Add Hub mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
@B1ackSand
B1ackSand committed Oct 4, 2023
1 parent 305a1de commit 760ade4
Show file tree
Hide file tree
Showing 34 changed files with 1,374 additions and 23 deletions.
18 changes: 18 additions & 0 deletions LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions LiaoTian_Cup/Dictionary/I18n/Lang.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,10 @@
<data name="HubMode" xml:space="preserve">
<value>Hub Mode</value>
</data>
<data name="CommanderWarnUsuck" xml:space="preserve">
<value>you need to pick 2 Cmdrs. in Usuck mode</value>
</data>
<data name="CommanderWarnHub" xml:space="preserve">
<value>you need to pick 2 Cmdrs. in Hub mode</value>
</data>
</root>
6 changes: 6 additions & 0 deletions LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,10 @@
<data name="HubMode" xml:space="preserve">
<value>枢纽模式</value>
</data>
<data name="CommanderWarnUsuck" xml:space="preserve">
<value>Usuck模式需选择两名指挥官</value>
</data>
<data name="CommanderWarnHub" xml:space="preserve">
<value>Hub模式需选择两名指挥官</value>
</data>
</root>
34 changes: 13 additions & 21 deletions LiaoTian_Cup/Helper/FileData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ public class FileData
public static List<string> usuckMultiFactorInfo = new List<string>();
public static List<string> usuckFactorList = new List<string>();

//Hub
public static List<string> hubNegativeFactorInfo = new List<string>();
public static List<string> hubMultiFactorInfo = new List<string>();
public static List<string> hubFactorList = new List<string>();
public static List<string> hubBeforeCommanderInfo = new List<string>();
public static List<string> hubAfterCommanderInfo = new List<string>();

//存放地图数据
public static List<string> mapsInfo = new List<string>();

Expand All @@ -44,27 +51,6 @@ public FileData()
ReadDataBase();
}

//读取csv
//private void ReadCsv()
//{
// //初始化窗口时即拿数据
// CSVKit.Csv2Dt(Dictionary.FilePath.mutationFilePath, mutationList);
// CSVKit.Csv2Dt(Dictionary.FilePath.scoreFactorPath, scoreFactorList);
// CSVKit.Csv2Dt(Dictionary.FilePath.mutationFactorPath, mutationFactorList);
// CSVKit.Csv2Dt(Dictionary.FilePath.beforeCommanderFilePath, beforeCommanderInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.afterCommanderFilePath, afterCommanderInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.aIFilePath, botInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.baseNegativeFactorFilePath, baseNegativeFactorInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.baseMultiFactorFilePath, baseMultiFactorInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.mapsFilePath, mapsInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.negativeFactorFilePath, negativeFactorInfo);

// //USuck
// CSVKit.Csv2Dt(Dictionary.FilePath.usuckFactorPath, usuckFactorList);
// CSVKit.Csv2Dt(Dictionary.FilePath.usuckMultiPath, usuckMultiFactorInfo);
// CSVKit.Csv2Dt(Dictionary.FilePath.usuckNegativePath, usuckNegativeFactorInfo);
//}

//读取数据库
private void ReadDataBase()
{
Expand All @@ -85,6 +71,12 @@ private void ReadDataBase()
DbHelper.GetColumnData("usuck_multilist", usuckMultiFactorInfo);
DbHelper.GetColumnData("usuck_negativelist", usuckNegativeFactorInfo);

//Hub
DbHelper.GetColumnData("hub_mutatorlist", hubFactorList);
DbHelper.GetColumnData("hub_multilist", hubMultiFactorInfo);
DbHelper.GetColumnData("hub_negativelist", hubNegativeFactorInfo);
DbHelper.GetColumnData("hub_cmdroldlist", hubBeforeCommanderInfo);
DbHelper.GetColumnData("hub_cmdrnewlist", hubAfterCommanderInfo);
}
}
}
72 changes: 72 additions & 0 deletions LiaoTian_Cup/LiaoTian_Cup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,44 @@

<ItemGroup>
<None Remove="log4net.config" />
<None Remove="Resources\commander\主宰.png" />
<None Remove="Resources\commander\凯拉克斯.png" />
<None Remove="Resources\commander\凯瑞甘.png" />
<None Remove="Resources\commander\卡拉斯.png" />
<None Remove="Resources\commander\吉娜拉.png" />
<None Remove="Resources\commander\塔萨达尔.png" />
<None Remove="Resources\commander\尼雅德拉.png" />
<None Remove="Resources\commander\德哈卡.png" />
<None Remove="Resources\commander\扎加拉.png" />
<None Remove="Resources\commander\托什.png" />
<None Remove="Resources\commander\斯台特曼.png" />
<None Remove="Resources\commander\斯图科夫.png" />
<None Remove="Resources\commander\斯托科夫.png" />
<None Remove="Resources\commander\斯旺.png" />
<None Remove="Resources\commander\杰拉德.png" />
<None Remove="Resources\commander\格式塔零.png" />
<None Remove="Resources\commander\欧雷加.png" />
<None Remove="Resources\commander\汉森.png" />
<None Remove="Resources\commander\沃拉尊.png" />
<None Remove="Resources\commander\泰凯斯.png" />
<None Remove="Resources\commander\泽拉图.png" />
<None Remove="Resources\commander\瓦伦里安.png" />
<None Remove="Resources\commander\米拉.png" />
<None Remove="Resources\commander\纳法许.png" />
<None Remove="Resources\commander\自选.png" />
<None Remove="Resources\commander\菲尼克斯.png" />
<None Remove="Resources\commander\蒙斯克.png" />
<None Remove="Resources\commander\蒙斯克A.png" />
<None Remove="Resources\commander\蒙斯克B.png" />
<None Remove="Resources\commander\诺娃.png" />
<None Remove="Resources\commander\赛兰蒂斯.png" />
<None Remove="Resources\commander\阿塔尼斯.png" />
<None Remove="Resources\commander\阿巴瑟.png" />
<None Remove="Resources\commander\阿拉纳克.png" />
<None Remove="Resources\commander\阿纳拉克.png" />
<None Remove="Resources\commander\雷诺.png" />
<None Remove="Resources\database.db" />
<None Remove="Resources\factor\万钧皇权.png" />
<None Remove="Resources\factor\不给糖果就捣蛋.png" />
<None Remove="Resources\factor\丧尸大战.png" />
<None Remove="Resources\factor\乘胜追击.png" />
Expand All @@ -73,12 +87,14 @@
<None Remove="Resources\factor\圣母舰.png" />
<None Remove="Resources\factor\坚强意志.png" />
<None Remove="Resources\factor\复仇战士.png" />
<None Remove="Resources\factor\夺魂之手.png" />
<None Remove="Resources\factor\小捞油水.png" />
<None Remove="Resources\factor\岩浆爆发.png" />
<None Remove="Resources\factor\幸运红包.png" />
<None Remove="Resources\factor\废土计划.png" />
<None Remove="Resources\factor\异形寄生.png" />
<None Remove="Resources\factor\异形灾难.png" />
<None Remove="Resources\factor\异端教廷.png" />
<None Remove="Resources\factor\弥散之雾.png" />
<None Remove="Resources\factor\强磁雷场.png" />
<None Remove="Resources\factor\强行征用.png" />
Expand All @@ -105,6 +121,7 @@
<None Remove="Resources\factor\极性不定.png" />
<None Remove="Resources\factor\核弹地雷.png" />
<None Remove="Resources\factor\核弹打击.png" />
<None Remove="Resources\factor\此面向敌.png" />
<None Remove="Resources\factor\死灵之书.png" />
<None Remove="Resources\factor\混乱工作室.png" />
<None Remove="Resources\factor\激光钻机.png" />
Expand All @@ -127,6 +144,7 @@
<None Remove="Resources\factor\耐力训练.png" />
<None Remove="Resources\factor\腐败瘴气.png" />
<None Remove="Resources\factor\自毁程序.png" />
<None Remove="Resources\factor\致命伙伴.png" />
<None Remove="Resources\factor\致命勾引.png" />
<None Remove="Resources\factor\英雄祝福.png" />
<None Remove="Resources\factor\莫斯科套娃.png" />
Expand Down Expand Up @@ -197,15 +215,63 @@
<PackagePath>\</PackagePath>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Resource Include="Resources\commander\主宰.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\卡拉斯.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\吉娜拉.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\塔萨达尔.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\尼雅德拉.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\托什.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\杰拉德.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\格式塔零.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\欧雷加.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\汉森.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\瓦伦里安.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\纳法许.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\commander\赛兰蒂斯.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\万钧皇权.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\力量退变.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\夺魂之手.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\废土计划.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\异形灾难.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\异端教廷.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\怒火难平.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
Expand All @@ -218,6 +284,9 @@
<Resource Include="Resources\factor\撕裂现实.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\此面向敌.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\炽热天空.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
Expand All @@ -233,6 +302,9 @@
<Resource Include="Resources\factor\腐败瘴气.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\致命伙伴.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\factor\远古血灵.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
Expand Down
2 changes: 1 addition & 1 deletion LiaoTian_Cup/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void Button_USuck_Click(object sender, RoutedEventArgs e)

private void Button_Hub_Click(object sender, RoutedEventArgs e)
{
//this.NavigationService.Navigate(new Uri("/LiaoTian_Cup;component/Mode/HubModeWindow.xaml", UriKind.Relative));
this.NavigationService.Navigate(new Uri("/LiaoTian_Cup;component/Mode/HubModeWindow.xaml", UriKind.Relative));
}

private void AboutMeBtn(object sender, RoutedEventArgs e)
Expand Down
1 change: 1 addition & 0 deletions LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public void ResetFunc()
SetBaseFactorEnable(true);

hasSelectBase.Clear();
BaseConfirmBtn.IsEnabled = false;
ClearBaseNegativeFactor();
ClearBaseMultiFactor();
FlashSelectBase();
Expand Down
Loading

0 comments on commit 760ade4

Please sign in to comment.