From 4cc7c4e2fbaae258246615770ec82014e050d7a9 Mon Sep 17 00:00:00 2001
From: kingyuluk <kingyuluk@hotmail.com>
Date: Sat, 8 Aug 2020 15:03:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=9F=90?=
 =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=E4=B8=8B=E5=B0=8F=E9=B8=9F=E6=AD=BB?=
 =?UTF-8?q?=E5=90=8E=E4=BC=9A=E7=BB=A7=E7=BB=AD=E4=B8=8A=E5=8D=87=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlappyBird.jar                   | Bin 24532 -> 24442 bytes
 src/com/bird/main/Bird.java      |  68 +++++++++++++++----------------
 src/com/bird/main/GameReady.java |   3 +-
 src/com/bird/util/GameUtil.java  |  12 ++++--
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/FlappyBird.jar b/FlappyBird.jar
index 1e7e10bbe32dda6815d8ca1270ddc1462e824c4d..c3c765c018e4cbe21b1d0e02f44d8679615e53c8 100644
GIT binary patch
delta 6229
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
T@MmB`${Px~H>^J!{HFaMh5rmI

delta 6335
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
V;+`cJ5iNig@EwJD^ucc{{{so?6AS<V

diff --git a/src/com/bird/main/Bird.java b/src/com/bird/main/Bird.java
index 9f49584..e91a9d0 100644
--- a/src/com/bird/main/Bird.java
+++ b/src/com/bird/main/Bird.java
@@ -9,8 +9,6 @@
 import com.bird.util.GameUtil;
 import com.bird.util.MusicUtil;
 
-import static com.bird.util.GameUtil.drawTitle;
-
 /**
  * 小鸟类，小鸟的绘制与飞行逻辑都在此类
  *
@@ -81,11 +79,10 @@ public void draw(Graphics g) {
             image = birdImages[STATE_UP][0];
         g.drawImage(image, x - halfImgWidth, y - halfImgHeight, null); // x坐标于窗口1/4处，y坐标位窗口中心
 
-        if (state == STATE_DEAD) {
+        if (state == STATE_DEAD)
             drawGameOver(g);
-        } else if (state != STATE_FALL) {
+        else if (state != STATE_FALL)
             drawScore(g);
-        }
         // 绘制矩形
 //      g.setColor(Color.black);
 //      g.drawRect((int) birdRect.getX(), (int) birdRect.getY(), (int) birdRect.getWidth(), (int) birdRect.getHeight());
@@ -117,57 +114,48 @@ private void fly() {
         wingState++;
         image = birdImages[Math.min(state, STATE_FALL)][wingState / 10 % IMG_COUNT];
 
+        // 下方边界: 窗口的高度 - 地面的高度 - 小鸟图片的高度
+        final int bottomBoundary = Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[0][0].getHeight() >> 1);
+        final int topBoundary = -50;
+
         switch (state) {
             case STATE_DOWN:
-                // 物理公式
+                // 自由落体
                 speed -= g * T;
-                // 小鸟y轴的位移量
                 double h = speed * T - g * T * T / 2;
-                y = (int) (y - h);
-                birdRect.y = (int) (birdRect.y - h);
-                // 控制坠落的边界，若y坐标 > 窗口的高度 - 地面的高度 - 小鸟图片的高度则死亡
-                if (birdRect.y >= Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1)) {
-                    y = Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1);
-                    birdRect.y = Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1);
-                    birdFall();
+                y = Math.min((int) (y - h), bottomBoundary);
+                birdRect.y = Math.min((int) (birdRect.y - h), bottomBoundary);
+                if (birdRect.y == bottomBoundary) {
+                    MusicUtil.playCrash();
+                    birdDead();
                 }
-
                 break;
 
             case STATE_FALL:
-                // 鸟死亡，自由落体
+                // 自由落体
                 speed -= g * T;
                 h = speed * T - g * T * T / 2;
-                y = (int) (y - h);
-                birdRect.y = (int) (birdRect.y - h);
-
-                // 控制坠落的边界，若y坐标 > 窗口的高度 - 地面的高度 - 小鸟图片的高度则死亡
-                if (birdRect.y >= Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1)) {
-
-                    y = Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1);
-                    birdRect.y = Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (birdImages[state][0].getHeight() >> 1);
-
-                    GameFrame.setGameState(GameFrame.STATE_OVER); // 改变游戏状态
+                y = Math.min((int) (y - h), bottomBoundary);
+                birdRect.y = Math.min((int) (birdRect.y - h), bottomBoundary);
+                if (birdRect.y == bottomBoundary)
                     birdDead();
-                }
+                break;
+
+            case STATE_DEAD:
+                GameFrame.setGameState(GameFrame.STATE_OVER);
                 break;
 
             case STATE_NORMAL:
             case STATE_UP:
-            case STATE_DEAD:
                 break;
         }
 
         // 控制上方边界
-        if (birdRect.y < -1 * Constant.TOP_PIPE_LENGTHENING / 2) {
-            birdRect.y = -1 * Constant.TOP_PIPE_LENGTHENING / 2;
-            y = -1 * Constant.TOP_PIPE_LENGTHENING / 2;
+        if (birdRect.y < topBoundary) {
+            birdRect.y = topBoundary;
+            y = topBoundary;
         }
 
-        // 控制下方边界
-        if (birdRect.y > Constant.FRAME_HEIGHT - Constant.GROUND_HEIGHT - (image.getHeight() >> 1)) {
-            birdFall();
-        }
     }
 
     // 小鸟振翅
@@ -194,6 +182,13 @@ public void birdDown() {
     public void birdFall() {
         state = STATE_FALL;
         MusicUtil.playCrash(); // 播放音效
+        speed = 0;  // 速度置0，防止小鸟继续上升与水管重叠
+        // 死后画面静止片刻
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
 
     // 小鸟死亡
@@ -208,6 +203,7 @@ public void birdDead() {
         countScore.isSaveScore(); // 判断是否保存纪录
     }
 
+    // 判断小鸟是否死亡
     public boolean isDead() {
         return state == STATE_FALL || state == STATE_DEAD;
     }
@@ -258,7 +254,7 @@ private void drawGameOver(Graphics g) {
         // 绘制继续游戏，使图像闪烁
         final int COUNT = 30; // 闪烁周期
         if (flash++ > COUNT)
-            drawTitle(againImg, g);
+            GameUtil.drawImage(againImg,Constant.FRAME_WIDTH - againImg.getWidth() >> 1, Constant.FRAME_HEIGHT / 5 * 3, g);
         if (flash == COUNT * 2) // 重置闪烁参数
             flash = 0;
     }
diff --git a/src/com/bird/main/GameReady.java b/src/com/bird/main/GameReady.java
index c5a3cb5..a0f2a36 100644
--- a/src/com/bird/main/GameReady.java
+++ b/src/com/bird/main/GameReady.java
@@ -4,7 +4,6 @@
 import java.awt.image.BufferedImage;
 import com.bird.util.Constant;
 import com.bird.util.GameUtil;
-import static com.bird.util.GameUtil.drawTitle;
 
 /**
  * 游戏启动界面类
@@ -34,7 +33,7 @@ public void draw(Graphics g) {
 		// 使notice的图像闪烁
 		final int COUNT = 30; // 闪烁周期
 		if (flash++ > COUNT)
-			drawTitle(noticeImg, g);
+			GameUtil.drawImage(noticeImg, Constant.FRAME_WIDTH - noticeImg.getWidth() >> 1, Constant.FRAME_HEIGHT / 5 * 3, g);
 		if (flash == COUNT * 2) // 重置闪烁参数
 				flash = 0;
 	}
diff --git a/src/com/bird/util/GameUtil.java b/src/com/bird/util/GameUtil.java
index 293bb98..d571cb0 100644
--- a/src/com/bird/util/GameUtil.java
+++ b/src/com/bird/util/GameUtil.java
@@ -81,10 +81,14 @@ public static int getStringHeight(Font font, String str) {
     }
 
 
-    // 于屏幕x轴中央、y轴3/5处绘制图像
-    public static void drawTitle(BufferedImage image, Graphics g) {
-        int x = Constant.FRAME_WIDTH - image.getWidth() >> 1;
-        int y = Constant.FRAME_HEIGHT / 5 * 3;
+    /**
+     *
+     * @param image:图片资源
+     * @param x：x坐标
+     * @param y：y坐标
+     * @param g：画笔
+     */
+    public static void drawImage(BufferedImage image, int x, int y, Graphics g) {
         g.drawImage(image, x, y, null);
     }