修复切换职业导致的元素循环bug

inkitter · Oct 23, 2015 · 550a89a · 550a89a
1 parent 213e689
commit 550a89a
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 41 deletions.
diff --git a/Timer/Timer/bin/Release/D3COE Timer.application b/Timer/Timer/bin/Release/D3COE Timer.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>HFp227Csn3GtpOZQnwqxJCsdgcjeTbXH12mVzg+5DIw=</dsig:DigestValue>
+        <dsig:DigestValue>UoWQV8aGMP4STarLaxhS3zD701A8SrGJPh+6I3n3+LA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/bin/Release/D3COE Timer.exe b/Timer/Timer/bin/Release/D3COE Timer.exe
diff --git a/Timer/Timer/bin/Release/D3COE Timer.exe.manifest b/Timer/Timer/bin/Release/D3COE Timer.exe.manifest
@@ -50,7 +50,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>yNRK221O+RdZIxOm93aCpEE/R5HZHL0fAmvjt3izxY4=</dsig:DigestValue>
+        <dsig:DigestValue>jxPSDevwNlp83tOU4tQMWJ5sJBVxS2RfrELp36SEGiw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/bin/Release/D3COE Timer.pdb b/Timer/Timer/bin/Release/D3COE Timer.pdb
diff --git a/Timer/Timer/bin/Release/D3COE Timer.vshost.application b/Timer/Timer/bin/Release/D3COE Timer.vshost.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>cZOHiMhC7JMZNmiKHs0TKitPMX0dUv8An609H3/3L0U=</dsig:DigestValue>
+        <dsig:DigestValue>fTE0+cWYS5iAP61+jD5g/Oo0uQPdqsy53uc/LK9hzWk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/bin/Release/D3COE Timer.vshost.exe.manifest b/Timer/Timer/bin/Release/D3COE Timer.vshost.exe.manifest
@@ -50,7 +50,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>TGY0AE7BkHLA1wbR2QJ9aZhVVWNY1KKRJyXgMLurlGM=</dsig:DigestValue>
+        <dsig:DigestValue>D9UXm3WWnNxDJSsssRkah9FoWS8dnGMi3T7EioIqm58=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/bin/Release/D3COE.ini b/Timer/Timer/bin/Release/D3COE.ini
@@ -4,4 +4,4 @@ Y=449
 [KeyPress]
 HotKey=F11
 [Char]
-Char=0
+Char=1
diff --git a/Timer/Timer/bin/Release/app.publish/D3COE Timer.exe b/Timer/Timer/bin/Release/app.publish/D3COE Timer.exe
diff --git a/Timer/Timer/bin/Release/冰霜.wav b/Timer/Timer/bin/Release/冰霜.wav
diff --git a/Timer/Timer/bin/Release/奥术.wav b/Timer/Timer/bin/Release/奥术.wav
diff --git a/Timer/Timer/bin/Release/毒性.wav b/Timer/Timer/bin/Release/毒性.wav
diff --git a/Timer/Timer/bin/Release/火焰.wav b/Timer/Timer/bin/Release/火焰.wav
diff --git a/Timer/Timer/bin/Release/物理.wav b/Timer/Timer/bin/Release/物理.wav
diff --git a/Timer/Timer/bin/Release/神圣.wav b/Timer/Timer/bin/Release/神圣.wav
diff --git a/Timer/Timer/bin/Release/闪电.wav b/Timer/Timer/bin/Release/闪电.wav
diff --git a/Timer/Timer/frmMain.cs b/Timer/Timer/frmMain.cs
@@ -104,7 +104,7 @@ public enum LWA { ColorKey = 0x1, Alpha = 0x2 }
         private Thread tPRG=null;
         static int iCOEi = 0; //序列索引号
         static int iCOEmax = 3;
-        static int iHotkeyi = 202;
+        //static int iHotkeyi = 202;
         static int[] iCOEc = new int[] { 0, 1, 2, 4, 5 }; //0=奥术 1=冰霜 2=火焰 3=神圣 4=闪电 5=物理 6=毒性
         //static Boolean bShowBtn=true;
         static int iTime,iTimeCount;
@@ -120,7 +120,7 @@ public frmMain()
         private void frmMain_Load(object sender, EventArgs e)
         {
             iniread();
-            btnReset_Click(null, null);
+            sReset();
             Keys key = (Keys)Enum.Parse(typeof(Keys), txtHotKey.Text);
             fhotkeyChange();
             tPRG = new Thread(new ThreadStart(tPRGsub));
@@ -130,6 +130,20 @@ private void frmMain_Load(object sender, EventArgs e)
             labUserInput.Parent = prgFront;
         }//窗口载入
 
