From 0092ad544ecfb8204cc9589b71ffcb2adfd0cc10 Mon Sep 17 00:00:00 2001
From: bingor <bingor19890207@163.com>
Date: Mon, 10 Oct 2022 17:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9D=A6=E5=85=8B=E5=A4=A7=E6=88=98=EF=BC=88?=
 =?UTF-8?q?=E4=B8=80=E6=9C=9F=EF=BC=89-=E8=AE=BE=E8=AE=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F-=E5=B0=86=E9=97=A8=E9=9D=A2=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B0=E9=A1=B9=E7=9B=AE=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8GameModel=E4=BD=9C=E4=B8=BAfacade=E4=B8=8EFra?=
 =?UTF-8?q?me=E6=89=93=E4=BA=A4=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/msb/TankDemo.java           | 16 ----
 src/main/java/com/msb/TankFrame.java          | 65 +++------------
 .../java/com/msb/factorys/CircleFactory.java  | 11 ++-
 .../java/com/msb/factorys/DefaultFactory.java | 10 +--
 .../msb/factorys/abstracts/GameFactory.java   |  8 +-
 .../msb/inter/impl/DefaultFireStrategy.java   |  2 +-
 .../com/msb/inter/impl/FourFireStrategy.java  |  2 +-
 src/main/java/com/msb/model/Bullet.java       | 10 +--
 .../java/com/msb/model/CircleExplode.java     | 10 +--
 src/main/java/com/msb/model/Explode.java      |  9 +-
 src/main/java/com/msb/model/GameModel.java    | 83 +++++++++++++++++++
 src/main/java/com/msb/model/Tank.java         | 16 ++--
 12 files changed, 131 insertions(+), 111 deletions(-)
 create mode 100644 src/main/java/com/msb/model/GameModel.java

diff --git a/src/main/java/com/msb/TankDemo.java b/src/main/java/com/msb/TankDemo.java
index 9b94ca9..4e41ec8 100644
--- a/src/main/java/com/msb/TankDemo.java
+++ b/src/main/java/com/msb/TankDemo.java
@@ -1,12 +1,5 @@
 package com.msb;
 
