diff --git a/WinGreed/ResultSum.cs b/WinGreed/ResultSum.cs new file mode 100644 index 0000000..0670251 --- /dev/null +++ b/WinGreed/ResultSum.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WinGreed +{ + public class ResultSum + { + public int NumSum { get; set; } + public string StrSum { get; set; } + } +} diff --git a/WinGreed/frmPersonRound.Designer.cs b/WinGreed/frmPersonRound.Designer.cs index d1c8c06..f2dee80 100644 --- a/WinGreed/frmPersonRound.Designer.cs +++ b/WinGreed/frmPersonRound.Designer.cs @@ -45,6 +45,9 @@ this.txtTotalPoints = new System.Windows.Forms.TextBox(); this.lblRecentPoints = new System.Windows.Forms.Label(); this.btnCollect = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.txtMaxPoints = new System.Windows.Forms.TextBox(); + this.txtChosenPoints = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // label1 @@ -59,7 +62,7 @@ // // btnThrow // - this.btnThrow.Location = new System.Drawing.Point(32, 71); + this.btnThrow.Location = new System.Drawing.Point(32, 81); this.btnThrow.Name = "btnThrow"; this.btnThrow.Size = new System.Drawing.Size(96, 23); this.btnThrow.TabIndex = 1; @@ -181,7 +184,7 @@ // // txtTotalPoints // - this.txtTotalPoints.Location = new System.Drawing.Point(350, 73); + this.txtTotalPoints.Location = new System.Drawing.Point(350, 51); this.txtTotalPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtTotalPoints.Name = "txtTotalPoints"; this.txtTotalPoints.Size = new System.Drawing.Size(110, 23); @@ -191,7 +194,7 @@ // this.lblRecentPoints.AutoSize = true; this.lblRecentPoints.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lblRecentPoints.Location = new System.Drawing.Point(172, 70); + this.lblRecentPoints.Location = new System.Drawing.Point(172, 48); this.lblRecentPoints.Name = "lblRecentPoints"; this.lblRecentPoints.Size = new System.Drawing.Size(158, 21); this.lblRecentPoints.TabIndex = 12; @@ -199,7 +202,7 @@ // // btnCollect // - this.btnCollect.Location = new System.Drawing.Point(495, 71); + this.btnCollect.Location = new System.Drawing.Point(495, 49); this.btnCollect.Name = "btnCollect"; this.btnCollect.Size = new System.Drawing.Size(75, 23); this.btnCollect.TabIndex = 13; @@ -207,11 +210,40 @@ this.btnCollect.UseVisualStyleBackColor = true; this.btnCollect.Click += new System.EventHandler(this.btnCollect_Click); // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.label2.Location = new System.Drawing.Point(172, 80); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(148, 21); + this.label2.TabIndex = 14; + this.label2.Text = "Maxpoints / Chosen"; + // + // txtMaxPoints + // + this.txtMaxPoints.Location = new System.Drawing.Point(359, 82); + this.txtMaxPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtMaxPoints.Name = "txtMaxPoints"; + this.txtMaxPoints.Size = new System.Drawing.Size(48, 23); + this.txtMaxPoints.TabIndex = 15; + // + // txtChosenPoints + // + this.txtChosenPoints.Location = new System.Drawing.Point(413, 82); + this.txtChosenPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtChosenPoints.Name = "txtChosenPoints"; + this.txtChosenPoints.Size = new System.Drawing.Size(48, 23); + this.txtChosenPoints.TabIndex = 16; + // // frmPersonRound // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 618); + this.Controls.Add(this.txtChosenPoints); + this.Controls.Add(this.txtMaxPoints); + this.Controls.Add(this.label2); this.Controls.Add(this.btnCollect); this.Controls.Add(this.lblRecentPoints); this.Controls.Add(this.txtTotalPoints); @@ -252,5 +284,8 @@ private Label lblRecentPoints; private Button btnCollect; private ImageList imageList1; + private Label label2; + private TextBox txtMaxPoints; + private TextBox txtChosenPoints; } } \ No newline at end of file diff --git a/WinGreed/frmPersonRound.cs b/WinGreed/frmPersonRound.cs index 8774ea9..060422e 100644 --- a/WinGreed/frmPersonRound.cs +++ b/WinGreed/frmPersonRound.cs @@ -16,6 +16,8 @@ namespace WinGreed int y = 79; int x = 0; int row = 0; + int tempMax = 0; + int tempChsn = 0; bool maxHeatPoints = false; private List