+        private void btnReset_Click(object sender, EventArgs e)
+        {
+            if (iCOEi >= iCOEmax) { iCOEi = 0; } else { iCOEi = iCOEi + 1; }
+            sReset();
+        }        //重置按钮
+
+        private void sReset()
+        {
+            prgFront.Left = 0;
+            iTime = System.Environment.TickCount;
+            iTimeCount = 1;
+            sCOElab();
+        }
+
         private void tPRGsub() //标签与进度条线程
         {
             if (prgFront.InvokeRequired)
@@ -148,11 +162,10 @@ private void tPRGsub() //标签与进度条线程
                     }
                     else
                     {
-                        iCOEi = iCOEi + 1;
-                        if (iCOEi > iCOEmax) { iCOEi = 0; }
                         sCOElab();  //推送到label显示系别
                         prgFront.Left = 0;
                         iTimeCount = iTimeCount + 1;
+                        if (iCOEi > iCOEmax) { iCOEi = 0; } else { iCOEi++; }
                     }
                     Application.DoEvents();
                 }
@@ -193,9 +206,9 @@ private void lstChar_SelectedIndexChanged(object sender, EventArgs e)
                         break;
                 }
                 iCOEi = 0;
+                sReset();
             }
             catch { return; }
-            btnReset_Click(null, null);
         }//listview切换职业循环
         private void sCOElab()
         {
@@ -268,15 +281,6 @@ private void sSetColorSound(string COEtype, Color prgFrontColor, Color prgBackCo
             labUserInput.ForeColor = prgBackColor;
             prgFront.BackColor = prgFrontColor;
             prgBack.BackColor = prgBackColor;
-            //if (prgBack.InvokeRequired)
-            //{
-            //    DoDataDelegate d = tPRGsub;
-            //    prgBack.Invoke(d);
-            //}
-            //else
-            //{
-            //    prgBack.BackColor = prgBackColor;
-            //}
         }//设定颜色、声音过程
         private void fPlaySound(string playtype)     //声音播放
         {
@@ -419,14 +423,6 @@ private void btnCilckThrough_Click(object sender, EventArgs e) //点击穿越与
                 //this.Opacity = 0.8;
             }
         }
-        private void btnReset_Click(object sender, EventArgs e)
-        {
-            prgFront.Left = 0;
-            iTime = System.Environment.TickCount;
-            iTimeCount = 1;
-            sCOElab();
-            if (iCOEi == iCOEmax) { iCOEi = 0; } else { iCOEi = iCOEi + 1; }
-        }        //重置按钮
 
         private void exitToolStripMenuItem_Click(object sender, EventArgs e)
         {

diff --git a/Timer/Timer/obj/Release/D3COE Timer.application b/Timer/Timer/obj/Release/D3COE Timer.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>HFp227Csn3GtpOZQnwqxJCsdgcjeTbXH12mVzg+5DIw=</dsig:DigestValue>
+        <dsig:DigestValue>UoWQV8aGMP4STarLaxhS3zD701A8SrGJPh+6I3n3+LA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/obj/Release/D3COE Timer.csproj.FileListAbsolute.txt b/Timer/Timer/obj/Release/D3COE Timer.csproj.FileListAbsolute.txt
@@ -23,15 +23,15 @@ C:\Users\inkit\Documents\GitHubVisualStudio\D3COE-Timer\Timer\Timer\obj\Release\
 C:\Users\inkit\Documents\GitHubVisualStudio\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.csproj.GenerateResource.Cache
 C:\Users\inkit\Documents\GitHubVisualStudio\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.exe.manifest
 C:\Users\inkit\Documents\GitHubVisualStudio\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.application
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe.config
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.exe
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.pdb
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe.manifest
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.application
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.pdb
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\Timer.frmMain.resources
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE.Properties.Resources.resources
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.csproj.GenerateResource.Cache
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.exe.manifest
-C:\Users\Inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.application
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe.config
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe.manifest
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.application
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.exe
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\bin\Release\D3COE Timer.pdb
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\Timer.frmMain.resources
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE.Properties.Resources.resources
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.csproj.GenerateResource.Cache
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.exe.manifest
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.application
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.exe
+C:\Users\inkit\Documents\GitHub\D3COE-Timer\Timer\Timer\obj\Release\D3COE Timer.pdb
diff --git a/Timer/Timer/obj/Release/D3COE Timer.csproj.GenerateResource.Cache b/Timer/Timer/obj/Release/D3COE Timer.csproj.GenerateResource.Cache
diff --git a/Timer/Timer/obj/Release/D3COE Timer.exe b/Timer/Timer/obj/Release/D3COE Timer.exe
diff --git a/Timer/Timer/obj/Release/D3COE Timer.exe.manifest b/Timer/Timer/obj/Release/D3COE Timer.exe.manifest
@@ -50,7 +50,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>yNRK221O+RdZIxOm93aCpEE/R5HZHL0fAmvjt3izxY4=</dsig:DigestValue>
+        <dsig:DigestValue>jxPSDevwNlp83tOU4tQMWJ5sJBVxS2RfrELp36SEGiw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Timer/Timer/obj/Release/D3COE Timer.pdb b/Timer/Timer/obj/Release/D3COE Timer.pdb
diff --git a/Timer/Timer/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Timer/Timer/obj/Release/DesignTimeResolveAssemblyReferences.cache