一覧の艦種別表示でソート無指定時の並び運を変更する

同一艦種内の並び順を艦型順に戻す

同じ艦娘の並び順をレベル降順にする

diff --git a/KancolleSniffer/View/ShipListPanel.cs b/KancolleSniffer/View/ShipListPanel.cs
index 10d29f8..42ec807 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel.cs
+++ b/KancolleSniffer/View/ShipListPanel.cs
@@ -242,7 +242,6 @@ namespace KancolleSniffer.View
                         return b.Level - a.Level;\r
                     if (_order == ListForm.SortOrder.ExpToNextDescend)\r
                         return a.Level - b.Level;\r
-                    return b.Level - a.Level;\r
                 }\r
                 if (a.ExpToNext != b.ExpToNext)\r
                 {\r
@@ -251,8 +250,20 @@ namespace KancolleSniffer.View
                     if (_order == ListForm.SortOrder.ExpToNextDescend)\r
                         return b.ExpToNext - a.ExpToNext;\r
                 }\r
-                if (a.Spec.SortId != b.Spec.SortId)\r
-                    return a.Spec.SortId - b.Spec.SortId;\r
+                if (_shipType)\r
+                {\r
+                    if (a.Spec.SortId != b.Spec.SortId)\r
+                        return a.Spec.SortId - b.Spec.SortId;\r
+                    if (a.Level != b.Level)\r
+                        return b.Level - a.Level;\r
+                }\r
+                else\r
+                {\r
+                    if (a.Level != b.Level)\r
+                        return b.Level - a.Level;\r
+                    if (a.Spec.SortId != b.Spec.SortId)\r
+                        return a.Spec.SortId - b.Spec.SortId;\r
+                }\r
                 return a.Id - b.Id;\r
             }\r
         }\r