艦載機の熟練度を表示する

diff --git a/KancolleSniffer/EquipPanel.cs b/KancolleSniffer/EquipPanel.cs
index 3ddc4e0..4530eca 100644 (file)
--- a/KancolleSniffer/EquipPanel.cs
+++ b/KancolleSniffer/EquipPanel.cs
@@ -81,7 +81,9 @@ namespace KancolleSniffer
                             drum++;\r
                         equips.Add(new EquipColumn\r
                         {\r
-                            Equip = item.Spec.Name + (item.Level == 0 ? "" : "★" + item.Level) +\r
+                            Equip = item.Spec.Name +\r
+                                    (item.Alv == 0 ? "" : "+" + item.Alv) +\r
+                                    (item.Level == 0 ? "" : "★" + item.Level) +\r
                                     (!item.Spec.IsAircraft ? "" : " " + onslot + "/" + max),\r
                             Color = item.Spec.Color\r
                         });\r
@@ -103,7 +105,7 @@ namespace KancolleSniffer
                 list.Add(new EquipColumn\r
                 {\r
                     Fleet = fn[f] + (levelTotal == 0 ? "" : " 合計Lv" + levelTotal) +\r
-                        (drumTotal == 0 ? "" : " ドラム缶" + drumTotal + "(" + drumShips + "隻)")\r
+                            (drumTotal == 0 ? "" : " ドラム缶" + drumTotal + "(" + drumShips + "隻)")\r
                 });\r
                 list.AddRange(ships);\r
             }\r

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index 1d7beb5..57a4a4f 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -185,6 +185,7 @@ namespace KancolleSniffer
     {\r
         public ItemSpec Spec { get; set; }\r
         public int Level { get; set; }\r
+        public int Alv { get; set; }\r
         public ShipStatus Ship { get; set; }\r
 \r
         public ItemStatus()\r
@@ -309,7 +310,8 @@ namespace KancolleSniffer
                 _itemInfo[(int)entry.api_id] = new ItemStatus\r
                 {\r
                     Spec = _itemSpecs[(int)entry.api_slotitem_id],\r
-                    Level = entry.api_level() ? (int)entry.api_level : 0\r
+                    Level = entry.api_level() ? (int)entry.api_level : 0,\r
+                    Alv = entry.api_alv() ? (int)entry.api_alv : 0\r
                 };\r
             }\r
             NowEquips = _itemInfo.Count - 1;\r

diff --git a/KancolleSniffer/ItemTreeView.cs b/KancolleSniffer/ItemTreeView.cs
index ed360bf..f652117 100644 (file)
--- a/KancolleSniffer/ItemTreeView.cs
+++ b/KancolleSniffer/ItemTreeView.cs
@@ -41,8 +41,8 @@ namespace KancolleSniffer
             var grouped = from byId in\r
                 (from item in itemList\r
                     where item.Spec.Id != -1\r
-                    orderby item.Spec.Type, item.Spec.Id, item.Level descending, item.Ship.Spec.Id\r
-                    group item by new {item.Spec.Id, item.Level})\r
+                    orderby item.Spec.Type, item.Spec.Id, item.Alv, item.Level descending, item.Ship.Spec.Id\r
+                    group item by new {item.Spec.Id, item.Alv, item.Level})\r
                 group byId by byId.First().Spec.Type;\r
             var root = new TreeNode();\r
             foreach (var byType in grouped)\r
@@ -55,7 +55,9 @@ namespace KancolleSniffer
                 {\r
                     var item = byItem.First();\r
                     var itemNode = new TreeNode();\r
-                    itemNode.Name = itemNode.Text = item.Spec.Name + (item.Level == 0 ? "" : "★" + item.Level);\r
+                    itemNode.Name = itemNode.Text = item.Spec.Name +\r
+                                                    (item.Alv == 0 ? "" : "+" + item.Alv) +\r
+                                                    (item.Level == 0 ? "" : "★" + item.Level);\r
                     typeNode.Nodes.Add(itemNode);\r
 \r
                     var shipGroup = (from i in byItem group i.Ship by i.Ship.Id).ToArray();\r