diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs index 143351f..58ac5ff 100644 --- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs +++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs @@ -88,7 +88,7 @@ public static string BackMenuBtn { } /// - /// 查找类似 Right click to ban a mutator 的本地化字符串。 + /// 查找类似 Right click to ban 的本地化字符串。 /// public static string BanTip { get { @@ -115,7 +115,7 @@ public static string BaseMutatorsWarn { } /// - /// 查找类似 Brave mode 的本地化字符串。 + /// 查找类似 Vincent's Game 的本地化字符串。 /// public static string BraveMode { get { @@ -312,6 +312,15 @@ public static string HubMode { } } + /// + /// 查找类似 Nexus solo mode 的本地化字符串。 + /// + public static string HubSoloMode { + get { + return ResourceManager.GetString("HubSoloMode", resourceCulture); + } + } + /// /// 查找类似 中文(简体) 的本地化字符串。 /// @@ -870,6 +879,15 @@ public static string 重返亡灵之城 { } } + /// + /// 查找类似 Real Steel 的本地化字符串。 + /// + public static string 铁甲钢拳 { + get { + return ResourceManager.GetString("铁甲钢拳", resourceCulture); + } + } + /// /// 查找类似 Siege of Storms 的本地化字符串。 /// diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx index 4e1db9e..8f65e95 100644 --- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx +++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx @@ -289,7 +289,7 @@ RandMap: - Right click to ban a mutator + Right click to ban Banned mutators: @@ -370,7 +370,7 @@ 6 mutators mode - Brave mode + Vincent's Game Tarsonis @@ -393,4 +393,10 @@ 6 mutators mode will need you pick 4 free choice mutators + + Nexus solo mode + + + Real Steel + \ 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 8756900..ca80d22 100644 --- a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx +++ b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx @@ -130,7 +130,7 @@ 正常单刷模式 - 关于 + 关于我 选手名称: @@ -393,4 +393,10 @@ 6因子模式需要至少自选4个因子 + + 枢纽单刷模式 + + + 铁甲钢拳 + \ No newline at end of file diff --git a/LiaoTian_Cup/Helper/DbHelper.cs b/LiaoTian_Cup/Helper/DbHelper.cs index c88e83e..a47e4c5 100644 --- a/LiaoTian_Cup/Helper/DbHelper.cs +++ b/LiaoTian_Cup/Helper/DbHelper.cs @@ -49,4 +49,28 @@ public static List GetListData(string tableName,int columnCount, List< connection.Close(); return list; } + + public static List GetCostListData(string tableName, int columnCount, List list) + { + using var connection = new SqliteConnection("Data Source=./Resources/database.db"); + connection.Open(); + + var command = connection.CreateCommand(); + command.CommandText = $"SELECT * FROM {tableName} ORDER BY \"group\" DESC"; + + using (var reader = command.ExecuteReader()) + { + while (reader.Read()) + { + string[] rowStrings = new string[columnCount]; + for (int i = 0; i < columnCount; i++) + { + rowStrings[i] = Convert.ToString(reader[i]); + } + list.Add(rowStrings); + } + } + connection.Close(); + return list; + } } \ No newline at end of file diff --git a/LiaoTian_Cup/Helper/FileData.cs b/LiaoTian_Cup/Helper/FileData.cs index 23a1b31..5652790 100644 --- a/LiaoTian_Cup/Helper/FileData.cs +++ b/LiaoTian_Cup/Helper/FileData.cs @@ -40,11 +40,13 @@ public class FileData public static List hubNegativeFactorInfo = new List(); public static List hubMultiFactorInfo = new List(); public static List hubFactorList = new List(); + public static List hubFactorCostList = new List(); public static List hubBeforeCommanderInfo = new List(); public static List hubAfterCommanderInfo = new List(); - public static List braveMapsInfo = new List(); //存放地图数据 + public static List hubMapsInfo = new List(); + public static List braveMapsInfo = new List(); public static List mapsInfo = new List(); public FileData() @@ -56,7 +58,9 @@ public FileData() private void ReadDataBase() { DbHelper.GetListData("global_weeklymutations", 5, mutationList); - DbHelper.GetListData("group_MutatorList_Cost", 3, scoreFactorList); + DbHelper.GetCostListData("group_MutatorList_Cost", 3, scoreFactorList); + DbHelper.GetCostListData("hub_MutatorList_Cost", 3, hubFactorCostList); + DbHelper.GetColumnData("global_mutatorlist", mutationFactorList); DbHelper.GetColumnData("global_cmdroldlist", beforeCommanderInfo); @@ -79,6 +83,7 @@ private void ReadDataBase() DbHelper.GetColumnData("hub_cmdroldlist", hubBeforeCommanderInfo); DbHelper.GetColumnData("hub_cmdrnewlist", hubAfterCommanderInfo); DbHelper.GetColumnData("hub_bravemap", braveMapsInfo); + DbHelper.GetColumnData("hub_splmaplist", hubMapsInfo); } } } diff --git a/LiaoTian_Cup/LiaoTian_Cup.csproj b/LiaoTian_Cup/LiaoTian_Cup.csproj index 92934b3..98ed956 100644 --- a/LiaoTian_Cup/LiaoTian_Cup.csproj +++ b/LiaoTian_Cup/LiaoTian_Cup.csproj @@ -67,6 +67,7 @@ + @@ -109,6 +110,7 @@ + @@ -195,6 +197,7 @@ + @@ -260,6 +263,9 @@ Always + + Always + Always @@ -290,6 +296,9 @@ Always + + Always + Always @@ -693,6 +702,9 @@ Always + + Always + Always diff --git a/LiaoTian_Cup/MainPage.xaml b/LiaoTian_Cup/MainPage.xaml index 3ee5599..ec26a48 100644 --- a/LiaoTian_Cup/MainPage.xaml +++ b/LiaoTian_Cup/MainPage.xaml @@ -17,51 +17,76 @@ - + + + + + + - + - -