From 67fd8b6e4e4d8ae4118c7f9b92274fd6529b2362 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Wed, 11 Jun 2014 21:21:36 +0900 Subject: [PATCH] =?utf8?q?=E6=88=A6=E6=9E=9C=E3=82=92=E3=83=AA=E3=82=BB?= =?utf8?q?=E3=83=83=E3=83=88=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/Achievement.cs | 5 +++ KancolleSniffer/MainForm.Designer.cs | 68 ++++++++++++++++++++++-------------- KancolleSniffer/MainForm.cs | 6 ++++ KancolleSniffer/MainForm.resx | 6 ++-- KancolleSniffer/Sniffer.cs | 5 +++ 5 files changed, 60 insertions(+), 30 deletions(-) diff --git a/KancolleSniffer/Achievement.cs b/KancolleSniffer/Achievement.cs index 033af3f..d5e3ac3 100644 --- a/KancolleSniffer/Achievement.cs +++ b/KancolleSniffer/Achievement.cs @@ -30,5 +30,10 @@ namespace KancolleSniffer if (_start == 0) _start = _current; } + + public void Reset() + { + _start = _current; + } } } \ No newline at end of file diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs index 0d3a510..32d9a91 100644 --- a/KancolleSniffer/MainForm.Designer.cs +++ b/KancolleSniffer/MainForm.Designer.cs @@ -48,13 +48,15 @@ namespace KancolleSniffer this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.panelHeadquarters = new System.Windows.Forms.Panel(); - this.labelLogin = new System.Windows.Forms.Label(); + this.labelAchievement = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); this.labelNumOfBuckets = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.labelNumOfEquips = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelNumOfShips = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.labelLogin = new System.Windows.Forms.Label(); this.panelFleet1 = new System.Windows.Forms.Panel(); this.label19 = new System.Windows.Forms.Label(); this.labelAkashiTimer = new System.Windows.Forms.Label(); @@ -176,8 +178,7 @@ namespace KancolleSniffer this.labelFleet3 = new System.Windows.Forms.Label(); this.labelCheckFleet2 = new System.Windows.Forms.Label(); this.labelFleet2 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.labelAchievement = new System.Windows.Forms.Label(); + this.labelResetAchievement = new System.Windows.Forms.Label(); this.panelHeadquarters.SuspendLayout(); this.panelFleet1.SuspendLayout(); this.panelDock.SuspendLayout(); @@ -192,6 +193,7 @@ namespace KancolleSniffer // this.panelHeadquarters.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panelHeadquarters.Controls.Add(this.labelLogin); + this.panelHeadquarters.Controls.Add(this.labelResetAchievement); this.panelHeadquarters.Controls.Add(this.labelAchievement); this.panelHeadquarters.Controls.Add(this.label28); this.panelHeadquarters.Controls.Add(this.labelNumOfBuckets); @@ -205,15 +207,23 @@ namespace KancolleSniffer this.panelHeadquarters.Size = new System.Drawing.Size(245, 35); this.panelHeadquarters.TabIndex = 0; // - // labelLogin + // labelAchievement // - this.labelLogin.AutoSize = true; - this.labelLogin.Font = new System.Drawing.Font("MS UI Gothic", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); - this.labelLogin.Location = new System.Drawing.Point(6, 4); - this.labelLogin.Name = "labelLogin"; - this.labelLogin.Size = new System.Drawing.Size(203, 26); - this.labelLogin.TabIndex = 23; - this.labelLogin.Text = "艦これにログインしてください。\r\nログイン中ならログインし直してください。"; + this.labelAchievement.Location = new System.Drawing.Point(148, 19); + this.labelAchievement.Name = "labelAchievement"; + this.labelAchievement.Size = new System.Drawing.Size(43, 12); + this.labelAchievement.TabIndex = 7; + this.labelAchievement.Text = "0.0"; + this.labelAchievement.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(162, 4); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(29, 12); + this.label28.TabIndex = 6; + this.label28.Text = "戦果"; // // labelNumOfBuckets // @@ -269,6 +279,16 @@ namespace KancolleSniffer this.label1.TabIndex = 0; this.label1.Text = "艦娘数"; // + // labelLogin + // + this.labelLogin.AutoSize = true; + this.labelLogin.Font = new System.Drawing.Font("MS UI Gothic", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.labelLogin.Location = new System.Drawing.Point(6, 4); + this.labelLogin.Name = "labelLogin"; + this.labelLogin.Size = new System.Drawing.Size(203, 26); + this.labelLogin.TabIndex = 23; + this.labelLogin.Text = "艦これにログインしてください。\r\nログイン中ならログインし直してください。"; + // // panelFleet1 // this.panelFleet1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -1411,23 +1431,16 @@ namespace KancolleSniffer this.labelFleet2.Text = "第二艦隊"; this.labelFleet2.Click += new System.EventHandler(this.labelFleet_Click); // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(162, 4); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(29, 12); - this.label28.TabIndex = 6; - this.label28.Text = "戦果"; - // - // labelAchievement + // labelResetAchievement // - this.labelAchievement.Location = new System.Drawing.Point(148, 19); - this.labelAchievement.Name = "labelAchievement"; - this.labelAchievement.Size = new System.Drawing.Size(43, 12); - this.labelAchievement.TabIndex = 7; - this.labelAchievement.Text = "0.0"; - this.labelAchievement.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.labelResetAchievement.AutoSize = true; + this.labelResetAchievement.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelResetAchievement.Location = new System.Drawing.Point(192, 16); + this.labelResetAchievement.Name = "labelResetAchievement"; + this.labelResetAchievement.Size = new System.Drawing.Size(15, 14); + this.labelResetAchievement.TabIndex = 8; + this.labelResetAchievement.Text = "↺"; + this.labelResetAchievement.Click += new System.EventHandler(this.labelResetAchievement_Click); // // MainForm // @@ -1614,6 +1627,7 @@ namespace KancolleSniffer private System.Windows.Forms.Label labelAkashiTimer; private System.Windows.Forms.Label labelAchievement; private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label labelResetAchievement; } } diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs index ea029aa..2faf5ad 100644 --- a/KancolleSniffer/MainForm.cs +++ b/KancolleSniffer/MainForm.cs @@ -349,5 +349,11 @@ namespace KancolleSniffer return; UpdateShipInfo(); } + + private void labelResetAchievement_Click(object sender, EventArgs e) + { + _sniffer.ResetAchievement(); + UpdateItemInfo(); + } } } \ No newline at end of file diff --git a/KancolleSniffer/MainForm.resx b/KancolleSniffer/MainForm.resx index 6e2bb03..94714ed 100644 --- a/KancolleSniffer/MainForm.resx +++ b/KancolleSniffer/MainForm.resx @@ -689,7 +689,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ - CwAAAk1TRnQBSQFMAgEBBQEAARABAAEQAQABDgEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAASABAAEgAQABDgEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABOAMAAR4DAAEBAQABCAUAAZABBhgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -747,7 +747,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - CwAAAk1TRnQBSQFMAgEBBQEAARABAAEQAQABDgEAAQ4BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAASABAAEgAQABDgEAAQ4BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABOAMAARwDAAEBAQABCAUAASABBhgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -805,7 +805,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm - BwAAAk1TRnQBSQFMAwEBAAFIAQABSAEAAQcBAAEPAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + BwAAAk1TRnQBSQFMAwEBAAFYAQABWAEAAQcBAAEPAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA ARwDAAEPAwABAQEAAQgFAAGkAQEYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs index 1a02a15..3ebcd57 100644 --- a/KancolleSniffer/Sniffer.cs +++ b/KancolleSniffer/Sniffer.cs @@ -220,6 +220,11 @@ namespace KancolleSniffer } public double Achievement { get { return _achievement.Value; } } + + public void ResetAchievement() + { + _achievement.Reset(); + } } public class NameAndTimer -- 2.11.0