From 44b3887d2e6c530c24e9ff0c46ab72ffdabe7662 Mon Sep 17 00:00:00 2001 From: Nemesh Date: Wed, 9 Jun 2021 01:10:04 +0300 Subject: [PATCH] v.0.7.2 IEEE754, benchmark theme, craft range, ui tweaks, optimizations, download speed increase --- FloatToolGUI/Benchmark.cs | 51 +- FloatToolGUI/Calculation.cs | 62 +- FloatToolGUI/Main.Designer.cs | 232 +-- FloatToolGUI/Main.cs | 188 ++- FloatToolGUI/Main.resx | 1404 ++++++++++++------ FloatToolGUI/Skin.cs | 2 + FloatToolGUI/Utils.cs | 15 +- Updater/obj/Updater.csproj.nuget.dgspec.json | 60 + Updater/obj/Updater.csproj.nuget.g.props | 20 + Updater/obj/Updater.csproj.nuget.g.targets | 6 + Updater/obj/project.assets.json | 165 ++ Updater/obj/project.nuget.cache | 10 + 12 files changed, 1573 insertions(+), 642 deletions(-) create mode 100644 Updater/obj/Updater.csproj.nuget.dgspec.json create mode 100644 Updater/obj/Updater.csproj.nuget.g.props create mode 100644 Updater/obj/Updater.csproj.nuget.g.targets create mode 100644 Updater/obj/project.assets.json create mode 100644 Updater/obj/project.nuget.cache diff --git a/FloatToolGUI/Benchmark.cs b/FloatToolGUI/Benchmark.cs index 2206dea..0dee7b8 100644 --- a/FloatToolGUI/Benchmark.cs +++ b/FloatToolGUI/Benchmark.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Win32; +using System; using System.Collections; using System.Collections.Generic; using System.ComponentModel; @@ -15,6 +16,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using static FloatToolGUI.Calculation; +using static FloatToolGUI.Utils; namespace FloatToolGUI { @@ -27,6 +29,7 @@ public enum SearchMode Greater } SearchMode CurrentSearchMode = SearchMode.Equal; + private Pallete CurrentPallete; public void parseCraft(List inputs, List outputs, string want) { @@ -34,9 +37,11 @@ public void parseCraft(List inputs, List outputs, string want) if (CurrentSearchMode != SearchMode.Equal) decimal.TryParse(want, NumberStyles.Any, CultureInfo.InvariantCulture, out wantFloat); + var inputArr = inputs.ToArray(); + for (int i = 0; i < outputs.Count; i++) { - decimal flotOrigin = Math.Round(craft(inputs, outputs[i].MinFloat, outputs[i].MaxFloat), 14); + decimal flotOrigin = Math.Round(craft(inputArr, outputs[i].MinFloat, outputs[i].FloatRange), 14); if ( (flotOrigin.ToString(CultureInfo.InvariantCulture).StartsWith(want, StringComparison.Ordinal) && CurrentSearchMode == SearchMode.Equal) || @@ -58,6 +63,42 @@ public void secndThread(List craftList, string wanted, List poo } } + public void SetTheme() + { + panel3.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary3); + label8.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + closeBtn.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + panel4.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary1); + + benchmarkScoreboardLayout.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary4); + benchmarkScoreboardLayout.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + + cpuNameLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + threadCountLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + versionLabel2.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + label4.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + speedLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + label2.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + + benchmarkThreadsNumericUpdown.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + benchmarkThreadsNumericUpdown.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary6); + + updateBenchmarksButton.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + updateBenchmarksButton.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary5); + submitScoreBtn.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + submitScoreBtn.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary5); + startBenchmarkBtn.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + startBenchmarkBtn.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary5); + + updateBenchmarksButton.FlatAppearance.MouseOverBackColor = GetPalleteColor(CurrentPallete, PalleteColor.OverBackColor2); + submitScoreBtn.FlatAppearance.MouseOverBackColor = GetPalleteColor(CurrentPallete, PalleteColor.OverBackColor2); + startBenchmarkBtn.FlatAppearance.MouseOverBackColor = GetPalleteColor(CurrentPallete, PalleteColor.OverBackColor2); + + customProgressBar1.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + customProgressBar1.ProgressColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary3); + customProgressBar1.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary4); + } + private void runCycle() { Console.WriteLine("Thread loaded!"); @@ -152,6 +193,12 @@ public Benchmark(string version) warningPic.Image = SystemIcons.Warning.ToBitmap(); Thread t = new Thread(new ThreadStart(LoadStats)); t.Start(); + + CheckRegistry(); + var registryData = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\FloatTool", true); + var themeRK = registryData.GetValue("theme"); + CurrentPallete = (Pallete)themeRK; + SetTheme(); } private void startBenchmarkBtn_Click(object sender, EventArgs e) diff --git a/FloatToolGUI/Calculation.cs b/FloatToolGUI/Calculation.cs index 59b2e18..9b51223 100644 --- a/FloatToolGUI/Calculation.cs +++ b/FloatToolGUI/Calculation.cs @@ -11,8 +11,14 @@ namespace FloatToolGUI { static class Calculation { - [DllImport("FloatCore.dll")] - static public extern double GetOutputWear(double[] floats, float minWear, float maxWear); + [DllImport("FloatCore.dll", CallingConvention = CallingConvention.Cdecl)] + static public extern void GetOutputWear(float[] floats, float minWear, float maxWear, StringBuilder stringBuilder); + + static public string GetOutputWearString(float[] floats, float minWear, float maxWear) { + StringBuilder sb = new StringBuilder(19); + GetOutputWear(floats, minWear, maxWear, sb); + return sb.ToString(); + } /// /// Calculates wear value based of input skins and min/max value of outcome @@ -21,7 +27,7 @@ static class Calculation /// Minimal wear value of skin that is going to be crafted /// Maximum wear value of skin that is going to be crafted /// Wear value represented in decimal type - static public decimal craft(List ingridients, decimal minFloat, decimal maxFloat) + static public decimal craft(InputSkin[] ingridients, decimal minFloat, decimal floatRange) { decimal avgFloat = ingridients[0].WearValue; for (int i = 1; i < 10; i++) @@ -29,61 +35,24 @@ static public decimal craft(List ingridients, decimal minFloat, decim avgFloat += ingridients[i].WearValue; } avgFloat /= 10; - return (maxFloat - minFloat) * avgFloat + minFloat; + return floatRange * avgFloat + minFloat; } /// - /// Does same job as craft(List, float, float), but uses float as type + /// Does same job as craft(List, float, float), but uses c++ dll with IEEE754 precision /// /// List of 10 skins /// Minimal wear value of skin that is going to be crafted /// Maximum wear value of skin that is going to be crafted /// Float wear value in string - static public string craftF(List ingridients, decimal minFloat, decimal maxFloat) + static public string craftF(List ingridients, float minFloat, float maxFloat) { - float avgFloat = 0; float[] arrInput = new float[10]; for (int i = 0; i < 10; i++) { - arrInput[i] = Convert.ToSingle(ingridients[i].WearValue); - } - for (int i = 0; i < 10; i++) - { - avgFloat += Convert.ToSingle(arrInput[i]); + arrInput[i] = (float)ingridients[i].WearValue; } - avgFloat /= 10; - return setprecission(((float)(maxFloat - minFloat) * avgFloat) + (float)minFloat, 10); - } - - public static string setprecission(double number, int figures) - { - int e = 0; - while (number >= 10.0) - { - e += 1; - number /= 10; - } - while (number < 1.0) - { - e -= 1; - number *= 10; - } - figures--; - number = (float)Math.Round(number, figures); - figures += 0 - e; - while (e > 0) - { - number *= 10; - e -= 1; - } - while (e < 0) - { - number /= 10; - e += 1; - } - if (figures < 0) - figures = 0; - return number.ToString($"f{figures}", CultureInfo.InvariantCulture); + return GetOutputWearString(arrInput, minFloat, maxFloat); } public static Quality FromString(string value) @@ -154,8 +123,5 @@ static public IEnumerable Combinations(IEnumerable elements, int start, in step++; } while (NextCombination(numbers, size)); } - - - } } diff --git a/FloatToolGUI/Main.Designer.cs b/FloatToolGUI/Main.Designer.cs index 2aae810..b662b6d 100644 --- a/FloatToolGUI/Main.Designer.cs +++ b/FloatToolGUI/Main.Designer.cs @@ -70,49 +70,50 @@ private void InitializeComponent() this.button4 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); - this.label24 = new System.Windows.Forms.Label(); + this.byPrevterlabel = new System.Windows.Forms.Label(); this.versionLabel = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); + this.floattoolTitle = new System.Windows.Forms.Label(); this.panel6 = new System.Windows.Forms.Panel(); - this.stattrackCheckBox = new FloatToolGUI.CustomControls.CustomToggleSwitch(); this.checkPossibilityBtn = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); + this.qualityLabel = new System.Windows.Forms.Label(); this.outcomeSelectorComboBox = new System.Windows.Forms.ComboBox(); this.weaponQualityBox = new System.Windows.Forms.ComboBox(); - this.label12 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.stattrackLabel = new System.Windows.Forms.Label(); + this.weaponTypeLabel = new System.Windows.Forms.Label(); + this.fullnameLabel = new System.Windows.Forms.Label(); this.weaponTypeBox = new System.Windows.Forms.ComboBox(); - this.label11 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.outcomesLabel = new System.Windows.Forms.Label(); + this.skinLabel = new System.Windows.Forms.Label(); this.fullSkinName = new System.Windows.Forms.TextBox(); this.weaponSkinBox = new System.Windows.Forms.ComboBox(); this.panel5 = new System.Windows.Forms.Panel(); this.panel16 = new System.Windows.Forms.Panel(); this.startSearchSingleButton = new System.Windows.Forms.Button(); - this.downloadProgressBar = new FloatToolGUI.CustomProgressBar(); this.searchmodeGreater_btn = new System.Windows.Forms.Button(); this.searchmodeEqual_btn = new System.Windows.Forms.Button(); this.searchmodeLess_btn = new System.Windows.Forms.Button(); this.searchModeLabel = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.neededfloatLabel = new System.Windows.Forms.Label(); this.quantityInput = new System.Windows.Forms.NumericUpDown(); this.skipValueInput = new System.Windows.Forms.NumericUpDown(); this.ascendingCheckBox = new System.Windows.Forms.CheckBox(); - this.label7 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.skipLabel = new System.Windows.Forms.Label(); + this.countLabel = new System.Windows.Forms.Label(); this.searchFloatInput = new System.Windows.Forms.TextBox(); this.sortCheckBox = new System.Windows.Forms.CheckBox(); this.startBtn = new System.Windows.Forms.Button(); this.panel15 = new System.Windows.Forms.Panel(); + this.craftRangeLabel = new System.Windows.Forms.Label(); this.speedStatusLabel = new System.Windows.Forms.Label(); this.combinationsStatusLabel = new System.Windows.Forms.Label(); this.gpuSearch_btn = new System.Windows.Forms.Button(); - this.label10 = new System.Windows.Forms.Label(); + this.threadsLabel = new System.Windows.Forms.Label(); this.threadCountInput = new System.Windows.Forms.NumericUpDown(); this.panel2 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.WorkStatusUpdater = new System.Windows.Forms.Timer(this.components); + this.downloadProgressBar = new FloatToolGUI.CustomProgressBar(); + this.stattrackCheckBox = new FloatToolGUI.CustomControls.CustomToggleSwitch(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -242,6 +243,7 @@ private void InitializeComponent() // benchmarkButton // this.benchmarkButton.BackColor = System.Drawing.Color.Transparent; + this.benchmarkButton.BackgroundImage = global::FloatToolGUI.Properties.Resources.benchmarkWhite; resources.ApplyResources(this.benchmarkButton, "benchmarkButton"); this.benchmarkButton.FlatAppearance.BorderSize = 0; this.benchmarkButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); @@ -254,6 +256,7 @@ private void InitializeComponent() // settingsButton // this.settingsButton.BackColor = System.Drawing.Color.Transparent; + this.settingsButton.BackgroundImage = global::FloatToolGUI.Properties.Resources.gearWhite; resources.ApplyResources(this.settingsButton, "settingsButton"); this.settingsButton.FlatAppearance.BorderSize = 0; this.settingsButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); @@ -329,19 +332,19 @@ private void InitializeComponent() // panel3 // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(37)))), ((int)(((byte)(37))))); - this.panel3.Controls.Add(this.label24); + this.panel3.Controls.Add(this.byPrevterlabel); this.panel3.Controls.Add(this.versionLabel); - this.panel3.Controls.Add(this.label8); + this.panel3.Controls.Add(this.floattoolTitle); resources.ApplyResources(this.panel3, "panel3"); this.panel3.Name = "panel3"; this.panel3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.WindowDragEvent); // - // label24 + // byPrevterlabel // - resources.ApplyResources(this.label24, "label24"); - this.label24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150))))); - this.label24.Name = "label24"; - this.label24.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.debugMenuShow); + resources.ApplyResources(this.byPrevterlabel, "byPrevterlabel"); + this.byPrevterlabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150))))); + this.byPrevterlabel.Name = "byPrevterlabel"; + this.byPrevterlabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.debugMenuShow); // // versionLabel // @@ -349,42 +352,32 @@ private void InitializeComponent() this.versionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(150)))), ((int)(((byte)(150))))); this.versionLabel.Name = "versionLabel"; // - // label8 + // floattoolTitle // - resources.ApplyResources(this.label8, "label8"); - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Name = "label8"; + resources.ApplyResources(this.floattoolTitle, "floattoolTitle"); + this.floattoolTitle.BackColor = System.Drawing.Color.Transparent; + this.floattoolTitle.ForeColor = System.Drawing.Color.White; + this.floattoolTitle.Name = "floattoolTitle"; // // panel6 // this.panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); this.panel6.Controls.Add(this.stattrackCheckBox); this.panel6.Controls.Add(this.checkPossibilityBtn); - this.panel6.Controls.Add(this.label3); + this.panel6.Controls.Add(this.qualityLabel); this.panel6.Controls.Add(this.outcomeSelectorComboBox); this.panel6.Controls.Add(this.weaponQualityBox); - this.panel6.Controls.Add(this.label12); - this.panel6.Controls.Add(this.label1); - this.panel6.Controls.Add(this.label4); + this.panel6.Controls.Add(this.stattrackLabel); + this.panel6.Controls.Add(this.weaponTypeLabel); + this.panel6.Controls.Add(this.fullnameLabel); this.panel6.Controls.Add(this.weaponTypeBox); - this.panel6.Controls.Add(this.label11); - this.panel6.Controls.Add(this.label2); + this.panel6.Controls.Add(this.outcomesLabel); + this.panel6.Controls.Add(this.skinLabel); this.panel6.Controls.Add(this.fullSkinName); this.panel6.Controls.Add(this.weaponSkinBox); resources.ApplyResources(this.panel6, "panel6"); this.panel6.Name = "panel6"; // - // stattrackCheckBox - // - this.stattrackCheckBox.Checked = false; - this.stattrackCheckBox.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.stattrackCheckBox, "stattrackCheckBox"); - this.stattrackCheckBox.Name = "stattrackCheckBox"; - this.stattrackCheckBox.TurnedOffColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); - this.stattrackCheckBox.TurnedOnColor = System.Drawing.Color.Green; - this.stattrackCheckBox.OnToggled += new System.EventHandler(this.SkinComboboxChanged); - // // checkPossibilityBtn // resources.ApplyResources(this.checkPossibilityBtn, "checkPossibilityBtn"); @@ -397,11 +390,11 @@ private void InitializeComponent() this.checkPossibilityBtn.UseVisualStyleBackColor = false; this.checkPossibilityBtn.Click += new System.EventHandler(this.button1_Click); // - // label3 + // qualityLabel // - resources.ApplyResources(this.label3, "label3"); - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Name = "label3"; + resources.ApplyResources(this.qualityLabel, "qualityLabel"); + this.qualityLabel.ForeColor = System.Drawing.Color.White; + this.qualityLabel.Name = "qualityLabel"; // // outcomeSelectorComboBox // @@ -415,6 +408,7 @@ private void InitializeComponent() resources.GetString("outcomeSelectorComboBox.Items1"), resources.GetString("outcomeSelectorComboBox.Items2")}); this.outcomeSelectorComboBox.Name = "outcomeSelectorComboBox"; + this.outcomeSelectorComboBox.SelectedIndexChanged += new System.EventHandler(this.outcomeSelectorComboBox_SelectedIndexChanged); // // weaponQualityBox // @@ -432,23 +426,23 @@ private void InitializeComponent() this.weaponQualityBox.Name = "weaponQualityBox"; this.weaponQualityBox.SelectedIndexChanged += new System.EventHandler(this.SkinComboboxChanged); // - // label12 + // stattrackLabel // - resources.ApplyResources(this.label12, "label12"); - this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Name = "label12"; + resources.ApplyResources(this.stattrackLabel, "stattrackLabel"); + this.stattrackLabel.ForeColor = System.Drawing.Color.White; + this.stattrackLabel.Name = "stattrackLabel"; // - // label1 + // weaponTypeLabel // - resources.ApplyResources(this.label1, "label1"); - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Name = "label1"; + resources.ApplyResources(this.weaponTypeLabel, "weaponTypeLabel"); + this.weaponTypeLabel.ForeColor = System.Drawing.Color.White; + this.weaponTypeLabel.Name = "weaponTypeLabel"; // - // label4 + // fullnameLabel // - resources.ApplyResources(this.label4, "label4"); - this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Name = "label4"; + resources.ApplyResources(this.fullnameLabel, "fullnameLabel"); + this.fullnameLabel.ForeColor = System.Drawing.Color.White; + this.fullnameLabel.Name = "fullnameLabel"; // // weaponTypeBox // @@ -495,17 +489,17 @@ private void InitializeComponent() this.weaponTypeBox.Name = "weaponTypeBox"; this.weaponTypeBox.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // - // label11 + // outcomesLabel // - resources.ApplyResources(this.label11, "label11"); - this.label11.ForeColor = System.Drawing.Color.White; - this.label11.Name = "label11"; + resources.ApplyResources(this.outcomesLabel, "outcomesLabel"); + this.outcomesLabel.ForeColor = System.Drawing.Color.White; + this.outcomesLabel.Name = "outcomesLabel"; // - // label2 + // skinLabel // - resources.ApplyResources(this.label2, "label2"); - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Name = "label2"; + resources.ApplyResources(this.skinLabel, "skinLabel"); + this.skinLabel.ForeColor = System.Drawing.Color.White; + this.skinLabel.Name = "skinLabel"; // // fullSkinName // @@ -542,12 +536,12 @@ private void InitializeComponent() this.panel16.Controls.Add(this.searchmodeEqual_btn); this.panel16.Controls.Add(this.searchmodeLess_btn); this.panel16.Controls.Add(this.searchModeLabel); - this.panel16.Controls.Add(this.label5); + this.panel16.Controls.Add(this.neededfloatLabel); this.panel16.Controls.Add(this.quantityInput); this.panel16.Controls.Add(this.skipValueInput); this.panel16.Controls.Add(this.ascendingCheckBox); - this.panel16.Controls.Add(this.label7); - this.panel16.Controls.Add(this.label6); + this.panel16.Controls.Add(this.skipLabel); + this.panel16.Controls.Add(this.countLabel); this.panel16.Controls.Add(this.searchFloatInput); this.panel16.Controls.Add(this.sortCheckBox); this.panel16.Controls.Add(this.startBtn); @@ -566,18 +560,6 @@ private void InitializeComponent() this.startSearchSingleButton.UseVisualStyleBackColor = false; this.startSearchSingleButton.Click += new System.EventHandler(this.StartButtonClick); // - // downloadProgressBar - // - resources.ApplyResources(this.downloadProgressBar, "downloadProgressBar"); - this.downloadProgressBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); - this.downloadProgressBar.ForeColor = System.Drawing.Color.White; - this.downloadProgressBar.Maximum = 100; - this.downloadProgressBar.Minimum = 0; - this.downloadProgressBar.Name = "downloadProgressBar"; - this.downloadProgressBar.ProgressColor = System.Drawing.Color.Green; - this.downloadProgressBar.ProgressFont = new System.Drawing.Font("Inter", 11.25F, System.Drawing.FontStyle.Bold); - this.downloadProgressBar.Value = 0F; - // // searchmodeGreater_btn // resources.ApplyResources(this.searchmodeGreater_btn, "searchmodeGreater_btn"); @@ -617,11 +599,11 @@ private void InitializeComponent() this.searchModeLabel.ForeColor = System.Drawing.Color.White; this.searchModeLabel.Name = "searchModeLabel"; // - // label5 + // neededfloatLabel // - resources.ApplyResources(this.label5, "label5"); - this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Name = "label5"; + resources.ApplyResources(this.neededfloatLabel, "neededfloatLabel"); + this.neededfloatLabel.ForeColor = System.Drawing.Color.White; + this.neededfloatLabel.Name = "neededfloatLabel"; // // quantityInput // @@ -666,17 +648,17 @@ private void InitializeComponent() this.ascendingCheckBox.Name = "ascendingCheckBox"; this.ascendingCheckBox.UseVisualStyleBackColor = true; // - // label7 + // skipLabel // - resources.ApplyResources(this.label7, "label7"); - this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Name = "label7"; + resources.ApplyResources(this.skipLabel, "skipLabel"); + this.skipLabel.ForeColor = System.Drawing.Color.White; + this.skipLabel.Name = "skipLabel"; // - // label6 + // countLabel // - resources.ApplyResources(this.label6, "label6"); - this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Name = "label6"; + resources.ApplyResources(this.countLabel, "countLabel"); + this.countLabel.ForeColor = System.Drawing.Color.White; + this.countLabel.Name = "countLabel"; // // searchFloatInput // @@ -708,14 +690,21 @@ private void InitializeComponent() // panel15 // this.panel15.BackColor = System.Drawing.Color.Transparent; + this.panel15.Controls.Add(this.craftRangeLabel); this.panel15.Controls.Add(this.speedStatusLabel); this.panel15.Controls.Add(this.combinationsStatusLabel); this.panel15.Controls.Add(this.gpuSearch_btn); - this.panel15.Controls.Add(this.label10); + this.panel15.Controls.Add(this.threadsLabel); this.panel15.Controls.Add(this.threadCountInput); resources.ApplyResources(this.panel15, "panel15"); this.panel15.Name = "panel15"; // + // craftRangeLabel + // + resources.ApplyResources(this.craftRangeLabel, "craftRangeLabel"); + this.craftRangeLabel.ForeColor = System.Drawing.Color.White; + this.craftRangeLabel.Name = "craftRangeLabel"; + // // speedStatusLabel // resources.ApplyResources(this.speedStatusLabel, "speedStatusLabel"); @@ -738,11 +727,11 @@ private void InitializeComponent() this.gpuSearch_btn.UseVisualStyleBackColor = false; this.gpuSearch_btn.Click += new System.EventHandler(this.gpuSearch_btn_Click); // - // label10 + // threadsLabel // - resources.ApplyResources(this.label10, "label10"); - this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Name = "label10"; + resources.ApplyResources(this.threadsLabel, "threadsLabel"); + this.threadsLabel.ForeColor = System.Drawing.Color.White; + this.threadsLabel.Name = "threadsLabel"; // // threadCountInput // @@ -787,6 +776,28 @@ private void InitializeComponent() this.WorkStatusUpdater.Interval = 250; this.WorkStatusUpdater.Tick += new System.EventHandler(this.timer2_Tick); // + // downloadProgressBar + // + this.downloadProgressBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); + resources.ApplyResources(this.downloadProgressBar, "downloadProgressBar"); + this.downloadProgressBar.ForeColor = System.Drawing.Color.White; + this.downloadProgressBar.Maximum = 100; + this.downloadProgressBar.Minimum = 0; + this.downloadProgressBar.Name = "downloadProgressBar"; + this.downloadProgressBar.ProgressColor = System.Drawing.Color.Green; + this.downloadProgressBar.ProgressFont = new System.Drawing.Font("Inter", 11.25F, System.Drawing.FontStyle.Bold); + this.downloadProgressBar.Value = 0F; + // + // stattrackCheckBox + // + this.stattrackCheckBox.Checked = false; + this.stattrackCheckBox.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.stattrackCheckBox, "stattrackCheckBox"); + this.stattrackCheckBox.Name = "stattrackCheckBox"; + this.stattrackCheckBox.TurnedOffColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.stattrackCheckBox.TurnedOnColor = System.Drawing.Color.Green; + this.stattrackCheckBox.OnToggled += new System.EventHandler(this.SkinComboboxChanged); + // // FloatTool // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -838,22 +849,22 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Button checkPossibilityBtn; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label qualityLabel; private System.Windows.Forms.ComboBox weaponQualityBox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label weaponTypeLabel; + private System.Windows.Forms.Label fullnameLabel; private System.Windows.Forms.ComboBox weaponTypeBox; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label skinLabel; private System.Windows.Forms.TextBox fullSkinName; private System.Windows.Forms.ComboBox weaponSkinBox; private System.Windows.Forms.Panel panel5; private System.Windows.Forms.CheckBox ascendingCheckBox; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label countLabel; private System.Windows.Forms.CheckBox sortCheckBox; private System.Windows.Forms.Button startBtn; private System.Windows.Forms.TextBox searchFloatInput; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label skipLabel; + private System.Windows.Forms.Label neededfloatLabel; private System.Windows.Forms.NumericUpDown skipValueInput; private System.Windows.Forms.NumericUpDown quantityInput; private System.Windows.Forms.Panel panel2; @@ -864,7 +875,7 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel9; private System.Windows.Forms.Button minimizeBtn; private System.Windows.Forms.Button closeBtn; - private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label floattoolTitle; private System.Windows.Forms.Panel panel13; private System.Windows.Forms.Panel panel11; private System.Windows.Forms.Panel panel12; @@ -873,7 +884,7 @@ private void InitializeComponent() private System.Windows.Forms.Label versionLabel; private System.Windows.Forms.Panel panel16; private System.Windows.Forms.Panel panel15; - private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label threadsLabel; private System.Windows.Forms.NumericUpDown threadCountInput; private System.Windows.Forms.Button gpuSearch_btn; private System.Windows.Forms.Label combinationsStatusLabel; @@ -886,14 +897,15 @@ private void InitializeComponent() private System.Windows.Forms.Button MaximizeButton; private CustomProgressBar downloadProgressBar; private System.Windows.Forms.ComboBox outcomeSelectorComboBox; - private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label outcomesLabel; private CustomControls.CustomToggleSwitch stattrackCheckBox; - private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label stattrackLabel; private System.Windows.Forms.Button benchmarkButton; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.FlowLayoutPanel foundCombinationContainer; - private System.Windows.Forms.Label label24; + private System.Windows.Forms.Label byPrevterlabel; private System.Windows.Forms.Button startSearchSingleButton; + private System.Windows.Forms.Label craftRangeLabel; } } diff --git a/FloatToolGUI/Main.cs b/FloatToolGUI/Main.cs index df79fa8..8f597b3 100644 --- a/FloatToolGUI/Main.cs +++ b/FloatToolGUI/Main.cs @@ -111,9 +111,11 @@ public void parseCraft(List inputs, List outputs, string want) if (CurrentSearchMode != SearchMode.Equal) decimal.TryParse(want, NumberStyles.Any, CultureInfo.InvariantCulture, out wantFloat); + var inputArr = inputs.ToArray(); + for (int i = 0; i < outputs.Count; i++) { - decimal flotOrigin = Math.Round(craft(inputs, outputs[i].MinFloat, outputs[i].MaxFloat), 14); + decimal flotOrigin = Math.Round(craft(inputArr, outputs[i].MinFloat, outputs[i].FloatRange), 14); if ( (flotOrigin.ToString(CultureInfo.InvariantCulture).StartsWith(want, StringComparison.Ordinal) && CurrentSearchMode == SearchMode.Equal) || @@ -121,7 +123,7 @@ public void parseCraft(List inputs, List outputs, string want) (CurrentSearchMode == SearchMode.Greater && (flotOrigin > wantFloat)) ) { - string flot = craftF(inputs, outputs[i].MinFloat, outputs[i].MaxFloat); + string flot = craftF(inputs, (float)outputs[i].MinFloat, (float)outputs[i].MaxFloat); Invoke((MethodInvoker)(() => { float price = 0f; @@ -129,13 +131,13 @@ public void parseCraft(List inputs, List outputs, string want) foreach (var fl in inputs) { - floatStrings.Add(Math.Round(fl.WearValue, 14).ToString().Replace(",", ".")); + floatStrings.Add(Math.Round(fl.WearValue, 14).ToString(CultureInfo.InvariantCulture)); price += fl.Price; } Logger.Log($"[{DateTime.Now}]: Found coombination {{"); Logger.Log($" Float = {flotOrigin}{newLine}" + - $" Test Float = {flot}{newLine}" + + $" IEEE754 = {flot}{newLine}" + $" Price = {price} {inputs[0].SkinCurrency}{newLine}" + $" Float list = [{string.Join(", ", floatStrings)}]{newLine}}}"); @@ -191,10 +193,14 @@ public void SwitchEnabled() ascendingCheckBox.Enabled = !ascendingCheckBox.Enabled; outcomeSelectorComboBox.Enabled = !outcomeSelectorComboBox.Enabled; threadCountInput.Enabled = !threadCountInput.Enabled; + startSearchSingleButton.Enabled = !startSearchSingleButton.Enabled; } + public List twentyfour = new List(); + public void UpdateOutcomes() { + twentyfour.Clear(); string skin = $"{weaponTypeBox.Text} | {weaponSkinBox.Text}"; outcomeSelectorComboBox.Items.Clear(); List craftList = new List(); @@ -220,6 +226,7 @@ public void UpdateOutcomes() foreach (var skinRange in GroupOutcomes(craftList)) { string tmp = (skinRange.Count > 1) ? $" + {(skinRange.Count - 1)}" : ""; + twentyfour.Add(skinRange[0]); outcomeSelectorComboBox.Items.Add($"{((float)skinRange.Count) / totalSkins * 100}% ({skinRange[0].Name}{tmp})"); } outcomeSelectorComboBox.Items.Add("* Искать всё *"); @@ -240,6 +247,9 @@ public void updateSearchStr() search += " (" + weaponQualityBox.Text + ")"; fullSkinName.Text = search; UpdateOutcomes(); + + + Logger.Log($"[{DateTime.Now}]: Changed search skin to: {search}"); } @@ -436,7 +446,7 @@ public void AddCombinationToList(string time, decimal flotOrigin, string flot, f { AutoSize = true, Location = new Point(3,3), - Text = $"{outcomeSelectorComboBox.Text}\nВозможный флоат: {flotOrigin.ToString(CultureInfo.InvariantCulture)}\nПроверочный флоат: {flot}" + Text = $"{outcomeSelectorComboBox.Text}\nВозможный флоат: {flotOrigin.ToString(CultureInfo.InvariantCulture)}\nIEEE754: {flot}" }); tmpPanel.Controls.Add(new Label { @@ -576,21 +586,20 @@ private void StartCalculation() } )); int counter = 0; - foreach (var el in r["listinginfo"]) - { - string lid = r["listinginfo"][el.Name]["listingid"]; - string aid = r["listinginfo"][el.Name]["asset"]["id"]; - string link = r["listinginfo"][el.Name]["asset"]["market_actions"][0]["link"]; - counter++; + List downloadThreads = new List(); - using (WebClient wcf = new WebClient()) + foreach (var el in r["listinginfo"]) + { + var eltemp = el; + var t = new Thread((eltemp) => { + string lid = r["listinginfo"][el.Name]["listingid"]; + string aid = r["listinginfo"][el.Name]["asset"]["id"]; + string link = r["listinginfo"][el.Name]["asset"]["market_actions"][0]["link"]; + try { - wcf.Headers.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)"); - string jsonf = wcf.DownloadString(url); - dynamic rf = JsonConvert.DeserializeObject(jsonf); inputSkins.Add(new InputSkin( GetWearFromInspectURL(link.Replace("%assetid%", aid).Replace("%listingid%", lid)), (float.Parse(r["listinginfo"][el.Name]["converted_price"].ToString()) + float.Parse(r["listinginfo"][el.Name]["converted_fee"].ToString())) / 100, @@ -605,11 +614,29 @@ private void StartCalculation() Logger.SaveCrashReport(); } } - } - Invoke((MethodInvoker)(() => + + Interlocked.Increment(ref counter); + Invoke((MethodInvoker)(() => + { + downloadProgressBar.Value = counter; + })); + }); + t.Start(); + downloadThreads.Add(t); + } + + while (true) + { + bool okey = true; + foreach (Thread t in downloadThreads) { - downloadProgressBar.Value = counter; - })); + if (t.IsAlive) + { + okey = false; + break; + } + } + if (okey) break; } } } @@ -1037,16 +1064,17 @@ void ChangeTheme() panel3.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary3); panel9.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary3); - label1.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label2.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label3.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label4.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label5.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label6.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label7.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label8.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label11.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); - label12.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + weaponTypeLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + skinLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + qualityLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + fullnameLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + neededfloatLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + countLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + skipLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + floattoolTitle.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + outcomesLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + stattrackLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + craftRangeLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); panel5.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary1); panel6.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary1); @@ -1103,7 +1131,7 @@ void ChangeTheme() skipValueInput.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary4); skipValueInput.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary2); - label10.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); + threadsLabel.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary1); threadCountInput.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary4); threadCountInput.ForeColor = GetPalleteColor(CurrentPallete, PalleteColor.Secondary2); @@ -1126,6 +1154,59 @@ void ChangeTheme() downloadProgressBar.BackColor = GetPalleteColor(CurrentPallete, PalleteColor.Primary4); } + private void outcomeSelectorComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (outcomeSelectorComboBox.SelectedIndex > twentyfour.Count - 1) + { + craftRangeLabel.Text = $"Диапазон крафта:{newLine}0 - 1"; + return; + } + float lowestWear = 0; + float highestWear = 1; + + switch (weaponQualityBox.Text) + { + case "Factory New": + lowestWear = 0f; + highestWear = 0.07f; + break; + case "Minimal Wear": + lowestWear = 0.07f; + highestWear = 0.15f; + break; + case "Field-Tested": + lowestWear = 0.15f; + highestWear = 0.38f; + break; + case "Well-Worn": + lowestWear = 0.38f; + highestWear = 0.45f; + break; + case "Battle-Scarred": + lowestWear = 0.45f; + highestWear = 1f; + break; + default: + lowestWear = 0f; + highestWear = 1f; + break; + } + + List lowest = new List(); + for (int i = 0; i < 10; i++) + lowest.Add(new InputSkin(lowestWear, 0, currentCurr)); + + List highest = new List(); + for (int i = 0; i < 10; i++) + highest.Add(new InputSkin(highestWear, 0, currentCurr)); + + var currSkin = twentyfour[outcomeSelectorComboBox.SelectedIndex]; + float minCraftWear = Convert.ToSingle(craftF(lowest, (float)currSkin.MinFloat, (float)currSkin.MaxFloat), CultureInfo.InvariantCulture); + float maxCraftWear = Convert.ToSingle(craftF(highest, (float)currSkin.MinFloat, (float)currSkin.MaxFloat), CultureInfo.InvariantCulture); + + craftRangeLabel.Text = $"Диапазон крафта:{newLine}{minCraftWear.ToString("0.00", CultureInfo.InvariantCulture)} - {maxCraftWear.ToString("0.00", CultureInfo.InvariantCulture)}"; + } + private void gpuSearch_btn_Click(object sender, EventArgs e) { if (discordWorker) @@ -1215,7 +1296,54 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) private void debugMenuShow(object sender, MouseEventArgs e) { + /*double[] pool = { + 0.246938750147820, 0.196652039885521, 0.154839321970940, + 0.333326697349548, 0.163415759801865, 0.291821509599686, + 0.374309629201889, 0.378754675388336, 0.231419935822487, + 0.311867892742157 + }; + List ingridients = new List(); + foreach (double f in pool) ingridients.Add(new InputSkin(f, 1, currentCurr)); + + Stopwatch stopwatch = new Stopwatch(); + stopwatch.Start(); + for (int i = 0; i < 10000000; i++) + { + for(int j = 0; j < 10; j++) + { + var output = ingridients[j].WearValue; + } + } + stopwatch.Stop(); + double newSpeed = stopwatch.ElapsedMilliseconds; + stopwatch.Reset(); + var ingridientsArr = ingridients.ToArray(); + stopwatch.Start(); + for (int i = 0; i < 10000000; i++) + { + for (int j = 0; j < 10; j++) + { + var output = ingridientsArr[j].WearValue; + } + } + stopwatch.Stop(); + double oldSpeed = stopwatch.ElapsedMilliseconds; + MessageBox.Show($"list - {newSpeed} ms / 1000000\n\rarr - {oldSpeed} ms / 1000000");*/ + + + /*double[] pool = { + 0.246938750147820, 0.196652039885521, 0.154839321970940, + 0.333326697349548, 0.163415759801865, 0.291821509599686, + 0.374309629201889, 0.378754675388336, 0.231419935822487, + 0.311867892742157 + }; + List inputSkins = new List(); + foreach (double f in pool) inputSkins.Add(new InputSkin(f, 1, currentCurr)); + string output = ""; + + + MessageBox.Show($"c++ - {output} ({newSpeed} ms / 100000)\n\rc# - {outputOld} ({oldSpeed} ms / 100000)");*/ } } } diff --git a/FloatToolGUI/Main.resx b/FloatToolGUI/Main.resx index 08625b8..099fcf5 100644 --- a/FloatToolGUI/Main.resx +++ b/FloatToolGUI/Main.resx @@ -142,7 +142,7 @@ 0, 0, 0, 0 - 449, 226 + 460, 308 0 @@ -193,7 +193,7 @@ Both - 449, 158 + 460, 76 0 @@ -230,10 +230,10 @@ 1 - 459, 408 + 470, 408 - 236 + 318 1 @@ -253,18 +253,102 @@ 65, 16 - + + 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, 10 + + 0, 0 - - 459, 408 + + 480, 458 - + + 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 + + + 480, 418 + + 2 + + panel8 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 0 + panel11 @@ -277,18 +361,6 @@ 0 - - Top - - - 0, 0 - - - 459, 10 - - - 3 - panel12 @@ -308,7 +380,7 @@ 10, 0 - 459, 418 + 470, 418 4 @@ -325,6 +397,54 @@ 0 + + Fill + + + 0, 10 + + + 470, 408 + + + 2 + + + panel11 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel13 + + + 0 + + + Top + + + 0, 0 + + + 470, 10 + + + 3 + + + panel12 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel13 + + + 1 + Left @@ -349,28 +469,160 @@ 1 - - Fill + + panel9 - - 0, 40 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 469, 418 + + panel7 - + + 0 + + + button5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel7 + + + 1 + + + button4 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel7 + + 2 - - panel8 + + button3 - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel7 + + + 3 + + + Top + + + 0, 0 + + + 480, 40 + + + 1 + + + panel7 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - + + 1 + + + benchmarkButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel9 + + + 0 + + + settingsButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel9 + + + 1 + + + MaximizeButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel9 + + + 2 + + + minimizeBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel9 + + + 3 + + + closeBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel9 + + + 4 + + + Top + + + 0, 0 + + + 480, 40 + + + 3 + + + panel9 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel7 + + 0 @@ -464,7 +716,7 @@ NoControl - 389, 1 + 400, 0 40, 40 @@ -500,7 +752,7 @@ NoControl - 349, 1 + 360, 0 40, 39 @@ -536,7 +788,7 @@ NoControl - 429, 1 + 440, 0 40, 40 @@ -559,30 +811,6 @@ 4 - - Top - - - 0, 0 - - - 469, 40 - - - 3 - - - panel9 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel7 - - - 0 - Top, Right @@ -596,7 +824,7 @@ NoControl - 379, 0 + 373, 0 30, 26 @@ -632,7 +860,7 @@ NoControl - 409, 0 + 403, 0 30, 26 @@ -668,7 +896,7 @@ NoControl - 439, 0 + 433, 0 30, 26 @@ -691,88 +919,97 @@ 3 - - Top + + byPrevterlabel - - 0, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 469, 40 + + panel3 - - 1 + + 0 - - panel7 + + versionLabel - - System.Windows.Forms.Panel, 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 - - panel1 + + panel3 - + 1 - - Fill + + floattoolTitle - - 0, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 469, 458 + + panel3 - - 7 + + 2 - - panel1 + + Top - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - panel4 + + 436, 40 - + 0 - - Top, Right + + panel3 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + panel2 + + + 2 + + True - + Inter, 8.25pt - + NoControl - + 177, 19 - + 60, 14 - + 1 - + by Prevter - - label24 + + byPrevterlabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel3 - + 0 @@ -788,13 +1025,13 @@ 141, 19 - 38, 14 + 41, 14 1 - v.0.7.1 + v.0.7.2 versionLabel @@ -808,71 +1045,47 @@ 1 - + True - + Inter, 21.75pt - - NoControl - - - 5, 2 - - - 140, 35 - - - 0 - - - FloatTool - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 2 - - - Top + + NoControl - - 0, 0 + + 5, 2 - - 427, 40 + + 140, 35 - + 0 - - panel3 + + FloatTool - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + floattoolTitle - - panel2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + panel3 + + 2 - 86, 66 + 86, 64 - 48, 41, 48, 41 + 0, 0, 0, 0 - 39, 24 + 42, 24 2 @@ -902,10 +1115,10 @@ NoControl - 150, 98 + 155, 95 - 267, 24 + 268, 24 10 @@ -925,37 +1138,37 @@ 1 - + None - + True - + NoControl - - 285, 13 + + 286, 10 - + 82, 19 - + 7 - + Качество: - - label3 + + qualityLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 2 @@ -977,10 +1190,10 @@ * Искать всё * - 204, 66 + 204, 64 - 213, 24 + 219, 24 6 @@ -1025,10 +1238,10 @@ Battle-Scarred - 288, 34 + 290, 31 - 129, 24 + 133, 24 6 @@ -1048,106 +1261,106 @@ 4 - + None - + True - + NoControl - - 7, 68 + + 10, 66 - + 79, 19 - + 3 - + StatTrack: - - label12 + + stattrackLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 5 - + None - + True - + NoControl - - 7, 13 + + 10, 9 - + 100, 19 - + 3 - + Тип оружия: - - label1 + + weaponTypeLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 6 - + Bottom, Left - + True - + NoControl - - 7, 101 + + 10, 98 - + 140, 19 - + 9 - + Полное название: - + MiddleCenter - - label4 + + fullnameLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 7 @@ -1262,7 +1475,7 @@ XM1014 - 11, 34 + 14, 31 132, 24 @@ -1285,70 +1498,70 @@ 8 - + None - + True - + NoControl - - 127, 68 + + 128, 66 - + 77, 19 - + 4 - + Ауткамы: - - label11 + + outcomesLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 9 - + None - + True - + NoControl - - 146, 12 + + 148, 10 - + 50, 19 - + 4 - + Скин: - - label2 + + skinLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel6 - + 10 @@ -1367,7 +1580,7 @@ 2, 25 - 427, 25 + 436, 25 0 @@ -1400,7 +1613,7 @@ Inter, 9.75pt - 150, 34 + 152, 31 132, 24 @@ -1414,38 +1627,290 @@ weaponSkinBox - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel6 + + + 12 + + + Top + + + 0, 40 + + + 436, 151 + + + 1 + + + panel6 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 + + + panel16 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel5 + + + 0 + + + panel15 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel5 + + + 1 + + + Fill + + + 0, 191 + + + 436, 267 + + + 0 + + + panel5 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 0 + + + startSearchSingleButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 0 + + + downloadProgressBar + + + FloatToolGUI.CustomProgressBar, FloatTool, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + panel16 + + + 1 + + + searchmodeGreater_btn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 2 + + + searchmodeEqual_btn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 3 + + + searchmodeLess_btn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 4 + + + searchModeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 5 + + + neededfloatLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 6 + + + quantityInput + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 7 + + + skipValueInput + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 8 + + + ascendingCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 9 + + + skipLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 10 + + + countLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 11 + + + searchFloatInput + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 12 + + + sortCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel16 + + + 13 + + + startBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel6 + + panel16 - - 12 + + 14 - - Top + + Fill - - 0, 40 + + 0, 0 - - 427, 151 + + 436, 181 - - 1 + + 12 - - panel6 + + panel16 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel2 + + panel5 - - 1 + + 0 None @@ -1460,10 +1925,10 @@ NoControl - 267, 125 + 276, 114 - 150, 21 + 147, 23 13 @@ -1483,36 +1948,6 @@ 0 - - None - - - Inter, 9.75pt - - - 11, 161 - - - 0, 0, 0, 0 - - - 406, 24 - - - 12 - - - downloadProgressBar - - - FloatToolGUI.CustomProgressBar, FloatTool, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel16 - - - 1 - None @@ -1526,7 +1961,7 @@ NoControl - 180, 29 + 183, 32 77, 32 @@ -1562,7 +1997,7 @@ NoControl - 94, 29 + 97, 32 80, 32 @@ -1598,7 +2033,7 @@ NoControl - 11, 29 + 14, 32 77, 32 @@ -1631,7 +2066,7 @@ NoControl - 7, 7 + 10, 12 119, 19 @@ -1654,37 +2089,37 @@ 5 - + None - + True - + NoControl - - 7, 70 + + 10, 67 - + 121, 19 - + 5 - + Нужный флоат: - - label5 + + neededfloatLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel16 - + 6 @@ -1694,10 +2129,10 @@ Inter, 9.75pt - 131, 98 + 134, 92 - 126, 19 + 132, 19 3 @@ -1721,10 +2156,10 @@ Inter, 9.75pt - 131, 127 + 134, 118 - 126, 19 + 132, 19 4 @@ -1751,7 +2186,7 @@ NoControl - 267, 38 + 276, 39 147, 23 @@ -1774,70 +2209,70 @@ 9 - + None - + True - + NoControl - - 7, 127 + + 10, 118 - + 75, 19 - + 7 - + Пропуск: - - label7 + + skipLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel16 - + 10 - + None - + True - + NoControl - - 7, 98 + + 10, 92 - + 101, 19 - + 6 - + Количество: - - label6 + + countLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel16 - + 11 @@ -1847,13 +2282,13 @@ Inter, 9.75pt - 131, 73 + 134, 70 16 - 126, 16 + 132, 16 2 @@ -1883,7 +2318,7 @@ NoControl - 267, 15 + 276, 15 124, 23 @@ -1919,10 +2354,10 @@ NoControl - 267, 73 + 276, 61 - 150, 50 + 147, 52 0 @@ -1942,28 +2377,134 @@ 14 - - Fill + + craftRangeLabel - - 0, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 427, 191 + + panel15 - - 12 + + 0 - - panel16 + + speedStatusLabel - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + + 1 + + + combinationsStatusLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + + 2 + + + gpuSearch_btn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + + 3 + + + threadsLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + + 4 + + + threadCountInput + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + + 5 + + + Bottom + + + 0, 181 + + + 436, 86 + + + 11 + + + panel15 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel5 - + + 1 + + + Bottom, Left + + + NoControl + + + 272, 3 + + + 161, 49 + + + 11 + + + Диапазон крафта: +0.17 - 0.33 + + + MiddleCenter + + + craftRangeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel15 + + 0 @@ -1976,7 +2517,7 @@ NoControl - 8, 33 + 11, 47 229, 15 @@ -1997,7 +2538,7 @@ panel15 - 0 + 1 True @@ -2009,7 +2550,7 @@ NoControl - 8, 50 + 11, 62 179, 15 @@ -2030,7 +2571,7 @@ panel15 - 1 + 2 Bottom @@ -2048,10 +2589,10 @@ NoControl - 244, 0 + 266, 47 - 173, 71 + 176, 34 3 @@ -2072,43 +2613,43 @@ panel15 - 2 + 3 - + True - + NoControl - - 7, 0 + + 10, 18 - + 79, 19 - + 2 - + Потоков: - - label10 + + threadsLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel15 - - 3 + + 4 Inter, 11.25pt - 92, 0 + 97, 18 120, 22 @@ -2126,55 +2667,7 @@ panel15 - 4 - - - Bottom - - - 0, 191 - - - 427, 76 - - - 11 - - - panel15 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 1 - - - Fill - - - 0, 191 - - - 427, 267 - - - 0 - - - panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 + 5 Left @@ -2183,7 +2676,7 @@ 2, 0 - 427, 458 + 436, 458 8 @@ -2204,10 +2697,10 @@ Fill - 429, 0 + 438, 0 - 469, 458 + 480, 458 9 @@ -2227,6 +2720,36 @@ 198, 16 + + Bottom + + + Inter, 9.75pt + + + 0, 150 + + + 0, 0, 0, 0 + + + 436, 31 + + + 12 + + + downloadProgressBar + + + FloatToolGUI.CustomProgressBar, FloatTool, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + panel16 + + + 1 + True @@ -2237,7 +2760,7 @@ Center - 900, 460 + 920, 460 Inter, 11.249999pt @@ -2488,11 +3011,8 @@ lcEgDkWiqA6FUR2O4OL8XLzY1sG2H8tA/j8A3hg1hV1H6QAAAABJRU5ErkJggg== - - NoControl - - 900, 460 + 920, 460 2, 0, 2, 2 diff --git a/FloatToolGUI/Skin.cs b/FloatToolGUI/Skin.cs index 379c563..3c1c565 100644 --- a/FloatToolGUI/Skin.cs +++ b/FloatToolGUI/Skin.cs @@ -11,6 +11,7 @@ public class Skin public string Name { get; set; } public decimal MinFloat { get; set; } public decimal MaxFloat { get; set; } + public decimal FloatRange { get; set; } public Quality Rarity { get; set; } public Skin(string name, float minWear, float maxWear, Quality rarity) @@ -18,6 +19,7 @@ public Skin(string name, float minWear, float maxWear, Quality rarity) Name = name; MinFloat = (decimal)minWear; MaxFloat = (decimal)maxWear; + FloatRange = MaxFloat - MinFloat; Rarity = rarity; } diff --git a/FloatToolGUI/Utils.cs b/FloatToolGUI/Utils.cs index b9e4ea7..c528e55 100644 --- a/FloatToolGUI/Utils.cs +++ b/FloatToolGUI/Utils.cs @@ -272,17 +272,12 @@ static public string getNextRarity(string rarity) public static string CheckUpdates() { - using (var client = new HttpClient()) + using (var client = new WebClient()) { - client.DefaultRequestHeaders.Add("User-Agent", - "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)"); - using (var response = client.GetAsync("https://api.github.com/repos/prevter/FloatTool-GUI/releases/latest").Result) - { - var json = response.Content.ReadAsStringAsync().Result; - - dynamic release = JsonConvert.DeserializeObject(json); - return release["tag_name"]+"|"+release["assets"][0]["browser_download_url"]; - } + client.Headers.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)"); + string response = client.DownloadString("https://api.github.com/repos/prevter/FloatTool-GUI/releases/latest"); + dynamic release = JsonConvert.DeserializeObject(response); + return release["tag_name"]+"|"+release["assets"][0]["browser_download_url"]; } } diff --git a/Updater/obj/Updater.csproj.nuget.dgspec.json b/Updater/obj/Updater.csproj.nuget.dgspec.json new file mode 100644 index 0000000..7a6afb8 --- /dev/null +++ b/Updater/obj/Updater.csproj.nuget.dgspec.json @@ -0,0 +1,60 @@ +{ + "format": 1, + "restore": { + "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj": {} + }, + "projects": { + "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj", + "projectName": "Updater", + "projectPath": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\VS Components\\NuGetPackages", + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + ], + "configFilePaths": [ + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" + ], + "originalTargetFrameworks": [ + "net472" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Users\\admin\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net472": { + "targetAlias": "net472", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net472": { + "targetAlias": "net472", + "dependencies": { + "System.IO.Compression": { + "target": "Package", + "version": "[4.3.0, )" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.203\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/Updater/obj/Updater.csproj.nuget.g.props b/Updater/obj/Updater.csproj.nuget.g.props new file mode 100644 index 0000000..306459e --- /dev/null +++ b/Updater/obj/Updater.csproj.nuget.g.props @@ -0,0 +1,20 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + $(UserProfile)\.nuget\packages\ + C:\Users\admin\.nuget\packages\;D:\VS Components\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + PackageReference + 5.9.1 + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + \ No newline at end of file diff --git a/Updater/obj/Updater.csproj.nuget.g.targets b/Updater/obj/Updater.csproj.nuget.g.targets new file mode 100644 index 0000000..53cfaa1 --- /dev/null +++ b/Updater/obj/Updater.csproj.nuget.g.targets @@ -0,0 +1,6 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + \ No newline at end of file diff --git a/Updater/obj/project.assets.json b/Updater/obj/project.assets.json new file mode 100644 index 0000000..bdb1732 --- /dev/null +++ b/Updater/obj/project.assets.json @@ -0,0 +1,165 @@ +{ + "version": 3, + "targets": { + ".NETFramework,Version=v4.7.2": { + "System.IO.Compression/4.3.0": { + "type": "package", + "frameworkAssemblies": [ + "System", + "mscorlib" + ], + "compile": { + "ref/net46/System.IO.Compression.dll": {} + }, + "runtime": { + "lib/net46/System.IO.Compression.dll": {} + }, + "runtimeTargets": { + "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll": { + "assetType": "runtime", + "rid": "unix" + }, + "runtimes/win/lib/net46/System.IO.Compression.dll": { + "assetType": "runtime", + "rid": "win" + } + } + } + } + }, + "libraries": { + "System.IO.Compression/4.3.0": { + "sha512": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", + "type": "package", + "path": "system.io.compression/4.3.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net45/_._", + "lib/net46/System.IO.Compression.dll", + "lib/portable-net45+win8+wpa81/_._", + "lib/win8/_._", + "lib/wpa81/_._", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/net45/_._", + "ref/net46/System.IO.Compression.dll", + "ref/netcore50/System.IO.Compression.dll", + "ref/netcore50/System.IO.Compression.xml", + "ref/netcore50/de/System.IO.Compression.xml", + "ref/netcore50/es/System.IO.Compression.xml", + "ref/netcore50/fr/System.IO.Compression.xml", + "ref/netcore50/it/System.IO.Compression.xml", + "ref/netcore50/ja/System.IO.Compression.xml", + "ref/netcore50/ko/System.IO.Compression.xml", + "ref/netcore50/ru/System.IO.Compression.xml", + "ref/netcore50/zh-hans/System.IO.Compression.xml", + "ref/netcore50/zh-hant/System.IO.Compression.xml", + "ref/netstandard1.1/System.IO.Compression.dll", + "ref/netstandard1.1/System.IO.Compression.xml", + "ref/netstandard1.1/de/System.IO.Compression.xml", + "ref/netstandard1.1/es/System.IO.Compression.xml", + "ref/netstandard1.1/fr/System.IO.Compression.xml", + "ref/netstandard1.1/it/System.IO.Compression.xml", + "ref/netstandard1.1/ja/System.IO.Compression.xml", + "ref/netstandard1.1/ko/System.IO.Compression.xml", + "ref/netstandard1.1/ru/System.IO.Compression.xml", + "ref/netstandard1.1/zh-hans/System.IO.Compression.xml", + "ref/netstandard1.1/zh-hant/System.IO.Compression.xml", + "ref/netstandard1.3/System.IO.Compression.dll", + "ref/netstandard1.3/System.IO.Compression.xml", + "ref/netstandard1.3/de/System.IO.Compression.xml", + "ref/netstandard1.3/es/System.IO.Compression.xml", + "ref/netstandard1.3/fr/System.IO.Compression.xml", + "ref/netstandard1.3/it/System.IO.Compression.xml", + "ref/netstandard1.3/ja/System.IO.Compression.xml", + "ref/netstandard1.3/ko/System.IO.Compression.xml", + "ref/netstandard1.3/ru/System.IO.Compression.xml", + "ref/netstandard1.3/zh-hans/System.IO.Compression.xml", + "ref/netstandard1.3/zh-hant/System.IO.Compression.xml", + "ref/portable-net45+win8+wpa81/_._", + "ref/win8/_._", + "ref/wpa81/_._", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._", + "ref/xamarintvos10/_._", + "ref/xamarinwatchos10/_._", + "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll", + "runtimes/win/lib/net46/System.IO.Compression.dll", + "runtimes/win/lib/netstandard1.3/System.IO.Compression.dll", + "system.io.compression.4.3.0.nupkg.sha512", + "system.io.compression.nuspec" + ] + } + }, + "projectFileDependencyGroups": { + ".NETFramework,Version=v4.7.2": [ + "System.IO.Compression >= 4.3.0" + ] + }, + "packageFolders": { + "C:\\Users\\admin\\.nuget\\packages\\": {}, + "D:\\VS Components\\NuGetPackages": {}, + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj", + "projectName": "Updater", + "projectPath": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\VS Components\\NuGetPackages", + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + ], + "configFilePaths": [ + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" + ], + "originalTargetFrameworks": [ + "net472" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Users\\admin\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net472": { + "targetAlias": "net472", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net472": { + "targetAlias": "net472", + "dependencies": { + "System.IO.Compression": { + "target": "Package", + "version": "[4.3.0, )" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.203\\RuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/Updater/obj/project.nuget.cache b/Updater/obj/project.nuget.cache new file mode 100644 index 0000000..d1eb38b --- /dev/null +++ b/Updater/obj/project.nuget.cache @@ -0,0 +1,10 @@ +{ + "version": 2, + "dgSpecHash": "sgvCRoHCtnWRgtIYHvdB3b6bGnL5EXmUpnzwTdnPGt4H/0Tj2IVPuD0FWOcndKQn+eqeTr3gHR5nVa6F29D8mw==", + "success": true, + "projectFilePath": "E:\\PROJECTS\\FloatTool-GUI\\Updater\\Updater.csproj", + "expectedPackageFiles": [ + "C:\\Users\\admin\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file