-import com.msb.base.PropertyMgr;
-import com.msb.enums.DirEnum;
-import com.msb.enums.GroupEnum;
-import com.msb.model.Tank;
-
-import java.util.Random;
-
 /**
  * @Author bingor
  * @Date 2022-09-29 11:02
@@ -17,15 +10,6 @@ public class TankDemo {
 
     public static void main(String[] args) throws InterruptedException {
          TankFrame tankFrame = new TankFrame();
-        Random random = new Random();
-
-        int initTankCount = Integer.parseInt(PropertyMgr.getString("initTankCount"));
-
-         //创建5个敌方坦克
-        for (int i=0; i<initTankCount; i++) {
-//            tankFrame.tanks.add(new Tank(100 + i*80, 100, DirEnum.valueOf(random.nextInt(30)%4), GroupEnum.BAD, tankFrame));
-            tankFrame.tanks.add(new Tank(100 + i*80, 100, DirEnum.DOWN, GroupEnum.BAD, tankFrame));
-        }
 
          //现实当中，虽然可以过按键来改变方块的坐标并且重新刷新画板来实现移动，但是敌方的坦克应该是自动在跑
          while (true) {
diff --git a/src/main/java/com/msb/TankFrame.java b/src/main/java/com/msb/TankFrame.java
index 4289eb1..288ccd8 100644
--- a/src/main/java/com/msb/TankFrame.java
+++ b/src/main/java/com/msb/TankFrame.java
@@ -1,22 +1,13 @@
 package com.msb;
 
 import com.msb.enums.DirEnum;
-import com.msb.enums.GroupEnum;
-import com.msb.factorys.CircleFactory;
-import com.msb.factorys.DefaultFactory;
-import com.msb.factorys.abstracts.GameFactory;
-import com.msb.model.Bullet;
-import com.msb.model.Explode;
-import com.msb.model.Tank;
-import com.msb.model.abstracts.BaseExplode;
+import com.msb.model.GameModel;
 
 import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -27,15 +18,10 @@ import java.util.Objects;
  */
 public class TankFrame extends Frame {
 
-    Tank myTank = new Tank(100, 500, DirEnum.RIGHT, GroupEnum.GOOD, this);
-//    Explode explode = new Explode(100, 100, this);
-//    Bullet bullet = new Bullet(200, 200, DirEnum.DOWN);
-    public List<Bullet> bullets = new ArrayList<>();
-    public List<Tank> tanks = new ArrayList<>();   //敌方坦克
-    public List<BaseExplode> explodes = new ArrayList<>();     //爆炸效果
+    GameModel gameModel = new GameModel();
     public static final int GAME_WIDTH = 1000;
     public static final int GAME_HEIGHT = 800;
-    public GameFactory gameFactory = new CircleFactory();
+
 
     public TankFrame() {
 
@@ -60,36 +46,7 @@ public class TankFrame extends Frame {
     @Override
     public void paint(Graphics g) {
 //        super.paint(g);
-        Color color = g.getColor();
-        g.setColor(Color.WHITE);
-        g.drawString("子弹的数量：" + bullets.size(), 10, 60);
-        g.drawString("敌方坦克数量：" + tanks.size(), 10, 90);
-        g.drawString("爆炸的数量：" + explodes.size(), 10, 120);
-        g.setColor(color);
-        myTank.paint(g);
-
-//        explode.paint(g);
-
-        //画出敌方坦克
-        for (int i=0; i<tanks.size(); i++) {
-            tanks.get(i).paint(g);
-        }
-
-        for (int i=0; i<bullets.size(); i++) {
-            bullets.get(i).paint(g);
-        }
-
-        for (int i=0; i<bullets.size(); i++) {
-            for (int j=0; j<tanks.size(); j++) {
-                bullets.get(i).collide(tanks.get(j));
-            }
-        }
-
-        //爆炸效果
-        for (int i=0; i<explodes.size(); i++) {
-            explodes.get(i).paint(g);
-        }
-
+        gameModel.paint(g);
     }
 
     //双缓冲，解决闪烁现象
@@ -138,7 +95,7 @@ public class TankFrame extends Frame {
                 case KeyEvent.VK_RIGHT : bR = false; break;
                 case KeyEvent.VK_UP : bU = false; break;
                 case KeyEvent.VK_DOWN : bD = false; break;
-                case KeyEvent.VK_SPACE: myTank.fire(); break;
+                case KeyEvent.VK_SPACE: gameModel.getMainTank().fire(); break;
                 default: break;
             }
             setDir();
@@ -147,16 +104,16 @@ public class TankFrame extends Frame {
         private void setDir() {
             //当没有任何方向键按下的时候，那么让坦克停止
             if( !bL && !bR && !bU && !bD ) {
-                myTank.setMove(false);
+                gameModel.getMainTank().setMove(false);
             } else {
-                myTank.setMove(true);
+                gameModel.getMainTank().setMove(true);
             }
 
             //为什么不用if-else 因为有可能是一起按两个方向键，那最后拿到哪个算哪个
-            if(bL) myTank.setDir(DirEnum.LEFT);
-            if(bR) myTank.setDir(DirEnum.RIGHT);
-            if(bU) myTank.setDir(DirEnum.UP);
-            if(bD) myTank.setDir(DirEnum.DOWN);
+            if(bL) gameModel.getMainTank().setDir(DirEnum.LEFT);
+            if(bR) gameModel.getMainTank().setDir(DirEnum.RIGHT);
+            if(bU) gameModel.getMainTank().setDir(DirEnum.UP);
+            if(bD) gameModel.getMainTank().setDir(DirEnum.DOWN);
         }
     }
 
diff --git a/src/main/java/com/msb/factorys/CircleFactory.java b/src/main/java/com/msb/factorys/CircleFactory.java
index 891e8f6..06571f3 100644
--- a/src/main/java/com/msb/factorys/CircleFactory.java
+++ b/src/main/java/com/msb/factorys/CircleFactory.java
@@ -5,10 +5,9 @@ package com.msb.factorys;/**
  * @Version: 1.0
  */
 
-import com.msb.TankFrame;
 import com.msb.factorys.abstracts.GameFactory;
 import com.msb.model.CircleExplode;
-import com.msb.model.Explode;
+import com.msb.model.GameModel;
 import com.msb.model.abstracts.BaseBullet;
 import com.msb.model.abstracts.BaseExplode;
 import com.msb.model.abstracts.BaseTank;
@@ -22,17 +21,17 @@ import com.msb.model.abstracts.BaseTank;
  */
 public class CircleFactory extends GameFactory {
     @Override
-    public BaseTank createTank(int x, int y, TankFrame tf) {
+    public BaseTank createTank(int x, int y, GameModel gameModel) {
         return null;
     }
 
     @Override
-    public BaseBullet createBullet(int x, int y, TankFrame tf) {
+    public BaseBullet createBullet(int x, int y, GameModel gameModel) {
         return null;
     }
 
     @Override
-    public BaseExplode createExplode(int x, int y, TankFrame tf) {
-        return new CircleExplode(x, y, tf);
+    public BaseExplode createExplode(int x, int y, GameModel gameModel) {
+        return new CircleExplode(x, y, gameModel);
     }
 }
diff --git a/src/main/java/com/msb/factorys/DefaultFactory.java b/src/main/java/com/msb/factorys/DefaultFactory.java
index ef219a9..97b798c 100644
--- a/src/main/java/com/msb/factorys/DefaultFactory.java
+++ b/src/main/java/com/msb/factorys/DefaultFactory.java
@@ -5,9 +5,9 @@ package com.msb.factorys;/**
  * @Version: 1.0
  */
 
-import com.msb.TankFrame;
 import com.msb.factorys.abstracts.GameFactory;
 import com.msb.model.Explode;
+import com.msb.model.GameModel;
 import com.msb.model.abstracts.BaseBullet;
 import com.msb.model.abstracts.BaseExplode;
 import com.msb.model.abstracts.BaseTank;
@@ -21,17 +21,17 @@ import com.msb.model.abstracts.BaseTank;
  */
 public class DefaultFactory extends GameFactory {
     @Override
-    public BaseTank createTank(int x, int y, TankFrame tf) {
+    public BaseTank createTank(int x, int y, GameModel gameModel) {
         return null;
     }
 
     @Override
-    public BaseBullet createBullet(int x, int y, TankFrame tf) {
+    public BaseBullet createBullet(int x, int y, GameModel gameModel) {
         return null;
     }
 
     @Override
-    public BaseExplode createExplode(int x, int y, TankFrame tf) {
-        return new Explode(x, y, tf);
+    public BaseExplode createExplode(int x, int y, GameModel gameModel) {
+        return new Explode(x, y, gameModel);
     }
 }
diff --git a/src/main/java/com/msb/factorys/abstracts/GameFactory.java b/src/main/java/com/msb/factorys/abstracts/GameFactory.java
index b6b3a1c..c7afdd0 100644
--- a/src/main/java/com/msb/factorys/abstracts/GameFactory.java
+++ b/src/main/java/com/msb/factorys/abstracts/GameFactory.java
@@ -5,7 +5,7 @@ package com.msb.factorys.abstracts;/**
  * @Version: 1.0
  */
 
-import com.msb.TankFrame;
+import com.msb.model.GameModel;
 import com.msb.model.abstracts.BaseBullet;
 import com.msb.model.abstracts.BaseExplode;
 import com.msb.model.abstracts.BaseTank;
@@ -18,7 +18,7 @@ import com.msb.model.abstracts.BaseTank;
  *@Version 3.0
  */
 public abstract class GameFactory {
-    public abstract BaseTank createTank(int x, int y, TankFrame tf);
-    public abstract BaseBullet createBullet(int x, int y, TankFrame tf);
-    public abstract BaseExplode createExplode(int x, int y, TankFrame tf);
+    public abstract BaseTank createTank(int x, int y, GameModel gameModel);
+    public abstract BaseBullet createBullet(int x, int y, GameModel gameModel);
+    public abstract BaseExplode createExplode(int x, int y, GameModel gameModel);
 }
diff --git a/src/main/java/com/msb/inter/impl/DefaultFireStrategy.java b/src/main/java/com/msb/inter/impl/DefaultFireStrategy.java
index b0a8feb..e0c4584 100644
--- a/src/main/java/com/msb/inter/impl/DefaultFireStrategy.java
+++ b/src/main/java/com/msb/inter/impl/DefaultFireStrategy.java
@@ -21,6 +21,6 @@ public class DefaultFireStrategy implements FireStrategy {
     public void fire(Tank tank) {
         int bX = tank.getX() + Tank.WIDTH/2 - Bullet.WIDTH/2;
         int bY = tank.getY()+Tank.HEIGHT/2-Bullet.HEIGHT/2;
-        new Bullet(bX, bY, tank.getDir(), tank.getGroup(), tank.getTankFrame());
+        new Bullet(bX, bY, tank.getDir(), tank.getGroup(), tank.getGameModel());
     }
 }
diff --git a/src/main/java/com/msb/inter/impl/FourFireStrategy.java b/src/main/java/com/msb/inter/impl/FourFireStrategy.java
index 552fda2..336a105 100644
--- a/src/main/java/com/msb/inter/impl/FourFireStrategy.java
+++ b/src/main/java/com/msb/inter/impl/FourFireStrategy.java
@@ -23,7 +23,7 @@ public class FourFireStrategy implements FireStrategy {
         int bX = tank.getX() + Tank.WIDTH/2 - Bullet.WIDTH/2;
         int bY = tank.getY()+Tank.HEIGHT/2-Bullet.HEIGHT/2;
         for (DirEnum value : DirEnum.values()) {
-            new Bullet(bX, bY, value, tank.getGroup(), tank.getTankFrame());
+            new Bullet(bX, bY, value, tank.getGroup(), tank.getGameModel());
         }
     }
 }
diff --git a/src/main/java/com/msb/model/Bullet.java b/src/main/java/com/msb/model/Bullet.java
index 920982a..4f33d75 100644
--- a/src/main/java/com/msb/model/Bullet.java
+++ b/src/main/java/com/msb/model/Bullet.java
@@ -23,28 +23,28 @@ public class Bullet extends BaseBullet {
     public static final int SPEED = 8;
     private boolean live = true;
     private GroupEnum group = GroupEnum.BAD;
-    private TankFrame tankFrame;
+    private GameModel gameModel;
     private Rectangle rectangle = new Rectangle();
 
-    public Bullet(int x, int y, DirEnum dir, GroupEnum group, TankFrame tankFrame) {
+    public Bullet(int x, int y, DirEnum dir, GroupEnum group, GameModel gameModel) {
         this.x = x;
         this.y = y;
         this.dir = dir;
         this.group = group;
-        this.tankFrame = tankFrame;
+        this.gameModel = gameModel;
 
         rectangle.x = this.x;
         rectangle.x = this.y;
         rectangle.width = WIDTH;
         rectangle.height = HEIGHT;
 
-        tankFrame.bullets.add(this);
+        gameModel.bullets.add(this);
     }
 
     @Override
     public void paint(Graphics g) {
         if( ! this.live)  {
-            tankFrame.bullets.remove(this);
+            gameModel.bullets.remove(this);
             return;
         }
 
diff --git a/src/main/java/com/msb/model/CircleExplode.java b/src/main/java/com/msb/model/CircleExplode.java
index 0dc3b59..8f2500c 100644
--- a/src/main/java/com/msb/model/CircleExplode.java
+++ b/src/main/java/com/msb/model/CircleExplode.java
@@ -5,8 +5,6 @@ package com.msb.model;/**
  * @Version: 1.0
  */
 
-import com.msb.TankFrame;
-import com.msb.base.ResourcesMgr;
 import com.msb.model.abstracts.BaseExplode;
 
 import java.awt.*;
@@ -20,13 +18,13 @@ import java.awt.*;
  */
 public class CircleExplode extends BaseExplode {
     private int x,y;
-    private TankFrame tankFrame;
+    private GameModel gameModel;
     private int step = 0;
 
-    public CircleExplode(int x, int y, TankFrame tankFrame) {
+    public CircleExplode(int x, int y, GameModel gameModel) {
         this.x = x;
         this.y = y;
-        this.tankFrame = tankFrame;
+        this.gameModel = gameModel;
     }
 
     @Override
@@ -38,7 +36,7 @@ public class CircleExplode extends BaseExplode {
         step++;
         if(step >= 10) {
             step = 0;
-            tankFrame.explodes.remove(this);
+            gameModel.explodes.remove(this);
         }
         g.setColor(color);
 
diff --git a/src/main/java/com/msb/model/Explode.java b/src/main/java/com/msb/model/Explode.java
index 12da812..76584b1 100644
--- a/src/main/java/com/msb/model/Explode.java
+++ b/src/main/java/com/msb/model/Explode.java
@@ -1,6 +1,5 @@
 package com.msb.model;
 
-import com.msb.TankFrame;
 import com.msb.base.ResourcesMgr;
 import com.msb.model.abstracts.BaseExplode;
 
@@ -15,16 +14,16 @@ import java.awt.*;
 public class Explode extends BaseExplode {
 
     private int x,y;
-    private TankFrame tankFrame;
+    private GameModel gameModel;
     public static final int WIDTH = ResourcesMgr.explodeImages[0].getWidth();
     public static final int HEIGHT = ResourcesMgr.explodeImages[0].getHeight();
 //    private boolean live = true;
     private int step = 0;
 
-    public Explode(int x, int y, TankFrame tankFrame) {
+    public Explode(int x, int y, GameModel gameModel) {
         this.x = x;
         this.y = y;
-        this.tankFrame = tankFrame;
+        this.gameModel = gameModel;
     }
 
     @Override
@@ -33,7 +32,7 @@ public class Explode extends BaseExplode {
         g.drawImage(ResourcesMgr.explodeImages[step++], x, y, null);
         if(step >= ResourcesMgr.explodeImages.length) {
             step = 0;
-            tankFrame.explodes.remove(this);
+            gameModel.explodes.remove(this);
         }
 
     }
diff --git a/src/main/java/com/msb/model/GameModel.java b/src/main/java/com/msb/model/GameModel.java
new file mode 100644
index 0000000..9a360f1
--- /dev/null
+++ b/src/main/java/com/msb/model/GameModel.java
@@ -0,0 +1,83 @@
+package com.msb.model;/**
+ * @Author bingor
+ * @Date 2022/10/10 16:30
+ * @Description: com.msb.model
+ * @Version: 1.0
+ */
+
+import com.msb.base.PropertyMgr;
+import com.msb.enums.DirEnum;
+import com.msb.enums.GroupEnum;
+import com.msb.factorys.CircleFactory;
+import com.msb.factorys.DefaultFactory;
+import com.msb.factorys.abstracts.GameFactory;
+import com.msb.model.abstracts.BaseExplode;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *@ClassName GameModel
+ *@Description TODO
+ *@Author bingor
+ *@Date 2022/10/10 16:30
+ *@Version 3.0
+ */
+public class GameModel {
+
+    Tank myTank = new Tank(100, 500, DirEnum.RIGHT, GroupEnum.GOOD, this);
+    //    Explode explode = new Explode(100, 100, this);
+//    Bullet bullet = new Bullet(200, 200, DirEnum.DOWN);
+    public List<Bullet> bullets = new ArrayList<>();
+    public List<Tank> tanks = new ArrayList<>();   //敌方坦克
+    public List<BaseExplode> explodes = new ArrayList<>();     //爆炸效果
+//    public GameFactory gameFactory = new DefaultFactory();
+
+    public GameModel() {
+//        Random random = new Random();
+        int initTankCount = Integer.parseInt(PropertyMgr.getString("initTankCount"));
+
+        //创建5个敌方坦克
+        for (int i=0; i<initTankCount; i++) {
+//            tankFrame.tanks.add(new Tank(100 + i*80, 100, DirEnum.valueOf(random.nextInt(30)%4), GroupEnum.BAD, tankFrame));
+            this.tanks.add(new Tank(100 + i*80, 100, DirEnum.DOWN, GroupEnum.BAD, this));
+        }
+    }
+
+    public void paint(Graphics g) {
+        Color color = g.getColor();
+        g.setColor(Color.WHITE);
+        g.drawString("子弹的数量：" + bullets.size(), 10, 60);
+        g.drawString("敌方坦克数量：" + tanks.size(), 10, 90);
+        g.drawString("爆炸的数量：" + explodes.size(), 10, 120);
+        g.setColor(color);
+        myTank.paint(g);
+
+//        explode.paint(g);
+
+        //画出敌方坦克
+        for (int i=0; i<tanks.size(); i++) {
+            tanks.get(i).paint(g);
+        }
+
+        for (int i=0; i<bullets.size(); i++) {
+            bullets.get(i).paint(g);
+        }
+
+        for (int i=0; i<bullets.size(); i++) {
+            for (int j=0; j<tanks.size(); j++) {
+                bullets.get(i).collide(tanks.get(j));
+            }
+        }
+
+        //爆炸效果
+        for (int i=0; i<explodes.size(); i++) {
+            explodes.get(i).paint(g);
+        }
+    }
+
+    public Tank getMainTank() {
+        return myTank;
+    }
+}
diff --git a/src/main/java/com/msb/model/Tank.java b/src/main/java/com/msb/model/Tank.java
index c0a1d32..6b870c0 100644
--- a/src/main/java/com/msb/model/Tank.java
+++ b/src/main/java/com/msb/model/Tank.java
@@ -24,7 +24,7 @@ public class Tank extends BaseTank {
     private static final int SPEED = 4;
     private boolean move = true;
     //为了解决能够在坦克中发射子弹，将创建的子弹通过坦克发射出来，那么需要在坦克类中持有游戏窗口的引用
-    private TankFrame tankFrame;
+    private GameModel gameModel;
     public static final int WIDTH = ResourcesMgr.goodTankU.getWidth();
     public static final int HEIGHT = ResourcesMgr.goodTankU.getHeight();
     private boolean live = true;
@@ -33,12 +33,12 @@ public class Tank extends BaseTank {
     private Rectangle rectangle = new Rectangle();
     private FireStrategy fireStrategy;
 
-    public Tank(int x, int y, DirEnum dir, GroupEnum group, TankFrame tankFrame) {
+    public Tank(int x, int y, DirEnum dir, GroupEnum group, GameModel gameModel) {
         this.x = x;
         this.y = y;
         this.dir = dir;
         this.group = group;
-        this.tankFrame = tankFrame;
+        this.gameModel = gameModel;
 
         rectangle.x = this.x;
         rectangle.x = this.y;
@@ -64,7 +64,7 @@ public class Tank extends BaseTank {
     public void paint(Graphics g) {
 
         if( ! live)  {
-            tankFrame.tanks.remove(this);
+            gameModel.tanks.remove(this);
             return;
         }
 
@@ -145,8 +145,8 @@ public class Tank extends BaseTank {
         this.live = false;
         int eX = this.x + WIDTH/2 - Explode.WIDTH/2;
         int eY = this.y + HEIGHT/2 - Explode.HEIGHT/2;
-//        tankFrame.explodes.add(new Explode(eX, eY, tankFrame));
-        tankFrame.explodes.add(tankFrame.gameFactory.createExplode(eX, eY, tankFrame));
+        gameModel.explodes.add(new Explode(eX, eY, gameModel));
+//        gameModel.explodes.add(gameModel.gameFactory.createExplode(eX, eY, gameModel));
     }
 
     public GroupEnum getGroup() {
@@ -157,7 +157,7 @@ public class Tank extends BaseTank {
         return rectangle;
     }
 
-    public TankFrame getTankFrame() {
-        return tankFrame;
+    public GameModel getGameModel() {
+        return gameModel;
     }
 }