✨ (mine-sweeper): add elapse time show

Author: yuanyu90221

internal/game/game.go

@@ -1,5 +1,7 @@
 package game
 
+import "time"
+
 // Cell - 單一格子
 type Cell struct {
 	IsMine         bool // 是否為地雷
@@ -21,10 +23,10 @@ type Board struct {
 
 // Game - 遊戲物件
 type Game struct {
-	Board       *Board // 棋盤物件
-	IsGameOver  bool   // 是否遊戲結束
-	IsPlayerWin bool   // 玩家是否獲勝
-
+	Board       *Board    // 棋盤物件
+	IsGameOver  bool      // 是否遊戲結束
+	IsPlayerWin bool      // 玩家是否獲勝
+	startTime   time.Time // 遊戲開始時間
 }
 
 // coord - 紀錄該格字座標
@@ -46,6 +48,7 @@ func NewGame(rows, cols, mineCount int) *Game {
 		Board:       board,
 		IsGameOver:  false,
 		IsPlayerWin: false,
+		startTime:   time.Now().UTC(),
 	}
 }
 
@@ -251,3 +254,8 @@ func (board *Board) CheckIsPlayerWin() bool {
 func (board *Board) GetRemainingFlags() int {
 	return board.remainingFlags
 }
+
+// GetElapsedTime - 取出從 startTime 之後到目前為止的時間
+func (g *Game) GetElapsedTime() int {
+	return int(time.Since(g.startTime).Seconds())
+}

internal/layout/font.go

@@ -33,16 +33,17 @@ const (
 	IsMine = iota + 100
 	IsFlag
 	IsButtonIcon
+	IsClock
 )
 
 func getTileColor(value int) color.Color {
 	switch value {
 	case 0:
 		return color.RGBA{0x77, 0x6e, 0x65, 0xff}
-	case IsFlag:
-		return color.RGBA{0xf9, 0xf6, 0xf2, 0xff}
 	case IsMine, IsButtonIcon:
 		return color.Black
+	case IsClock, IsFlag:
+		return color.RGBA{0xff, 0, 0, 0xff}
 	default:
 		return color.RGBA{0xf9, 0xf6, 0xf2, 0xff}
 	}

internal/layout/layout.go

@@ -21,7 +21,7 @@ const (
 	PaddingY     = 20 // 面板
 	ScreenHeight = PanelHeight + gridSize*Rows
 	ScreenWidth  = gridSize * Cols
-	MineCounts   = 9
+	MineCounts   = 10
 )
 
 var buttonRectRelativePos = image.Rect(0, 0, 32, 32) // 一個方格大小的　button
@@ -30,9 +30,12 @@ type Coord struct {
 	Row int
 	Col int
 }
+
+// 遊戲畫面狀態
 type GameLayout struct {
-	gameInstance *game.Game
-	ClickCoord   *Coord
+	gameInstance *game.Game //　遊戲物件
+	ClickCoord   *Coord     //　使用者點擊座標
+	elapsedTime  int        // 經過時間
 }
 
 func NewGameLayout(gameInstance *game.Game) *GameLayout {
@@ -50,6 +53,10 @@ func (g *GameLayout) Update() error {
 			g.Restart()
 		}
 	}
+	// 當遊戲還沒停止時，就更新經過時間
+	if !g.gameInstance.IsGameOver && !g.gameInstance.IsPlayerWin {
+		g.elapsedTime = g.gameInstance.GetElapsedTime()
+	}
 	// 當狀態為遊戲結束
 	if g.gameInstance.IsGameOver || g.gameInstance.IsPlayerWin {
 		return nil
@@ -163,7 +170,7 @@ func (g *GameLayout) drawFlag(screen *ebiten.Image, row, col int) {
 	textXPos := col*gridSize + (gridSize)/2
 	textYPos := PanelHeight + row*gridSize + (gridSize)/2
 	textOpts := &text.DrawOptions{}
-	textOpts.ColorScale.ScaleWithColor(getTileColor(IsFlag))
+	textOpts.ColorScale.ScaleWithColor(getTileColor(-1))
 	textOpts.PrimaryAlign = text.AlignCenter
 	textOpts.SecondaryAlign = text.AlignCenter
 	textOpts.GeoM.Translate(float64(textXPos), float64(textYPos))
@@ -230,6 +237,8 @@ func (g *GameLayout) drawGamePanel(screen *ebiten.Image) {
 	g.drawRemainingFlagInfo(screen)
 	// 畫顯示狀態　button
 	g.drawButtonWithIcon(screen, emojiIcon)
+	// 畫出經過時間
+	g.drawElaspedTimeInfo(screen)
 }
 
 // drawButtonWithIcon　- 繪製 buttonIcon
@@ -279,13 +288,42 @@ func (g *GameLayout) drawRemainingFlagInfo(screen *ebiten.Image) {
 	emojiXPos := len(emojiValue)
 	emojiYPos := PaddingY
 	emojiOpts := &text.DrawOptions{}
-	emojiOpts.ColorScale.ScaleWithColor(getTileColor(-1))
+	emojiOpts.ColorScale.ScaleWithColor(getTileColor(IsFlag))
 	emojiOpts.PrimaryAlign = text.AlignStart
 	emojiOpts.SecondaryAlign = text.AlignCenter
 	emojiOpts.GeoM.Translate(float64(emojiXPos), float64(emojiYPos))
 	text.Draw(screen, emojiValue, &text.GoTextFace{
 		Source: emojiFaceSource,
+		Size:   30,
+	}, emojiOpts)
+}
+
+// drawElaspedTimeInfo
+func (g *GameLayout) drawElaspedTimeInfo(screen *ebiten.Image) {
+	// 畫旗子面板（固定在左方）
+	textValue := fmt.Sprintf("%03d", g.elapsedTime)
+	textXPos := ScreenWidth - gridSize/2 + len(textValue)
+	textYPos := PaddingY
+	textOpts := &text.DrawOptions{}
+	textOpts.ColorScale.ScaleWithColor(getTileColor(-1))
+	textOpts.PrimaryAlign = text.AlignEnd
+	textOpts.SecondaryAlign = text.AlignCenter
+	textOpts.GeoM.Translate(float64(textXPos), float64(textYPos))
+	text.Draw(screen, textValue, &text.GoTextFace{
+		Source: mplusFaceSource,
 		Size:   20,
+	}, textOpts)
+	emojiValue := "⏰"
+	emojiXPos := ScreenWidth - 3*gridSize + len(emojiValue)
+	emojiYPos := PaddingY
+	emojiOpts := &text.DrawOptions{}
+	emojiOpts.ColorScale.ScaleWithColor(getTileColor(IsClock))
+	emojiOpts.PrimaryAlign = text.AlignStart
+	emojiOpts.SecondaryAlign = text.AlignCenter
+	emojiOpts.GeoM.Translate(float64(emojiXPos), float64(emojiYPos))
+	text.Draw(screen, emojiValue, &text.GoTextFace{
+		Source: emojiFaceSource,
+		Size:   30,
 	}, emojiOpts)
 }