Update V1.5.4

Potato-Y · Aug 21, 2020 · 55f9b61 · 55f9b61
1 parent cec9990
commit 55f9b61
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Game Utility App/Function/Calculation/TeamGameCalculation/TeamGameCalculationOffline.cs b/Game Utility App/Function/Calculation/TeamGameCalculation/TeamGameCalculationOffline.cs
@@ -203,7 +203,7 @@ private void win_Click(object sender, EventArgs e)
                     savedata += "\r\n";
                 }
                 match++;
-                textBox1.Text += match + "번째 판, " + comboBox1.Text + " 승리";
+                textBox1.Text += DateTime.Now.ToString("[hh시mm분] ") + match + "번째 판, " + comboBox1.Text + " '승리'";
                 myscore++;
                 if (myscore >= 10)
                 {
@@ -235,7 +235,7 @@ private void lose_Click(object sender, EventArgs e)
                     savedata += "\r\n";
                 }
                 match++;
-                textBox2.Text += match + "번째 판, " + comboBox1.Text + " '승리'";
+                textBox2.Text += DateTime.Now.ToString("[hh시mm분] ") + match + "번째 판, " + comboBox1.Text + " '승리'";
                 yourscore++;
                 label5.Text = Convert.ToString(yourscore);
                 label8.Text = Convert.ToString(match);

diff --git a/Game Utility App/Function/Calculation/broadcast/BroadcastCalculation.cs b/Game Utility App/Function/Calculation/broadcast/BroadcastCalculation.cs
@@ -205,11 +205,11 @@ private void Save_Content_Click(object sender, EventArgs e)
         private void Win_Button_Click(object sender, EventArgs e)
         {
             myTeamScore++;
-            if (myTeamScore != 0 || rivalTeamScore != 0)
+            if (myTeamScore != 0 && rivalTeamScore != 0)
             {
                 textBox2.Text += "\r\n";
             }
-            textBox2.Text += comboBox1.Text + " '승리' " + myTeamScore + ":" + rivalTeamScore;
+            textBox2.Text += DateTime.Now.ToString("[hh시mm분]") + comboBox1.Text + " '승리' " + myTeamScore + ":" + rivalTeamScore;
             this.textBox2.SelectionStart = textBox2.Text.Length;
             this.textBox2.ScrollToCaret();
 
@@ -218,11 +218,11 @@ private void Win_Button_Click(object sender, EventArgs e)
         private void lose_Button_Click(object sender, EventArgs e)
         {
             rivalTeamScore++;
-            if (myTeamScore != 0 || rivalTeamScore != 0)
+            if (myTeamScore != 0 && rivalTeamScore != 0)
             {
                 textBox2.Text += "\r\n";
             }
-            textBox2.Text += comboBox1.Text + " '패배' " + myTeamScore + ":" + rivalTeamScore;
+            textBox2.Text += DateTime.Now.ToString("[hh시mm분]") + comboBox1.Text + " '패배' " + myTeamScore + ":" + rivalTeamScore;
             this.textBox2.SelectionStart = textBox2.Text.Length;
             this.textBox2.ScrollToCaret();
 

diff --git a/Game Utility App/MainForm/Setting/MainSetting.Designer.cs b/Game Utility App/MainForm/Setting/MainSetting.Designer.cs
diff --git a/Game Utility App/Notice/Patch notes.Designer.cs b/Game Utility App/Notice/Patch notes.Designer.cs
diff --git a/Game Utility App/Properties/AssemblyInfo.cs b/Game Utility App/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.5.4.0")]
+[assembly: AssemblyFileVersion("1.5.4.0")]