From a2f3ea3ffd23ab4290453a3f61e8c40f1355aadb Mon Sep 17 00:00:00 2001
From: kn5886348135 <56352848+kn5886348135@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/tankbattle/Tank.java     | 18 +++++++++------
 .../com/example/tankbattle/TankFrame.java     | 23 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/example/tankbattle/Tank.java b/src/main/java/com/example/tankbattle/Tank.java
index 21a5a4b..dce0b90 100644
--- a/src/main/java/com/example/tankbattle/Tank.java
+++ b/src/main/java/com/example/tankbattle/Tank.java
@@ -12,13 +12,6 @@ public class Tank {
 
     private boolean moving = false;
 
-    public Tank(int x, int y, Dir dir, TankFrame tf) {
-        this.x = x;
-        this.y = y;
-        this.dir = dir;
-        this.tf = tf;
-    }
-
     public boolean isMoving() {
         return moving;
     }
@@ -31,6 +24,17 @@ public class Tank {
         this.dir = dir;
     }
 
+    public Dir getDir() {
+        return dir;
+    }
+
+    public Tank(int x, int y, Dir dir, TankFrame tf) {
+        this.x = x;
+        this.y = y;
+        this.dir = dir;
+        this.tf = tf;
+    }
+
     public void paint(Graphics g) {
         Color c = g.getColor();
         g.setColor(Color.YELLOW);
diff --git a/src/main/java/com/example/tankbattle/TankFrame.java b/src/main/java/com/example/tankbattle/TankFrame.java
index e592ed4..c014cb2 100644
--- a/src/main/java/com/example/tankbattle/TankFrame.java
+++ b/src/main/java/com/example/tankbattle/TankFrame.java
@@ -11,13 +11,12 @@ import java.util.List;
 public class TankFrame extends Frame {
 
     Tank myTank = new Tank(200, 200, Dir.DOWN, this);
-
-    Bullet bullet = new Bullet(300, 300, Dir.DOWN);
+    Bullet b = new Bullet(300, 300, Dir.DOWN);
     private static final int GAME_WIDTH = 800,GAME_HEIGHT=600;
 
     List<Bullet> bullets = new ArrayList<>();
 
-    public TankFrame() throws HeadlessException {
+    public TankFrame() {
         setSize(GAME_WIDTH, GAME_HEIGHT);
         setResizable(false);
         setTitle("tank battle");
@@ -49,7 +48,7 @@ public class TankFrame extends Frame {
     @Override
     public void paint(Graphics g) {
         myTank.paint(g);
-        bullet.paint(g);
+        b.paint(g);
         for (Bullet bullet1 : bullets) {
             bullet1.paint(g);
         }
@@ -69,12 +68,12 @@ public class TankFrame extends Frame {
                 case  KeyEvent.VK_LEFT:
                     bL = true;
                     break;
-                case  KeyEvent.VK_RIGHT:
-                    bR = true;
-                    break;
                 case  KeyEvent.VK_UP:
                     bU = true;
                     break;
+                case  KeyEvent.VK_RIGHT:
+                    bR = true;
+                    break;
                 case  KeyEvent.VK_DOWN:
                     bD = true;
                     break;
@@ -93,12 +92,12 @@ public class TankFrame extends Frame {
                 case KeyEvent.VK_LEFT:
                     bL = false;
                     break;
-                case KeyEvent.VK_RIGHT:
-                    bR = false;
-                    break;
                 case KeyEvent.VK_UP:
                     bU = false;
                     break;
+                case KeyEvent.VK_RIGHT:
+                    bR = false;
+                    break;
                 case KeyEvent.VK_DOWN:
                     bD = false;
                     break;
@@ -113,13 +112,13 @@ public class TankFrame extends Frame {
         }
 
         private void setMainTankDir() {
-            if (!bL && !bR && !bU && !bD) {
+            if (!bL && !bU && !bR && !bD) {
                 myTank.setMoving(false);
             } else {
                 myTank.setMoving(true);
                 if (bL) myTank.setDir(Dir.LEFT);
-                if (bR) myTank.setDir(Dir.RIGHT);
                 if (bU) myTank.setDir(Dir.UP);
+                if (bR) myTank.setDir(Dir.RIGHT);
                 if (bD) myTank.setDir(Dir.DOWN);
             }
         }