diff --git a/.vs/FloatToolGUI/v16/.suo b/.vs/FloatToolGUI/v16/.suo
index 609086d..e29846c 100644
Binary files a/.vs/FloatToolGUI/v16/.suo and b/.vs/FloatToolGUI/v16/.suo differ
diff --git a/FloatToolGUI/About.Designer.cs b/FloatToolGUI/About.Designer.cs
index 2458970..5d0fd73 100644
--- a/FloatToolGUI/About.Designer.cs
+++ b/FloatToolGUI/About.Designer.cs
@@ -73,9 +73,9 @@ private void InitializeComponent()
this.label2.ForeColor = System.Drawing.Color.White;
this.label2.Location = new System.Drawing.Point(52, 56);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(135, 21);
+ this.label2.Size = new System.Drawing.Size(132, 21);
this.label2.TabIndex = 2;
- this.label2.Text = "Версия 0.3.3 GUI";
+ this.label2.Text = "Версия 0.4.1 GUI";
//
// label3
//
diff --git a/FloatToolGUI/FloatToolGUI.csproj b/FloatToolGUI/FloatToolGUI.csproj
index 78a62cc..b5bd4fa 100644
--- a/FloatToolGUI/FloatToolGUI.csproj
+++ b/FloatToolGUI/FloatToolGUI.csproj
@@ -9,6 +9,7 @@
FloatToolGUI
FloatTool GUI
v4.7.2
+ 8.0
512
true
true
@@ -39,7 +40,7 @@
4
- AnyCPU
+ x64
pdbonly
true
bin\Release\
@@ -53,6 +54,28 @@
sketch-1586878181293.ico
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
..\packages\DiscordRichPresence.1.0.150\lib\net35\DiscordRPC.dll
diff --git a/FloatToolGUI/Main.Designer.cs b/FloatToolGUI/Main.Designer.cs
index 54c1348..0cfce15 100644
--- a/FloatToolGUI/Main.Designer.cs
+++ b/FloatToolGUI/Main.Designer.cs
@@ -1,4 +1,6 @@
-namespace FloatToolGUI
+using System.Threading;
+
+namespace FloatToolGUI
{
partial class FloatTool
{
@@ -25,6 +27,13 @@ protected override void Dispose(bool disposing)
{
thread1.Abort();
}
+ foreach (Thread t in t2)
+ {
+ if (t.IsAlive)
+ {
+ t.Abort();
+ }
+ }
if (!base.IsDisposed) {
base.Dispose(disposing);
}
@@ -53,7 +62,9 @@ private void InitializeComponent()
this.button10 = new System.Windows.Forms.Button();
this.button9 = new System.Windows.Forms.Button();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+ this.button7 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
@@ -75,20 +86,23 @@ private void InitializeComponent()
this.textBox1 = new System.Windows.Forms.TextBox();
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.panel5 = new System.Windows.Forms.Panel();
+ this.panel16 = new System.Windows.Forms.Panel();
+ this.label5 = new System.Windows.Forms.Label();
+ this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.panel14 = new System.Windows.Forms.Panel();
+ this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
this.checkBox3 = new System.Windows.Forms.CheckBox();
+ this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
+ this.textBox3 = new System.Windows.Forms.TextBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
this.button2 = new System.Windows.Forms.Button();
- this.textBox3 = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
- this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+ this.panel15 = new System.Windows.Forms.Panel();
+ this.label10 = new System.Windows.Forms.Label();
+ this.numericUpDown3 = new System.Windows.Forms.NumericUpDown();
+ this.checkBox4 = new System.Windows.Forms.CheckBox();
this.panel2 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
- this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
- this.button7 = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel8.SuspendLayout();
this.panel13.SuspendLayout();
@@ -99,9 +113,12 @@ private void InitializeComponent()
this.panel3.SuspendLayout();
this.panel6.SuspendLayout();
this.panel5.SuspendLayout();
+ this.panel16.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.panel14.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+ this.panel15.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
this.panel2.SuspendLayout();
this.panel4.SuspendLayout();
this.SuspendLayout();
@@ -187,11 +204,11 @@ private void InitializeComponent()
//
// button10
//
+ resources.ApplyResources(this.button10, "button10");
this.button10.BackColor = System.Drawing.Color.Transparent;
this.button10.FlatAppearance.BorderSize = 0;
this.button10.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.button10.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Black;
- resources.ApplyResources(this.button10, "button10");
this.button10.ForeColor = System.Drawing.Color.White;
this.button10.Name = "button10";
this.button10.UseVisualStyleBackColor = false;
@@ -218,12 +235,32 @@ private void InitializeComponent()
this.contextMenuStrip1.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
//
+ // toolStripMenuItem2
+ //
+ this.toolStripMenuItem2.Image = global::FloatToolGUI.Properties.Resources.github;
+ this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+ resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2");
+ this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+ //
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
resources.ApplyResources(this.toolStripMenuItem3, "toolStripMenuItem3");
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
+ // button7
+ //
+ this.button7.BackColor = System.Drawing.Color.Transparent;
+ this.button7.FlatAppearance.BorderSize = 0;
+ this.button7.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
+ this.button7.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Black;
+ resources.ApplyResources(this.button7, "button7");
+ this.button7.ForeColor = System.Drawing.Color.White;
+ this.button7.Image = global::FloatToolGUI.Properties.Resources.unmutedWhite;
+ this.button7.Name = "button7";
+ this.button7.UseVisualStyleBackColor = false;
+ this.button7.Click += new System.EventHandler(this.button7_Click);
+ //
// button6
//
resources.ApplyResources(this.button6, "button6");
@@ -448,19 +485,51 @@ private void InitializeComponent()
// panel5
//
this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44)))));
- this.panel5.Controls.Add(this.panel14);
- this.panel5.Controls.Add(this.checkBox3);
- this.panel5.Controls.Add(this.label6);
- this.panel5.Controls.Add(this.checkBox2);
- this.panel5.Controls.Add(this.button2);
- this.panel5.Controls.Add(this.textBox3);
- this.panel5.Controls.Add(this.label7);
- this.panel5.Controls.Add(this.label5);
- this.panel5.Controls.Add(this.numericUpDown2);
- this.panel5.Controls.Add(this.numericUpDown1);
+ this.panel5.Controls.Add(this.panel16);
+ this.panel5.Controls.Add(this.panel15);
resources.ApplyResources(this.panel5, "panel5");
this.panel5.Name = "panel5";
//
+ // panel16
+ //
+ this.panel16.BackColor = System.Drawing.Color.Transparent;
+ this.panel16.Controls.Add(this.label5);
+ this.panel16.Controls.Add(this.numericUpDown1);
+ this.panel16.Controls.Add(this.panel14);
+ this.panel16.Controls.Add(this.numericUpDown2);
+ this.panel16.Controls.Add(this.checkBox3);
+ this.panel16.Controls.Add(this.label7);
+ this.panel16.Controls.Add(this.label6);
+ this.panel16.Controls.Add(this.textBox3);
+ this.panel16.Controls.Add(this.checkBox2);
+ this.panel16.Controls.Add(this.button2);
+ resources.ApplyResources(this.panel16, "panel16");
+ this.panel16.Name = "panel16";
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.ForeColor = System.Drawing.Color.White;
+ this.label5.Name = "label5";
+ //
+ // numericUpDown1
+ //
+ resources.ApplyResources(this.numericUpDown1, "numericUpDown1");
+ this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.numericUpDown1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
+ this.numericUpDown1.Minimum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.numericUpDown1.Name = "numericUpDown1";
+ this.numericUpDown1.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
// panel14
//
resources.ApplyResources(this.panel14, "panel14");
@@ -469,6 +538,24 @@ private void InitializeComponent()
this.panel14.Name = "panel14";
this.panel14.Paint += new System.Windows.Forms.PaintEventHandler(this.panel14_Paint);
//
+ // numericUpDown2
+ //
+ resources.ApplyResources(this.numericUpDown2, "numericUpDown2");
+ this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.numericUpDown2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
+ this.numericUpDown2.Maximum = new decimal(new int[] {
+ 9999999,
+ 0,
+ 0,
+ 0});
+ this.numericUpDown2.Name = "numericUpDown2";
+ this.numericUpDown2.Value = new decimal(new int[] {
+ 20,
+ 0,
+ 0,
+ 0});
+ //
// checkBox3
//
resources.ApplyResources(this.checkBox3, "checkBox3");
@@ -476,12 +563,26 @@ private void InitializeComponent()
this.checkBox3.Name = "checkBox3";
this.checkBox3.UseVisualStyleBackColor = true;
//
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.ForeColor = System.Drawing.Color.White;
+ this.label7.Name = "label7";
+ //
// label6
//
resources.ApplyResources(this.label6, "label6");
this.label6.ForeColor = System.Drawing.Color.White;
this.label6.Name = "label6";
//
+ // textBox3
+ //
+ resources.ApplyResources(this.textBox3, "textBox3");
+ this.textBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.textBox3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
+ this.textBox3.Name = "textBox3";
+ //
// checkBox2
//
resources.ApplyResources(this.checkBox2, "checkBox2");
@@ -501,61 +602,46 @@ private void InitializeComponent()
this.button2.UseVisualStyleBackColor = false;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
- // textBox3
+ // panel15
//
- resources.ApplyResources(this.textBox3, "textBox3");
- this.textBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
- this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.textBox3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
- this.textBox3.Name = "textBox3";
- //
- // label7
- //
- resources.ApplyResources(this.label7, "label7");
- this.label7.ForeColor = System.Drawing.Color.White;
- this.label7.Name = "label7";
+ this.panel15.BackColor = System.Drawing.Color.Transparent;
+ this.panel15.Controls.Add(this.label10);
+ this.panel15.Controls.Add(this.numericUpDown3);
+ this.panel15.Controls.Add(this.checkBox4);
+ resources.ApplyResources(this.panel15, "panel15");
+ this.panel15.Name = "panel15";
//
- // label5
+ // label10
//
- resources.ApplyResources(this.label5, "label5");
- this.label5.ForeColor = System.Drawing.Color.White;
- this.label5.Name = "label5";
+ resources.ApplyResources(this.label10, "label10");
+ this.label10.ForeColor = System.Drawing.Color.White;
+ this.label10.Name = "label10";
//
- // numericUpDown2
+ // numericUpDown3
//
- resources.ApplyResources(this.numericUpDown2, "numericUpDown2");
- this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
- this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.numericUpDown2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
- this.numericUpDown2.Maximum = new decimal(new int[] {
- 9999999,
+ this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+ this.numericUpDown3.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ resources.ApplyResources(this.numericUpDown3, "numericUpDown3");
+ this.numericUpDown3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
+ this.numericUpDown3.Minimum = new decimal(new int[] {
+ 2,
0,
0,
0});
- this.numericUpDown2.Name = "numericUpDown2";
- this.numericUpDown2.Value = new decimal(new int[] {
- 20,
+ this.numericUpDown3.Name = "numericUpDown3";
+ this.numericUpDown3.Value = new decimal(new int[] {
+ 2,
0,
0,
0});
//
- // numericUpDown1
+ // checkBox4
//
- resources.ApplyResources(this.numericUpDown1, "numericUpDown1");
- this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
- this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.numericUpDown1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150)))));
- this.numericUpDown1.Minimum = new decimal(new int[] {
- 10,
- 0,
- 0,
- 0});
- this.numericUpDown1.Name = "numericUpDown1";
- this.numericUpDown1.Value = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
+ resources.ApplyResources(this.checkBox4, "checkBox4");
+ this.checkBox4.ForeColor = System.Drawing.Color.White;
+ this.checkBox4.Name = "checkBox4";
+ this.checkBox4.UseVisualStyleBackColor = true;
+ this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged);
//
// panel2
//
@@ -571,26 +657,6 @@ private void InitializeComponent()
resources.ApplyResources(this.panel4, "panel4");
this.panel4.Name = "panel4";
//
- // toolStripMenuItem2
- //
- this.toolStripMenuItem2.Image = global::FloatToolGUI.Properties.Resources.github;
- this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2");
- this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
- //
- // button7
- //
- this.button7.BackColor = System.Drawing.Color.Transparent;
- this.button7.FlatAppearance.BorderSize = 0;
- this.button7.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
- this.button7.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Black;
- resources.ApplyResources(this.button7, "button7");
- this.button7.ForeColor = System.Drawing.Color.White;
- this.button7.Image = global::FloatToolGUI.Properties.Resources.unmutedWhite;
- this.button7.Name = "button7";
- this.button7.UseVisualStyleBackColor = false;
- this.button7.Click += new System.EventHandler(this.button7_Click);
- //
// FloatTool
//
resources.ApplyResources(this, "$this");
@@ -615,10 +681,14 @@ private void InitializeComponent()
this.panel6.ResumeLayout(false);
this.panel6.PerformLayout();
this.panel5.ResumeLayout(false);
- this.panel5.PerformLayout();
+ this.panel16.ResumeLayout(false);
+ this.panel16.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.panel14.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+ this.panel15.ResumeLayout(false);
+ this.panel15.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit();
this.panel2.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.ResumeLayout(false);
@@ -675,6 +745,11 @@ private void InitializeComponent()
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Panel panel14;
private System.Windows.Forms.Button button10;
+ private System.Windows.Forms.Panel panel16;
+ private System.Windows.Forms.Panel panel15;
+ private System.Windows.Forms.CheckBox checkBox4;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.NumericUpDown numericUpDown3;
}
}
diff --git a/FloatToolGUI/Main.cs b/FloatToolGUI/Main.cs
index 6b8bafc..4acb64e 100644
--- a/FloatToolGUI/Main.cs
+++ b/FloatToolGUI/Main.cs
@@ -1,6 +1,7 @@
using DiscordRPC;
using Newtonsoft.Json;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -89,7 +90,7 @@ static public string craftF(string[] ingridients, float minFloat, float maxFloat
avgFloat += Convert.ToSingle(f);
}
avgFloat /= 10;
- return setprecission(((maxFloat - minFloat) * avgFloat) + minFloat, 9);
+ return setprecission(((maxFloat - minFloat) * avgFloat) + minFloat, 10);
}
static public string getNextRarity(string rarity)
{
@@ -339,6 +340,63 @@ private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
updateSearchStr();
}
+ private static bool NextCombination(IList num, int n, int k)
+ {
+ bool finished;
+
+ var changed = finished = false;
+
+ if (k <= 0) return false;
+
+ for (var i = k - 1; !finished && !changed; i--)
+ {
+ if (num[i] < n - 1 - (k - 1) + i)
+ {
+ num[i]++;
+
+ if (i < k - 1)
+ for (var j = i + 1; j < k; j++)
+ num[j] = num[j - 1] + 1;
+ changed = true;
+ }
+ finished = i == 0;
+ }
+
+ return changed;
+ }
+
+ private static IEnumerable Combinations(IEnumerable elements, int k, int start, int skip)
+ {
+ var elem = elements.ToArray();
+ var size = elem.Length;
+
+ if (k > size) yield break;
+
+ var numbers = new int[k];
+
+ for (var i = 0; i < k; i++)
+ numbers[i] = i;
+
+ int step = 0;
+
+ do
+ {
+ if((step+start)%skip == 0)
+ {
+ yield return numbers.Select(n => elem[n]);
+ }
+ step++;
+ } while (NextCombination(numbers, size, k));
+ }
+
+ public void secndThread(List craftList, string wanted, double[] pool, int start, int skip)
+ {
+ foreach (IEnumerable pair in Combinations(pool, 10, start, skip))
+ {
+ parseCraft(pair.ToArray(), craftList, wanted, checkBox2.Checked, checkBox3.Checked);
+ }
+ }
+ public List t2 = new List();
private void StartCalculation()
{
client.SetPresence(new RichPresence()
@@ -443,7 +501,6 @@ private void StartCalculation()
textBox2.ScrollToCaret();
}
));
-
string currData = getSkinData(q.Split('(')[0].TrimEnd());
List craftList = new List();
using (StreamReader r = new StreamReader("itemData.json"))
@@ -472,34 +529,86 @@ private void StartCalculation()
));
//return;
double[] pool = floats.ToArray();
- int n = floats.Count;
- if (10 > n) { Console.WriteLine("At least 10!"); return; }
- int[] indices = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
- List first = new List();
- foreach (int i in indices) { first.Add(pool[i]); }
+ //int n = floats.Count;
+ //if (10 > n) { Console.WriteLine("At least 10!"); return; }
+ //int[] indices = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+ //List first = new List();
+ //foreach (int i in indices) { first.Add(pool[i]); }
//Craft
- parseCraft(first.ToArray(), craftList, wanted, checkBox2.Checked, checkBox3.Checked);
+ //parseCraft(first.ToArray(), craftList, wanted, checkBox2.Checked, checkBox3.Checked);
//
- int iter = 2;
+ //int iter = 2;
+
+ var threads = 1;
+ if (checkBox4.Checked)
+ {
+ threads = (int)numericUpDown3.Value;
+ try
+ {
+ for (int i = 1; i < threads; i++)
+ {
+ Thread newThread = new Thread(() => secndThread(craftList, wanted, pool, i, threads));
+ newThread.Start();
+ t2.Add(newThread);
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+
+
+
+ foreach (IEnumerable pair in Combinations(pool, 10, 0, threads))
+ {
+ parseCraft(pair.ToArray(), craftList, wanted, checkBox2.Checked, checkBox3.Checked);
+ }
+ Console.WriteLine("Next group");
+
while (true)
{
- //var startTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
- //Debug.WriteLine("[DEBUG] start time = "+startTime);
- int a = 9; bool run = true;
- for (int i = 9; i >= 0; i--) { a = i; if (indices[i] != i + n - 10) { run = false; break; } }
- if (run) { break; }
- indices[a]++;
- for (int j = a + 1; j < 10; j++) { indices[j] = indices[j - 1] + 1; }
- List current = new List();
- foreach (int i in indices) { current.Add(pool[i]); }
- //Craft
- parseCraft(current.ToArray(), craftList, wanted, checkBox2.Checked, checkBox3.Checked);
- //var endTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
- //Debug.WriteLine("[DEBUG] end time = " + endTime);
- //Debug.WriteLine("[DEBUG] total time = " + (endTime - startTime));
- //
- iter++;
+ bool okey = true;
+ foreach (Thread t in t2)
+ {
+ if (t.IsAlive)
+ {
+ okey = false;
+ break;
+ }
+ }
+ if (okey) break;
}
+
+
+
+
+
+
+ /*
+ Parallel.For(2, 6, new ParallelOptions { MaxDegreeOfParallelism = 4 }, (iter) => {
+ while (true)
+ {
+ //var startTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+ //Debug.WriteLine("[DEBUG] start time = "+startTime);
+ Console.WriteLine("iter = " + iter);
+ int a = 9; bool run = true;
+ for (int i = 9; i >= 0; i--) { a = i; if (indices[i] != i + n - 10) { run = false; break; } }
+ if (run) { break; }
+ indices[a]++;
+ for (int j = a + 1; j < 10; j++) { indices[j] = indices[j - 1] + 1; }
+ List current = new List();
+ foreach (int i in indices) { current.Add(pool[i]); }
+ //Craft
+
+ //var endTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+ //Debug.WriteLine("[DEBUG] end time = " + endTime);
+ //Debug.WriteLine("[DEBUG] total time = " + (endTime - startTime));
+ //
+ iter++;
+ }
+ });
+ */
+
this.Invoke((MethodInvoker)(() =>
{
textBox2.AppendText( "Программа завершила проверку всех комбинаций!" + Environment.NewLine);
@@ -514,6 +623,11 @@ private void StartCalculation()
}
+ private void parseCraft(List[] lists, List craftList, string wanted, bool checked1, bool checked2)
+ {
+ throw new NotImplementedException();
+ }
+
private void button2_Click(object sender, EventArgs e)
{
if(button2.Text == "Старт") {
@@ -535,6 +649,13 @@ private void button2_Click(object sender, EventArgs e)
LargeImageText = "FloatTool"
}
});
+ foreach (Thread t in t2)
+ {
+ if (t.IsAlive)
+ {
+ t.Abort();
+ }
+ }
}
SwitchEnabled();
}
@@ -794,6 +915,11 @@ void changeTheme(bool dark)
numericUpDown1.ForeColor = Color.FromArgb(150, 150, 150);
numericUpDown2.BackColor = Color.FromArgb(32, 32, 32);
numericUpDown2.ForeColor = Color.FromArgb(150, 150, 150);
+
+ checkBox4.ForeColor = Color.FromName("White");
+ label10.ForeColor = Color.FromName("White");
+ numericUpDown3.BackColor = Color.FromArgb(32, 32, 32);
+ numericUpDown3.ForeColor = Color.FromArgb(150, 150, 150);
}
else
{
@@ -858,6 +984,11 @@ void changeTheme(bool dark)
numericUpDown1.ForeColor = Color.FromArgb(10, 10, 10);
numericUpDown2.BackColor = Color.FromArgb(255, 255, 255);
numericUpDown2.ForeColor = Color.FromArgb(10, 10, 10);
+
+ checkBox4.ForeColor = Color.FromName("Black");
+ label10.ForeColor = Color.FromName("Black");
+ numericUpDown3.BackColor = Color.FromArgb(255, 255, 255);
+ numericUpDown3.ForeColor = Color.FromArgb(10, 10, 10);
}
}
@@ -867,5 +998,10 @@ private void button10_Click(object sender, EventArgs e)
changeTheme(darkTheme);
button10.Text = darkTheme ? "🌙" : "☀";
}
+
+ private void checkBox4_CheckedChanged(object sender, EventArgs e)
+ {
+ numericUpDown3.Enabled = checkBox4.Checked;
+ }
}
}
diff --git a/FloatToolGUI/Main.resx b/FloatToolGUI/Main.resx
index 4c26abe..ec57190 100644
--- a/FloatToolGUI/Main.resx
+++ b/FloatToolGUI/Main.resx
@@ -135,8 +135,11 @@
True
+
+ Both
+
- 353, 290
+ 377, 334
0
@@ -160,102 +163,18 @@
132, 17
-
- panel8
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel1
-
-
- 0
-
-
- panel7
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel1
-
-
- 1
-
-
- Fill
-
-
- 0, 0
-
-
- 363, 340
-
-
- 7
-
-
- panel1
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel4
-
-
- 0
-
-
- panel13
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel8
-
-
- 0
-
-
- panel10
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel8
-
-
- 1
-
-
+
Fill
-
- 0, 40
+
+ 0, 10
-
- 363, 300
+
+ 377, 334
-
+
2
-
- panel8
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel1
-
-
- 0
-
panel11
@@ -268,6 +187,18 @@
0
+
+ Top
+
+
+ 0, 0
+
+
+ 377, 10
+
+
+ 3
+
panel12
@@ -287,7 +218,7 @@
10, 0
- 353, 300
+ 377, 344
4
@@ -304,54 +235,6 @@
0
-
- Fill
-
-
- 0, 10
-
-
- 353, 290
-
-
- 2
-
-
- panel11
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel13
-
-
- 0
-
-
- Top
-
-
- 0, 0
-
-
- 353, 10
-
-
- 3
-
-
- panel12
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel13
-
-
- 1
-
Left
@@ -359,7 +242,7 @@
0, 0
- 10, 300
+ 10, 344
1
@@ -376,161 +259,32 @@
1
-
- panel9
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel7
-
-
- 0
-
-
- button5
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel7
-
-
- 1
-
-
- button4
+
+ Fill
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0, 40
-
- panel7
+
+ 387, 344
-
+
2
-
- button3
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel7
-
-
- 3
-
-
- Top
-
-
- 0, 0
-
-
- 363, 40
-
-
- 1
-
-
- panel7
+
+ panel8
-
+
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
panel1
-
- 1
-
-
- button10
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
+
0
-
- button9
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
- 1
-
-
- button7
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
- 2
-
-
- button6
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
- 3
-
-
- button8
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
- 4
-
-
- Top
-
-
- 0, 0
-
-
- 363, 40
-
-
- 3
-
-
- panel9
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel7
-
-
- 0
+
+ Top, Right
Flat
@@ -542,7 +296,7 @@
NoControl
- 195, 0
+ 219, 0
1, 1, 1, 1
@@ -574,6 +328,24 @@
219, 17
+
+ 149, 22
+
+
+ GitHub
+
+
+ Ссылка на репозиторий проекта
+
+
+ 149, 22
+
+
+ О программе
+
+
+ Информация о разработчике
+
150, 48
@@ -593,7 +365,7 @@
NoControl
- 241, 1
+ 265, 1
40, 40
@@ -616,14 +388,41 @@
1
-
- 149, 22
+
+ Flat
-
- О программе
+
+ Microsoft JhengHei Light, 40px
-
- Информация о разработчике
+
+ NoControl
+
+
+ 0, 1
+
+
+ 1, 1, 1, 1
+
+
+ Yes
+
+
+ 40, 40
+
+
+ 3
+
+
+ button7
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel9
+
+
+ 2
Top, Right
@@ -638,7 +437,7 @@
NoControl
- 281, 1
+ 305, 1
40, 40
@@ -674,7 +473,7 @@
NoControl
- 323, 1
+ 347, 1
40, 40
@@ -697,6 +496,30 @@
4
+
+ Top
+
+
+ 0, 0
+
+
+ 387, 40
+
+
+ 3
+
+
+ panel9
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel7
+
+
+ 0
+
Top, Right
@@ -710,7 +533,7 @@
NoControl
- 273, 0
+ 297, 0
30, 26
@@ -746,7 +569,7 @@
NoControl
- 303, 0
+ 327, 0
30, 26
@@ -782,7 +605,7 @@
NoControl
- 333, 0
+ 357, 0
30, 26
@@ -805,53 +628,53 @@
3
-
- label9
+
+ Top
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0, 0
-
- panel3
+
+ 387, 40
-
- 0
+
+ 1
-
- label8
+
+ panel7
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panel3
+
+ panel1
-
+
1
-
- Top
+
+ Fill
-
+
0, 0
-
- 427, 40
+
+ 387, 384
-
- 0
+
+ 7
-
- panel3
+
+ panel1
-
+
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panel2
+
+ panel4
-
- 2
+
+ 0
True
@@ -863,13 +686,13 @@
137, 20
- 38, 15
+ 36, 15
1
- v.0.3.3
+ v.0.4.1
label9
@@ -916,6 +739,30 @@
1
+
+ Top
+
+
+ 0, 0
+
+
+ 427, 40
+
+
+ 0
+
+
+ panel3
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 2
+
None
@@ -1447,89 +1294,29 @@
1
-
- panel14
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 0
-
-
- checkBox3
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 1
-
-
- label6
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 2
-
-
- checkBox2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 3
-
-
- button2
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ None
-
- panel5
+
+ True
-
- 4
+
+ Microsoft JhengHei Light, 10pt
-
- textBox3
+
+ NoControl
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 12, 12
-
- panel5
+
+ 108, 18
-
+
5
-
- label7
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel5
-
-
- 6
+
+ Нужный флоат:
label5
@@ -1538,22 +1325,25 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
- 7
+ 0
-
- numericUpDown2
+
+ None
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Microsoft JhengHei Light, 10pt
-
- panel5
+
+ 125, 41
-
- 8
+
+ 116, 21
+
+
+ 3
numericUpDown1
@@ -1562,43 +1352,16 @@
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
- 9
-
-
- Fill
-
-
- Microsoft JhengHei Light, 10pt
-
-
- 0, 185
-
-
- 427, 155
-
-
- 0
-
-
- panel5
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel2
-
-
- 0
+ 1
None
- 12, 99
+ 15, 99
225, 42
@@ -1613,10 +1376,37 @@
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
- 0
+ 2
+
+
+ None
+
+
+ Microsoft JhengHei Light, 10pt
+
+
+ 125, 72
+
+
+ 116, 21
+
+
+ 4
+
+
+ numericUpDown2
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel16
+
+
+ 3
None
@@ -1624,32 +1414,65 @@
True
-
+
+ NoControl
+
+
+ 248, 36
+
+
+ 136, 22
+
+
+ 9
+
+
+ По возрастанию
+
+
+ checkBox3
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel16
+
+
+ 4
+
+
+ None
+
+
+ True
+
+
NoControl
-
- 245, 36
+
+ 12, 71
-
- 136, 22
+
+ 67, 18
-
- 9
+
+ 7
-
- По возрастанию
+
+ Пропуск:
-
- checkBox3
+
+ label7
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panel5
+
+ panel16
-
- 1
+
+ 5
None
@@ -1664,7 +1487,7 @@
NoControl
- 9, 40
+ 12, 40
89, 18
@@ -1682,11 +1505,41 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
+ 6
+
+
+ None
+
+
+ Microsoft JhengHei Light, 10pt
+
+
+ 125, 12
+
+
+ 116, 18
+
+
2
+
+ 0.250000000
+
+
+ textBox3
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel16
+
+
+ 7
+
None
@@ -1697,7 +1550,7 @@
NoControl
- 245, 8
+ 248, 8
111, 22
@@ -1715,10 +1568,10 @@
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
- 3
+ 8
None
@@ -1733,7 +1586,7 @@
NoControl
- 244, 60
+ 247, 60
177, 82
@@ -1751,163 +1604,163 @@
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- panel5
+ panel16
- 4
+ 9
-
- None
+
+ Fill
-
- Microsoft JhengHei Light, 10pt
+
+ 0, 0
-
- 122, 12
+
+ 427, 149
-
- 116, 18
+
+ 12
-
- 2
+
+ panel16
-
- 0.250000000
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- textBox3
+
+ panel5
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0
-
- panel5
+
+ True
-
- 5
+
+ 220, 18
-
- None
+
+ 72, 18
-
- True
+
+ 2
-
- NoControl
+
+ Потоков:
-
- 9, 71
+
+ label10
-
- 67, 18
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 7
+
+ panel15
-
- Пропуск:
+
+ 0
-
- label7
+
+ False
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 298, 17
-
- panel5
+
+ 120, 21
-
- 6
+
+ 1
-
- None
+
+ numericUpDown3
-
- True
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Microsoft JhengHei Light, 10pt
+
+ panel15
-
- NoControl
+
+ 1
-
- 9, 12
+
+ True
-
- 108, 18
+
+ 15, 16
-
- 5
+
+ 148, 22
-
- Нужный флоат:
+
+ 0
-
- label5
+
+ Многопоточность
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ checkBox4
-
- panel5
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 7
+
+ panel15
-
- None
+
+ 2
-
- Microsoft JhengHei Light, 10pt
+
+ Bottom
-
- 122, 72
+
+ 0, 149
-
- 116, 21
+
+ 427, 50
-
- 4
+
+ 11
-
- numericUpDown2
+
+ panel15
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
panel5
-
- 8
+
+ 1
-
- None
+
+ Fill
-
+
Microsoft JhengHei Light, 10pt
-
- 122, 41
+
+ 0, 185
-
- 116, 21
+
+ 427, 199
-
- 3
+
+ 0
-
- numericUpDown1
+
+ panel5
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panel5
+
+ panel2
-
- 9
+
+ 0
Left
@@ -1916,7 +1769,7 @@
0, 0
- 427, 340
+ 427, 384
8
@@ -1940,7 +1793,7 @@
427, 0
- 363, 340
+ 387, 384
9
@@ -1957,51 +1810,6 @@
1
-
- 149, 22
-
-
- GitHub
-
-
- Ссылка на репозиторий проекта
-
-
- Flat
-
-
- Microsoft JhengHei Light, 40px
-
-
- NoControl
-
-
- 0, 1
-
-
- 1, 1, 1, 1
-
-
- Yes
-
-
- 40, 40
-
-
- 3
-
-
- button7
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel9
-
-
- 2
-
True
@@ -2015,7 +1823,7 @@
Center
- 790, 340
+ 814, 384
Microsoft JhengHei Light, 8.25pt
@@ -2557,11 +2365,8 @@
WtT/Dwq2uvjgV6RrAAAAAElFTkSuQmCC
-
- NoControl
-
- 790, 340
+ 830, 400
CenterScreen
@@ -2572,18 +2377,18 @@
System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- toolStripMenuItem3
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
toolStripMenuItem2
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ toolStripMenuItem3
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
FloatTool