diff --git a/.gitignore b/.gitignore index 2e96563..0af85b1 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ record # Visual Studio cache/options directory .vs/ +BinaryBackup/TODO.txt diff --git a/BinaryBackup/GfExp1.2.2.0.exe b/BinaryBackup/GfExp1.2.2.0.exe new file mode 100644 index 0000000..fdca1ef Binary files /dev/null and b/BinaryBackup/GfExp1.2.2.0.exe differ diff --git a/BinaryBackup/GfExp1.2.2.1.exe b/BinaryBackup/GfExp1.2.2.1.exe new file mode 100644 index 0000000..80400f8 Binary files /dev/null and b/BinaryBackup/GfExp1.2.2.1.exe differ diff --git a/BinaryBackup/GfExp1.2.3.0.exe b/BinaryBackup/GfExp1.2.3.0.exe new file mode 100644 index 0000000..2f3db65 Binary files /dev/null and b/BinaryBackup/GfExp1.2.3.0.exe differ diff --git a/BinaryBackup/GfExp1.2.4.0.exe b/BinaryBackup/GfExp1.2.4.0.exe new file mode 100644 index 0000000..3de05f3 Binary files /dev/null and b/BinaryBackup/GfExp1.2.4.0.exe differ diff --git a/GfExpCSharp/Form1.Designer.cs b/GfExpCSharp/Form1.Designer.cs index 4908224..ae2dfd8 100644 --- a/GfExpCSharp/Form1.Designer.cs +++ b/GfExpCSharp/Form1.Designer.cs @@ -195,6 +195,7 @@ private void InitializeComponent() this.InitialLv.Size = new System.Drawing.Size(121, 23); this.InitialLv.TabIndex = 0; this.InitialLv.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + this.InitialLv.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.InitialLv_KeyPress); // // label1 // @@ -329,7 +330,7 @@ private void InitializeComponent() this.TargetLv.MaxDropDownItems = 5; this.TargetLv.Name = "TargetLv"; this.TargetLv.Size = new System.Drawing.Size(121, 23); - this.TargetLv.TabIndex = 3; + this.TargetLv.TabIndex = 2; // // HasExp // @@ -337,7 +338,7 @@ private void InitializeComponent() this.HasExp.Location = new System.Drawing.Point(150, 96); this.HasExp.Name = "HasExp"; this.HasExp.Size = new System.Drawing.Size(121, 25); - this.HasExp.TabIndex = 2; + this.HasExp.TabIndex = 1; // // label4 // @@ -367,7 +368,7 @@ private void InitializeComponent() this.Map.Location = new System.Drawing.Point(150, 196); this.Map.Name = "Map"; this.Map.Size = new System.Drawing.Size(121, 23); - this.Map.TabIndex = 4; + this.Map.TabIndex = 3; this.Map.SelectedIndexChanged += new System.EventHandler(this.Map_SelectedIndexChanged); // // label5 @@ -395,7 +396,7 @@ private void InitializeComponent() this.ExpandTimes.Location = new System.Drawing.Point(510, 50); this.ExpandTimes.Name = "ExpandTimes"; this.ExpandTimes.Size = new System.Drawing.Size(50, 23); - this.ExpandTimes.TabIndex = 1; + this.ExpandTimes.TabIndex = 4; this.ExpandTimes.Tag = ""; // // label6 @@ -414,7 +415,7 @@ private void InitializeComponent() this.BonusCheck.Location = new System.Drawing.Point(490, 202); this.BonusCheck.Name = "BonusCheck"; this.BonusCheck.Size = new System.Drawing.Size(18, 17); - this.BonusCheck.TabIndex = 5; + this.BonusCheck.TabIndex = 6; this.BonusCheck.UseVisualStyleBackColor = true; // // CalculateButton @@ -580,7 +581,7 @@ private void InitializeComponent() this.BattleTimes.Location = new System.Drawing.Point(510, 100); this.BattleTimes.Name = "BattleTimes"; this.BattleTimes.Size = new System.Drawing.Size(50, 23); - this.BattleTimes.TabIndex = 121; + this.BattleTimes.TabIndex = 5; this.BattleTimes.Tag = ""; // // label8 @@ -657,6 +658,7 @@ private void InitializeComponent() this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(201, 42); this.button1.TabIndex = 129; + this.button1.TabStop = false; this.button1.Text = "不清楚自己该刷哪个图？"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); @@ -745,6 +747,7 @@ private void InitializeComponent() this.buttonHasExp.Name = "buttonHasExp"; this.buttonHasExp.Size = new System.Drawing.Size(97, 34); this.buttonHasExp.TabIndex = 135; + this.buttonHasExp.TabStop = false; this.buttonHasExp.Text = "已有经验"; this.buttonHasExp.UseVisualStyleBackColor = false; this.buttonHasExp.MouseDown += new System.Windows.Forms.MouseEventHandler(this.button2_MouseDown); diff --git a/GfExpCSharp/Form1.cs b/GfExpCSharp/Form1.cs index a1b795c..c103d10 100644 --- a/GfExpCSharp/Form1.cs +++ b/GfExpCSharp/Form1.cs @@ -154,10 +154,10 @@ private void initialMapInfo() mapInfo[4, 2] = 2; mapInfo[5, 0] = 80; mapInfo[5, 1] = 380; - mapInfo[5, 2] = 4; + mapInfo[5, 2] = 5; mapInfo[6, 0] = 93; mapInfo[6, 1] = 430; - mapInfo[6, 2] = 2; + mapInfo[6, 2] = 3; } int initialLv, hasExp, targetLv, mapSelect, expandTimes, battleTimes; @@ -231,6 +231,11 @@ private void button2_MouseDown(object sender, MouseEventArgs e) buttonHasExp.Text = hasExpText[choice]; } + private void InitialLv_KeyPress(object sender, KeyPressEventArgs e) + { + + } + private bool setParameters() { initialLv = Convert.ToInt32(InitialLv.Text); @@ -254,7 +259,7 @@ private bool setParameters() BattleTimes.Text = Convert.ToString(battleTimes); bonusCheck = BonusCheck.Checked; if (initialLv >= targetLv) return false; - if (hasExp < 0 || hasExp > expByLv[initialLv] || hasExp < 0) return false; + if (hasExp < 0 || hasExp >= expByLv[initialLv]) return false; return true; } @@ -274,10 +279,26 @@ private void calTimes(int decreaseLv, double expEachBattle) { int i; double nowExp = hasExp; + int gap = initialLv - decreaseLv; + double x; + if (gap < 0) x = 1; + else if (gap < 10) x = 0.8; + else if (gap < 20) x = 0.6; + else if (gap < 30) x = 0.4; + else if (gap < 40) x = 0.2; + else x = 0; while (nowExp < expByLv[initialLv]) { - nowExp += expEachBattle; - nextLvTimes++; + if (x != 0) + { + nowExp += expEachBattle * x; + nextLvTimes++; + } + else + { + nowExp += 5; + nextLvTimes++; + } } nowExp = hasExp; @@ -285,57 +306,57 @@ private void calTimes(int decreaseLv, double expEachBattle) { nowExp += expEachBattle; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv; i < decreaseLv + 10 && i < targetLv;) + for (; i < decreaseLv + 10 && i < targetLv;) { nowExp += expEachBattle * 0.8; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 10; i < decreaseLv + 20 && i < targetLv;) + for (; i < decreaseLv + 20 && i < targetLv;) { nowExp += expEachBattle * 0.6; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 20; i < decreaseLv + 30 && i < targetLv;) + for (; i < decreaseLv + 30 && i < targetLv;) { nowExp += expEachBattle * 0.4; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 30; i < decreaseLv + 40 && i < targetLv;) + for (; i < decreaseLv + 40 && i < targetLv;) { nowExp += expEachBattle * 0.2; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 40; i < targetLv;) + for (; i < targetLv;) { nowExp += 5; normalTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; @@ -347,57 +368,57 @@ private void calTimes(int decreaseLv, double expEachBattle) { nowExp += expEachBattle * 1.2; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv; i < decreaseLv + 10 && i < targetLv;) + for (; i < decreaseLv + 10 && i < targetLv;) { nowExp += expEachBattle * 0.8 * 1.2; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 10; i < decreaseLv + 20 && i < targetLv;) + for (; i < decreaseLv + 20 && i < targetLv;) { nowExp += expEachBattle * 0.6 * 1.2; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 20; i < decreaseLv + 30 && i < targetLv;) + for (; i < decreaseLv + 30 && i < targetLv;) { nowExp += expEachBattle * 0.4 * 1.2; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 30; i < decreaseLv + 40 && i < targetLv;) + for (; i < decreaseLv + 40 && i < targetLv;) { nowExp += expEachBattle * 0.2 * 1.2; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 40; i < targetLv;) + for (; i < targetLv;) { nowExp += 5; leaderTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; @@ -409,57 +430,57 @@ private void calTimes(int decreaseLv, double expEachBattle) { nowExp += expEachBattle * 1.3; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv; i < decreaseLv + 10 && i < targetLv;) + for (; i < decreaseLv + 10 && i < targetLv;) { nowExp += expEachBattle * 0.8 * 1.3; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 10; i < decreaseLv + 20 && i < targetLv;) + for (; i < decreaseLv + 20 && i < targetLv;) { nowExp += expEachBattle * 0.6 * 1.3; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 20; i < decreaseLv + 30 && i < targetLv;) + for (; i < decreaseLv + 30 && i < targetLv;) { nowExp += expEachBattle * 0.4 * 1.3; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 30; i < decreaseLv + 40 && i < targetLv;) + for (; i < decreaseLv + 40 && i < targetLv;) { nowExp += expEachBattle * 0.2 * 1.3; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 40; i < targetLv;) + for (; i < targetLv;) { nowExp += 5; mvpTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; @@ -471,57 +492,57 @@ private void calTimes(int decreaseLv, double expEachBattle) { nowExp += expEachBattle * 1.2 * 1.3; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv; i < decreaseLv + 10 && i < targetLv;) + for (; i < decreaseLv + 10 && i < targetLv;) { nowExp += expEachBattle * 0.8 * 1.2 * 1.3; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 10; i < decreaseLv + 20 && i < targetLv;) + for (; i < decreaseLv + 20 && i < targetLv;) { nowExp += expEachBattle * 0.6 * 1.2 * 1.3; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 20; i < decreaseLv + 30 && i < targetLv;) + for (; i < decreaseLv + 30 && i < targetLv;) { nowExp += expEachBattle * 0.4 * 1.2 * 1.3; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 30; i < decreaseLv + 40 && i < targetLv;) + for (; i < decreaseLv + 40 && i < targetLv;) { nowExp += expEachBattle * 0.2 * 1.2 *1.3; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; } } - for (i = decreaseLv + 40; i < targetLv;) + for (; i < targetLv;) { nowExp += 5; lmTimes++; - if (nowExp >= expByLv[i]) + while (nowExp >= expByLv[i]) { nowExp -= expByLv[i]; ++i; diff --git a/GfExpCSharp/Properties/AssemblyInfo.cs b/GfExpCSharp/Properties/AssemblyInfo.cs index 9927385..7f02153 100644 --- a/GfExpCSharp/Properties/AssemblyInfo.cs +++ b/GfExpCSharp/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] +[assembly: AssemblyVersion("1.2.4.0")] +[assembly: AssemblyFileVersion("1.2.4.0")] diff --git a/GfExpCSharp/bin/Debug/GfExp.exe b/GfExpCSharp/bin/Debug/GfExp.exe index bb77898..4e99215 100644 Binary files a/GfExpCSharp/bin/Debug/GfExp.exe and b/GfExpCSharp/bin/Debug/GfExp.exe differ diff --git a/GfExpCSharp/bin/Debug/GfExp.pdb b/GfExpCSharp/bin/Debug/GfExp.pdb index 0952d5d..571001b 100644 Binary files a/GfExpCSharp/bin/Debug/GfExp.pdb and b/GfExpCSharp/bin/Debug/GfExp.pdb differ diff --git a/GfExpCSharp/bin/Release/GfExp.exe b/GfExpCSharp/bin/Release/GfExp.exe index a0c882c..3de05f3 100644 Binary files a/GfExpCSharp/bin/Release/GfExp.exe and b/GfExpCSharp/bin/Release/GfExp.exe differ diff --git a/GfExpCSharp/bin/Release/GfExp.pdb b/GfExpCSharp/bin/Release/GfExp.pdb index d350fb4..870de27 100644 Binary files a/GfExpCSharp/bin/Release/GfExp.pdb and b/GfExpCSharp/bin/Release/GfExp.pdb differ diff --git a/GfExpCSharp/bin/Release/GfExp.vshost.exe.manifest b/GfExpCSharp/bin/Release/GfExp.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/GfExpCSharp/bin/Release/GfExp.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/GfExpCSharp/obj/Debug/GfExp.exe b/GfExpCSharp/obj/Debug/GfExp.exe index bb77898..4e99215 100644 Binary files a/GfExpCSharp/obj/Debug/GfExp.exe and b/GfExpCSharp/obj/Debug/GfExp.exe differ diff --git a/GfExpCSharp/obj/Debug/GfExp.pdb b/GfExpCSharp/obj/Debug/GfExp.pdb index 0952d5d..571001b 100644 Binary files a/GfExpCSharp/obj/Debug/GfExp.pdb and b/GfExpCSharp/obj/Debug/GfExp.pdb differ diff --git a/GfExpCSharp/obj/Debug/GfExpCSharp.csproj.GenerateResource.Cache b/GfExpCSharp/obj/Debug/GfExpCSharp.csproj.GenerateResource.Cache index 406f3ed..396be9a 100644 Binary files a/GfExpCSharp/obj/Debug/GfExpCSharp.csproj.GenerateResource.Cache and b/GfExpCSharp/obj/Debug/GfExpCSharp.csproj.GenerateResource.Cache differ diff --git a/GfExpCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/GfExpCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 5bd5d71..e3606cf 100644 Binary files a/GfExpCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/GfExpCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/GfExpCSharp/obj/Release/GfExp.exe b/GfExpCSharp/obj/Release/GfExp.exe index a0c882c..3de05f3 100644 Binary files a/GfExpCSharp/obj/Release/GfExp.exe and b/GfExpCSharp/obj/Release/GfExp.exe differ diff --git a/GfExpCSharp/obj/Release/GfExp.pdb b/GfExpCSharp/obj/Release/GfExp.pdb index d350fb4..870de27 100644 Binary files a/GfExpCSharp/obj/Release/GfExp.pdb and b/GfExpCSharp/obj/Release/GfExp.pdb differ diff --git a/GfExpCSharp/obj/Release/GfExpCSharp.csproj.FileListAbsolute.txt b/GfExpCSharp/obj/Release/GfExpCSharp.csproj.FileListAbsolute.txt index b4e215b..f189d31 100644 --- a/GfExpCSharp/obj/Release/GfExpCSharp.csproj.FileListAbsolute.txt +++ b/GfExpCSharp/obj/Release/GfExpCSharp.csproj.FileListAbsolute.txt @@ -7,3 +7,4 @@ F:\Miscellaneous\GfExpCSharp\GfExpCSharp\obj\Release\GfExp.Properties.Resources. F:\Miscellaneous\GfExpCSharp\GfExpCSharp\obj\Release\GfExpCSharp.csproj.GenerateResource.Cache F:\Miscellaneous\GfExpCSharp\GfExpCSharp\obj\Release\GfExp.exe F:\Miscellaneous\GfExpCSharp\GfExpCSharp\obj\Release\GfExp.pdb +F:\Miscellaneous\GfExpCSharp\GfExpCSharp\obj\Release\GfExpCSharp.csprojResolveAssemblyReference.cache diff --git a/GfExpCSharp/obj/Release/GfExpCSharp.csproj.GenerateResource.Cache b/GfExpCSharp/obj/Release/GfExpCSharp.csproj.GenerateResource.Cache index fc23d68..87dce1c 100644 Binary files a/GfExpCSharp/obj/Release/GfExpCSharp.csproj.GenerateResource.Cache and b/GfExpCSharp/obj/Release/GfExpCSharp.csproj.GenerateResource.Cache differ diff --git a/GfExpCSharp/obj/Release/GfExpCSharp.csprojResolveAssemblyReference.cache b/GfExpCSharp/obj/Release/GfExpCSharp.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..5a1980c Binary files /dev/null and b/GfExpCSharp/obj/Release/GfExpCSharp.csprojResolveAssemblyReference.cache differ