任務の詳細をツールチップで表示する

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index cfa68a8..12122f9 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -116,7 +116,7 @@ namespace KancolleSniffer.Test
             questInfo.InspectQuestList(Js(new\r
             {\r
                 api_list = new[]\r
-                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}}\r
+                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}}\r
             }));\r
             questInfo.SaveState(status);\r
             PAssert.That(() =>\r
@@ -125,7 +125,7 @@ namespace KancolleSniffer.Test
             questInfo.InspectQuestList(Js(new\r
             {\r
                 api_list = new[]\r
-                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}}\r
+                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}}\r
             }));\r
             questInfo.SaveState(status);\r
             PAssert.That(() =>\r
@@ -134,7 +134,7 @@ namespace KancolleSniffer.Test
             questInfo.InspectQuestList(Js(new\r
             {\r
                 api_list = new[]\r
-                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}}\r
+                    {new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}}\r
             }));\r
             questInfo.SaveState(status);\r
             PAssert.That(() => status.QuestCountList.Length == 0); // クォータリーが消える\r
@@ -156,10 +156,10 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 210, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 214, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 216, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 201, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 210, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 214, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 216, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -221,12 +221,12 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 211, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 212, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 213, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 218, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 220, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 221, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 211, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 212, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 213, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 218, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 220, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 221, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
             // 補給艦1隻と空母2隻\r
@@ -262,8 +262,8 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 228, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 230, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 228, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 230, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
             // 潜水艦3\r
@@ -293,7 +293,7 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 226, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 226, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -340,7 +340,7 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 243, api_category = 2, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 243, api_category = 2, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -379,8 +379,8 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 822, api_category = 8, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 854, api_category = 8, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 822, api_category = 8, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 854, api_category = 8, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -439,10 +439,10 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 302, api_category = 3, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 303, api_category = 3, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 304, api_category = 3, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 311, api_category = 3, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 302, api_category = 3, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 303, api_category = 3, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 304, api_category = 3, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 311, api_category = 3, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -472,11 +472,11 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 402, api_category = 4, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 403, api_category = 4, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 404, api_category = 4, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 410, api_category = 4, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 411, api_category = 4, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 402, api_category = 4, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 403, api_category = 4, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 404, api_category = 4, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 410, api_category = 4, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 411, api_category = 4, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -511,8 +511,8 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 503, api_category = 5, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 504, api_category = 5, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 503, api_category = 5, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 504, api_category = 5, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -539,12 +539,12 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 605, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 606, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 607, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 608, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 609, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 619, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 605, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 606, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 607, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 608, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 609, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 619, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
 \r
@@ -593,13 +593,13 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 613, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 638, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 673, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 674, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 675, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 676, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 677, api_category = 6, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 613, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 638, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 673, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 674, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 675, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 676, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 677, api_category = 6, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
             questInfo.InspectDestroyItem("api%5Fslotitem%5Fids=1%2C2%2C3%2C4%2C5%2C6%2C7%2C8%2C9&api%5Fverno=1", null);\r
@@ -630,8 +630,8 @@ namespace KancolleSniffer.Test
             {\r
                 api_list = new[]\r
                 {\r
-                    new {api_no = 702, api_category = 7, api_state = 2, api_title = "", api_progress_flag = 0},\r
-                    new {api_no = 703, api_category = 7, api_state = 2, api_title = "", api_progress_flag = 0}\r
+                    new {api_no = 702, api_category = 7, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0},\r
+                    new {api_no = 703, api_category = 7, api_state = 2, api_title = "", api_detail = "", api_progress_flag = 0}\r
                 }\r
             }));\r
             questInfo.InspectPowerup(Js(new {api_powerup_flag = 1}));\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 4b47ed1..bc4606a 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -939,6 +939,7 @@ namespace KancolleSniffer
                     category[i].BackColor = quests[i].Color;\r
                     name[i].Text = quests[i].Name;\r
                     progress[i].Text = $"{quests[i].Progress:D}%";\r
+                    _toolTip.SetToolTip(name[i], quests[i].Detail);\r
                     var c = quests[i].Count;\r
                     if (c.Id == 0)\r
                     {\r

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index 5bca332..81838d8 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -27,12 +27,12 @@ namespace KancolleSniffer
         public int Id { get; set; }\r
         public int Category { get; set; }\r
         public string Name { get; set; }\r
+        public string Detail { get; set; }\r
+        public int Progress { get; set; }\r
 \r
         [XmlIgnore]\r
         public QuestCount Count { get; set; }\r
 \r
-        public int Progress { get; set; }\r
-\r
         [XmlIgnore]\r
         public Color Color { get; set; }\r
     }\r
@@ -348,6 +348,7 @@ namespace KancolleSniffer
                     var progress = (int)entry.api_progress_flag;\r
                     var cat = (int)entry.api_category;\r
                     var name = (string)entry.api_title;\r
+                    var detail = ((string)entry.api_detail).Replace("<br>", "\r\n");\r
 \r
                     switch (progress)\r
                     {\r
@@ -370,7 +371,7 @@ namespace KancolleSniffer
                             progress = 100;\r
                             goto case 2;\r
                         case 2:\r
-                            AddQuest(id, cat, name, progress, true);\r
+                            AddQuest(id, cat, name, detail, progress, true);\r
                             break;\r
                     }\r
                 }\r
@@ -384,7 +385,7 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void AddQuest(int id, int category, string name, int progress, bool adjustCount)\r
+        private void AddQuest(int id, int category, string name, string detail, int progress, bool adjustCount)\r
         {\r
             var count = _countList.GetCount(id);\r
             if (adjustCount)\r
@@ -394,6 +395,7 @@ namespace KancolleSniffer
                 Id = id,\r
                 Category = category,\r
                 Name = name,\r
+                Detail = detail,\r
                 Count = count,\r
                 Progress = progress,\r
                 Color = category <= _color.Length ? _color[category - 1] : Control.DefaultBackColor\r
@@ -674,7 +676,7 @@ namespace KancolleSniffer
             {\r
                 _quests.Clear();\r
                 foreach (var q in status.QuestList)\r
-                    AddQuest(q.Id, q.Category, q.Name, q.Progress, false);\r
+                    AddQuest(q.Id, q.Category, q.Name, q.Detail, q.Progress, false);\r
             }\r
         }\r
     }\r