受領中の任務を6つ表示可能にする

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 26b8b72..61ea906 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -107,6 +107,8 @@ namespace KancolleSniffer
             this.label13 = new System.Windows.Forms.Label();\r
             this.timerMain = new System.Windows.Forms.Timer(this.components);\r
             this.panel3 = new System.Windows.Forms.Panel();\r
+            this.labelProgress6 = new System.Windows.Forms.Label();\r
+            this.labelQuest6 = new System.Windows.Forms.Label();\r
             this.labelProgress5 = new System.Windows.Forms.Label();\r
             this.labelProgress4 = new System.Windows.Forms.Label();\r
             this.labelProgress3 = new System.Windows.Forms.Label();\r
@@ -729,6 +731,8 @@ namespace KancolleSniffer
             // panel3\r
             // \r
             this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.panel3.Controls.Add(this.labelProgress6);\r
+            this.panel3.Controls.Add(this.labelQuest6);\r
             this.panel3.Controls.Add(this.labelProgress5);\r
             this.panel3.Controls.Add(this.labelProgress4);\r
             this.panel3.Controls.Add(this.labelProgress3);\r
@@ -741,9 +745,24 @@ namespace KancolleSniffer
             this.panel3.Controls.Add(this.labelQuest1);\r
             this.panel3.Location = new System.Drawing.Point(6, 356);\r
             this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(220, 79);\r
+            this.panel3.Size = new System.Drawing.Size(220, 94);\r
             this.panel3.TabIndex = 13;\r
             // \r
+            // labelProgress6\r
+            // \r
+            this.labelProgress6.Location = new System.Drawing.Point(194, 78);\r
+            this.labelProgress6.Name = "labelProgress6";\r
+            this.labelProgress6.Size = new System.Drawing.Size(23, 12);\r
+            this.labelProgress6.TabIndex = 11;\r
+            this.labelProgress6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelQuest6\r
+            // \r
+            this.labelQuest6.Location = new System.Drawing.Point(2, 78);\r
+            this.labelQuest6.Name = "labelQuest6";\r
+            this.labelQuest6.Size = new System.Drawing.Size(198, 12);\r
+            this.labelQuest6.TabIndex = 10;\r
+            // \r
             // labelProgress5\r
             // \r
             this.labelProgress5.Location = new System.Drawing.Point(194, 63);\r
@@ -1133,7 +1152,7 @@ namespace KancolleSniffer
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(232, 441);\r
+            this.ClientSize = new System.Drawing.Size(232, 456);\r
             this.ContextMenuStrip = this.contextMenuStripMain;\r
             this.Controls.Add(this.panelMaterialHistory);\r
             this.Controls.Add(this.labelBucketHistory);\r
@@ -1305,6 +1324,8 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelFuelSq4;\r
         private System.Windows.Forms.ToolStripMenuItem LogToolStripMenuItem;\r
         private System.Windows.Forms.ToolTip toolTipAchievement;\r
+        private System.Windows.Forms.Label labelProgress6;\r
+        private System.Windows.Forms.Label labelQuest6;\r
     }\r
 }\r
 \r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index a70e280..e656215 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -556,8 +556,8 @@ namespace KancolleSniffer
 \r
         private void UpdateQuestList()\r
         {\r
-            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5};\r
-            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5};\r
+            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};\r
+            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
 \r
             for (var i = 0; i < name.Length; i++)\r
             {\r

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index c5a9ea5..7d25f99 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -25,7 +25,8 @@ namespace KancolleSniffer
     {\r
         private DateTime _lastCreared;\r
         private readonly SortedDictionary<int, NameAndProgress> _quests = new SortedDictionary<int, NameAndProgress>();\r
-        private const int QuestCount = 5;\r
+\r
+        public int QuestCount { get; set; }\r
 \r
         public void Inspect(dynamic json)\r
         {\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 50b6f96..6e2e5cd 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -104,6 +104,8 @@ namespace KancolleSniffer
                 _dockInfo.InspectNDock(data.api_ndock);\r
                 _akashiTimer.SetTimer(true);\r
                 _achievement.InspectBasic(data.api_basic);\r
+                if (data.api_parallel_quest_count()) // 昔のログにはないので\r
+                    _questInfo.QuestCount = (int)data.api_parallel_quest_count;\r
                 _battleInfo.InBattle = false;\r
                 _battleInfo.HasDamagedShip = false;\r
                 _shipInfo.ClearEscapedShips();\r