艦娘一覧の並び順をプレイ画面の新たな並び順に準拠させる

diff --git a/KancolleSniffer/Model/ShipMaster.cs b/KancolleSniffer/Model/ShipMaster.cs
index 6611202..30096b3 100644 (file)
--- a/KancolleSniffer/Model/ShipMaster.cs
+++ b/KancolleSniffer/Model/ShipMaster.cs
@@ -38,7 +38,7 @@ namespace KancolleSniffer.Model
                 var shipSpec = _shipSpecs[(int)entry.api_id] = new ShipSpec\r
                 {\r
                     Id = (int)entry.api_id,\r
-                    SortNo = entry.api_sortno() ? (int)entry.api_sortno : 0,\r
+                    SortId = entry.api_sort_id() ? (int)entry.api_sort_id : 0,\r
                     Name = ShipName(entry),\r
                     FuelMax = entry.api_fuel_max() ? (int)entry.api_fuel_max : 0,\r
                     BullMax = entry.api_bull_max() ? (int)entry.api_bull_max : 0,\r

diff --git a/KancolleSniffer/Model/ShipSpec.cs b/KancolleSniffer/Model/ShipSpec.cs
index 98b0822..6277f26 100644 (file)
--- a/KancolleSniffer/Model/ShipSpec.cs
+++ b/KancolleSniffer/Model/ShipSpec.cs
@@ -20,7 +20,7 @@ namespace KancolleSniffer.Model
     {\r
         public int Id { get; set; }\r
         public bool IsEnemy => ShipMaster.IsEnemyId(Id);\r
-        public int SortNo { get; set; }\r
+        public int SortId { get; set; }\r
         public string Name { get; set; }\r
         public int FuelMax { get; set; }\r
         public int BullMax { get; set; }\r

diff --git a/KancolleSniffer/View/ShipListPanel.cs b/KancolleSniffer/View/ShipListPanel.cs
index 1acc87a..241d7f0 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel.cs
+++ b/KancolleSniffer/View/ShipListPanel.cs
@@ -188,8 +188,8 @@ namespace KancolleSniffer.View
                     if (_order == ListForm.SortOrder.ExpToNextDescend)\r
                         return b.ExpToNext - a.ExpToNext;\r
                 }\r
-                if (a.Spec.SortNo != b.Spec.SortNo)\r
-                    return a.Spec.SortNo - b.Spec.SortNo;\r
+                if (a.Spec.SortId != b.Spec.SortId)\r
+                    return a.Spec.SortId - b.Spec.SortId;\r
                 return a.Id - b.Id;\r
             }\r
         }\r