Skip to content

Commit

Permalink
Merge pull request #19 from Titytus/tien
Browse files Browse the repository at this point in the history
Tien
  • Loading branch information
TienNHM authored May 23, 2020
2 parents 755e4bf + 7d71345 commit e721308
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 3 deletions.
1 change: 0 additions & 1 deletion Characters/Coin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public override void Draw(Graphics gp)
if (index >= 7) Location = GetLocation();
else Location.X = frmMain.iWidth;
if (index != 8) bVisible = true;
Location.Y += random.Next(-20, 20);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion OGGY.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<MapFileExtensions>false</MapFileExtensions>
<SupportUrl>https://www.facebook.com/01.tien</SupportUrl>
<ProductName>OGGY</ProductName>
<PublisherName>MTQK</PublisherName>
Expand Down
2 changes: 2 additions & 0 deletions UI/EndGame.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions UI/EndGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,11 @@ private void picClose_Click(object sender, EventArgs e)
{
this.Dispose();
}

private void EndGame_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.KeyCode == Keys.Escape || e.KeyCode == Keys.Enter)
this.Dispose();
}
}
}
17 changes: 16 additions & 1 deletion UI/frmMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Drawing;
using System.Media;
using System.Windows.Forms;
using System.Windows.Input;

namespace OGGY
{
Expand Down Expand Up @@ -39,7 +40,10 @@ private void PlayFXMucsic()
picFXMusic.BackgroundImage = OGGY.Properties.Resources.opt_nomusic;
}

private void PicExit_Click(object sender, EventArgs e)
/// <summary>
/// Khi nguoi choi muon thoat game
/// </summary>
private void Exit()
{
DialogResult traLoi = MessageBox.Show("Bạn muốn thoát game chứ?", "Xác nhận", MessageBoxButtons.YesNo);
if (traLoi == DialogResult.Yes)
Expand All @@ -56,6 +60,11 @@ private void PicExit_Click(object sender, EventArgs e)
}
}

private void PicExit_Click(object sender, EventArgs e)
{
Exit();
}

private void PicInfo_Click(object sender, EventArgs e)
{
string info = "\t\t GAME OGGY \n\n\n (c) Nguyễn Huỳnh Minh Tiến & Hồ Quốc Khánh \n\n\t\t FIT-HCMUTE";
Expand Down Expand Up @@ -115,5 +124,11 @@ private void EventClick(object sender, MouseEventArgs e)
lblHighScore.Text = iHighScore.ToString();
}
}

private void frmMenu_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.KeyCode == Keys.Escape)
Exit();
}
}
}
2 changes: 2 additions & 0 deletions UI/frmMenu.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added publish.rar
Binary file not shown.

0 comments on commit e721308

Please sign in to comment.