src/main/java/com/example/tankbattle/Bullet.java

@@ -3,13 +3,14 @@ package com.example.tankbattle;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 
-public class Bullet extends GameObject{
+public class Bullet {
     private static final int SPEED = 6;
     public static int WIDTH = ResourceMgr.bulletD.getWidth();
     public static int HEIGHT = ResourceMgr.bulletD.getHeight();
 
     Rectangle rect = new Rectangle();
 
+    private int x, y;
     private Dir dir;
 
     private boolean living = true;
@@ -28,7 +29,7 @@ public class Bullet extends GameObject{
         rect.width = WIDTH;
         rect.height = HEIGHT;
 
-        gm.add(this);
+        gm.bullets.add(this);
     }
 
     public Group getGroup() {
@@ -39,18 +40,9 @@ public class Bullet extends GameObject{
         this.group = group;
     }
 
-    public Rectangle getRect() {
-        return rect;
-    }
-
-    public void setRect(Rectangle rect) {
-        this.rect = rect;
-    }
-
-    @Override
     public void paint(Graphics g) {
         if (!living) {
-            gm.remove(this);
+            gm.bullets.remove(this);
         }
         switch (dir) {
             case LEFT:
@@ -97,20 +89,18 @@ public class Bullet extends GameObject{
         if (x < 0 || y < 0 || x > TankFrame.GAME_WIDTH || y > TankFrame.GAME_HEIGHT) living = false;
     }
 
-    public boolean collideWith(Tank tank){
+    public void collideWith(Tank tank){
-        if (this.group == tank.getGroup()) return false;
+        if (this.group == tank.getGroup()) return;
         if (rect.intersects(tank.rect)) {
             tank.die();
             this.die();
             int eX = tank.getX() + Tank.WIDTH / 2 - Explode.WIDTH / 2;
             int eY = tank.getY() + Tank.HEIGHT / 2 - Explode.HEIGHT / 2;
-            gm.add(new Explode(eX, eY, gm));
+            gm.explodes.add(new Explode(eX, eY, gm));
-            return true;
         }
-        return false;
     }
 
-    public void die() {
+    private void die() {
         this.living = false;
     }
 }

src/main/java/com/example/tankbattle/DefaultFireStrategy.java

@@ -1,9 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle;
-
-import com.example.tankbattle.Audio;
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.Group;
-import com.example.tankbattle.Tank;
 
 public class DefaultFireStrategy implements FireStrategy{
 

src/main/java/com/example/tankbattle/Explode.java

@@ -2,10 +2,12 @@ package com.example.tankbattle;
 
 import java.awt.Graphics;
 
-public class Explode extends GameObject {
+public class Explode {
     public static int WIDTH = ResourceMgr.explodes[0].getWidth();
     public static int HEIGHT = ResourceMgr.explodes[0].getHeight();
 
+    private int x, y;
+
     GameModel gm = null;
 
     private int step = 0;
@@ -18,13 +20,12 @@ public class Explode extends GameObject {
         new Thread(() -> new Audio("audio/explode.wav").play()).start();
     }
 
-    @Override
     public void paint(Graphics g) {
 
         g.drawImage(ResourceMgr.explodes[step++], x, y, null);
 
         if (step >= ResourceMgr.explodes.length)
-            gm.remove(this);
+            gm.explodes.remove(this);
 
     }
 }

src/main/java/com/example/tankbattle/FireStrategy.java

@@ -0,0 +1,5 @@
+package com.example.tankbattle;
+
+public interface FireStrategy {
+    void fire(Tank tank);
+}

src/main/java/com/example/tankbattle/FourDirFireStrategy.java

@@ -1,10 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle;
-
-import com.example.tankbattle.Audio;
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Group;
-import com.example.tankbattle.Tank;
 
 public class FourDirFireStrategy implements FireStrategy{
 

src/main/java/com/example/tankbattle/GameModel.java

@@ -1,10 +1,5 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.cor.BulletTankCollider;
-import com.example.tankbattle.cor.Collider;
-import com.example.tankbattle.cor.ColliderChain;
-import com.example.tankbattle.cor.TankTankCollider;
-
 import java.awt.Color;
 import java.awt.Graphics;
 import java.util.ArrayList;
@@ -16,30 +11,14 @@ public class GameModel {
     List<Bullet> bullets = new ArrayList<>();
     List<Tank> tanks = new ArrayList<>();
     List<Explode> explodes = new ArrayList<>();
-    ColliderChain chain = new ColliderChain();
-
-    List<GameObject> objects = new ArrayList<>();
 
     public GameModel() {
         int initTankCount = Integer.valueOf(PropertyMgr.get("initTankCount"));
 
         // 初始化敌方坦克
         for (int i = 0; i < initTankCount; i++) {
-            add(new Tank(50 + i * 80, 200, Dir.DOWN, Group.BAD, this));
+            tanks.add(new Tank(50 + i * 80, 200, Dir.DOWN, Group.BAD, this));
         }
-
-        add(new Wall(150, 150, 200, 50));
-        add(new Wall(550, 150, 200, 50));
-        add(new Wall(500, 300, 200, 50));
-        add(new Wall(300, 500, 50, 200));
-    }
-
-    public void add(GameObject go) {
-        this.objects.add(go);
-    }
-
-    public void remove(GameObject go) {
-        this.objects.remove(go);
     }
 
     public void paint(Graphics g) {
@@ -51,25 +30,22 @@ public class GameModel {
         g.setColor(c);
 
         myTank.paint(g);
-        for (int i = 0; i < objects.size(); i++) {
+        for (int i = 0; i < bullets.size(); i++) {
-            objects.get(i).paint(g);
+            bullets.get(i).paint(g);
         }
 
-        // 互相碰撞逻辑
+        for (int i = 0; i < tanks.size(); i++) {
-        for (int i = 0; i < objects.size(); i++) {
+            tanks.get(i).paint(g);
-            for (int j = i + 1; j < objects.size(); j++) {
-                GameObject o1 = objects.get(i);
-                GameObject o2 = objects.get(j);
-//                collider.collide(o1, o2);
-//                collider2.collide(o1, o2);
-                chain.collide(o1, o2);
-            }
         }
 
-//        for (int i = 0; i < bullets.size(); i++) {
+        for (int i = 0; i < explodes.size(); i++) {
-//            for (int j = 0; j < tanks.size(); j++)
+            explodes.get(i).paint(g);
-//                bullets.get(i).collideWith(tanks.get(j));
+        }
-//        }
+
+        for (int i = 0; i < bullets.size(); i++) {
+            for (int j = 0; j < tanks.size(); j++)
+                bullets.get(i).collideWith(tanks.get(j));
+        }
 
 //        for (Iterator<Bullet> it = bullets.iterator(); it.hasNext()) {
 //            Bullet b = it.next();

src/main/java/com/example/tankbattle/GameObject.java

@@ -1,10 +0,0 @@
-package com.example.tankbattle;
-
-import java.awt.Graphics;
-
-public abstract class GameObject {
-    public int x;
-    public int y;
-
-    public abstract void paint(Graphics g);
-}

src/main/java/com/example/tankbattle/Tank.java

@@ -1,12 +1,9 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.strategy.DefaultFireStrategy;
-import com.example.tankbattle.strategy.FireStrategy;
-
 import java.awt.*;
 import java.util.Random;
 
-public class Tank extends GameObject{
+public class Tank {
     private static final int SPEED = 2;
 
     public static int WIDTH = ResourceMgr.goodTankU.getWidth();
@@ -16,18 +13,18 @@ public class Tank extends GameObject{
 
     private Random random = new Random();
 
-    public Dir dir = Dir.DOWN;
+    int x,y;
+
+    Dir dir = Dir.DOWN;
 
     private boolean moving = true;
 
     private boolean living = true;
 
-    public Group group = Group.BAD;
+    Group group = Group.BAD;
-
-    int oldX, oldY;
 
     FireStrategy fs;
-    public GameModel gm;
+    GameModel gm;
 
     public Tank(int x, int y, Dir dir, Group group, GameModel gm) {
         super();
@@ -56,10 +53,6 @@ public class Tank extends GameObject{
         }
     }
 
-    public Rectangle getRect() {
-        return rect;
-    }
-
     public void fire(){
         fs.fire(this);
     }
@@ -89,9 +82,6 @@ public class Tank extends GameObject{
     }
 
     private void move() {
-        oldX=x;
-        oldY=y;
-
         if (!moving) return;
         switch (dir) {
             case LEFT:
@@ -133,10 +123,8 @@ public class Tank extends GameObject{
         this.dir = Dir.values()[random.nextInt(4)];
     }
 
-
-    @Override
     public void paint(Graphics g) {
-        if (!living) gm.remove(this);
+        if (!living) gm.tanks.remove(this);
         switch (dir) {
             case LEFT:
                 g.drawImage(this.group == Group.GOOD ? ResourceMgr.goodTankL : ResourceMgr.badTankL, x, y, null);
@@ -175,14 +163,4 @@ public class Tank extends GameObject{
     public void die() {
         this.living = false;
     }
-
-    public void stop() {
-        this.moving = false;
-    }
-
-    public void back() {
-        x = oldX;
-        y = oldY;
-    }
-
 }

src/main/java/com/example/tankbattle/Wall.java

@@ -1,52 +0,0 @@
-package com.example.tankbattle;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-public class Wall extends GameObject{
-
-    int w, h;
-
-    public Rectangle rect;
-
-    public int getW() {
-        return w;
-    }
-
-    public void setW(int w) {
-        this.w = w;
-    }
-
-    public int getH() {
-        return h;
-    }
-
-    public void setH(int h) {
-        this.h = h;
-    }
-
-    public Rectangle getRect() {
-        return rect;
-    }
-
-    public void setRect(Rectangle rect) {
-        this.rect = rect;
-    }
-
-    public Wall(int x, int y, int w, int h) {
-        this.x = x;
-        this.y = y;
-        this.w = w;
-        this.h = h;
-        this.rect = new Rectangle(x, y, w, h);
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        Color c = g.getColor();
-        g.setColor(Color.GRAY);
-        g.fillRect(x, y, w, h);
-        g.setColor(c);
-    }
-}

src/main/java/com/example/tankbattle/cor/BulletTankCollider.java

@@ -1,26 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.GameObject;
-import com.example.tankbattle.Tank;
-
-public class BulletTankCollider implements Collider {
-
-
-    @Override
-    public boolean collide(GameObject o1, GameObject o2) {
-        if (o1 instanceof Bullet && o2 instanceof Tank) {
-            Bullet bullet = (Bullet) o1;
-            Tank t = (Tank) o2;
-            if (bullet.collideWith(t)){
-                return false;
-            } else {
-                return true;
-            }
-        } else if (o1 instanceof Tank && o2 instanceof Bullet) {
-            return collide(o2, o1);
-        } else {
-            return true;
-        }
-    }
-}

src/main/java/com/example/tankbattle/cor/BulletWallCollider.java

@@ -1,25 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.GameObject;
-import com.example.tankbattle.Wall;
-
-public class BulletWallCollider implements Collider {
-
-    @Override
-    public boolean collide(GameObject o1, GameObject o2) {
-        if (o1 instanceof Bullet && o2 instanceof Wall) {
-            Bullet bullet = (Bullet) o1;
-            Wall wall = (Wall) o2;
-            if (bullet.getRect().intersects(wall.getRect())) {
-                System.out.println("bullet die");
-                bullet.die();
-            } else if (o1 instanceof Wall && o2 instanceof Bullet) {
-                return collide(o2, o1);
-            }
-        } else {
-            System.out.println(o1.getClass().getName() + "   " + o2.getClass().getName());
-        }
-        return true;
-    }
-}

src/main/java/com/example/tankbattle/cor/Collider.java

@@ -1,7 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.GameObject;
-
-public interface Collider {
-    boolean collide(GameObject o1, GameObject o2);
-}

src/main/java/com/example/tankbattle/cor/ColliderChain.java

@@ -1,32 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.GameObject;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class ColliderChain implements Collider {
-
-    private List<Collider> colliders = new LinkedList<>();
-
-    public ColliderChain() {
-        add(new BulletTankCollider());
-        add(new TankTankCollider());
-        add(new BulletWallCollider());
-        add(new TankWallCollider());
-    }
-
-    public void add(Collider c) {
-        colliders.add(c);
-    }
-
-    @Override
-    public boolean collide(GameObject o1, GameObject o2) {
-        for (int i = 0; i < colliders.size(); i++) {
-            if (!colliders.get(i).collide(o1, o2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-}

src/main/java/com/example/tankbattle/cor/TankTankCollider.java

@@ -1,23 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.GameObject;
-import com.example.tankbattle.Tank;
-
-public class TankTankCollider implements Collider {
-
-
-    @Override
-    public boolean collide(GameObject o1, GameObject o2) {
-        if (o1 instanceof Tank && o2 instanceof Tank) {
-            Tank t1 = (Tank) o1;
-            Tank t2 = (Tank) o2;
-            if ( t1.getRect().intersects(t2.getRect())){
-//                t1.stop();
-//                t2.stop();
-                t1.back();
-                t2.back();
-            }
-        }
-        return true;
-    }
-}

src/main/java/com/example/tankbattle/cor/TankWallCollider.java

@@ -1,23 +0,0 @@
-package com.example.tankbattle.cor;
-
-import com.example.tankbattle.GameObject;
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.Wall;
-
-public class TankWallCollider implements Collider {
-
-
-    @Override
-    public boolean collide(GameObject o1, GameObject o2) {
-        if (o1 instanceof Tank && o2 instanceof Wall) {
-            Tank tank = (Tank) o1;
-            Wall wall = (Wall) o2;
-            if (tank.getRect().intersects(wall.getRect())) {
-                tank.back();
-            } else if (o1 instanceof Wall && o2 instanceof Tank) {
-                return collide(o2, o1);
-            }
-        }
-        return true;
-    }
-}

src/main/java/com/example/tankbattle/strategy/Cat.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 
 public class Cat implements CustomComparable<Cat> {

src/main/java/com/example/tankbattle/strategy/CustomComparable.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 public interface CustomComparable<T> {
     int compareTo(T o);

src/main/java/com/example/tankbattle/strategy/CustomComparator.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 public interface CustomComparator<T> {
     int compare(T o1, T o2);

src/main/java/com/example/tankbattle/strategy/Dog.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 public class Dog implements CustomComparable<Dog> {
 

src/main/java/com/example/tankbattle/strategy/DogComparator.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 public class DogComparator implements CustomComparator<Dog> {
 

src/main/java/com/example/tankbattle/strategy/FireStrategy.java

@@ -1,7 +0,0 @@
-package com.example.tankbattle.strategy;
-
-import com.example.tankbattle.Tank;
-
-public interface FireStrategy {
-    void fire(Tank tank);
-}

src/main/java/com/example/tankbattle/strategy/Main.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 import java.util.Arrays;
 

src/main/java/com/example/tankbattle/strategy/Sorter.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.demo;
+package com.example.tankbattle.strategy;
 
 public class Sorter<T> {
 

src/main/resources/Config.properties

@@ -5,7 +5,5 @@ bulletSpeed=10
 gameWidth=1080
 gameHeight=720
 #fireStrategy
-goodFS=com.example.tankbattle.strategy.FourDirFireStrategy
+goodFS=com.example.tankbattle.FourDirFireStrategy
-badFS=com.example.tankbattle.strategy.DefaultFireStrategy
+badFS=com.example.tankbattle.DefaultFireStrategy
-#colliders
-colliders=com.example.tankbattle.cor.BulletTankCollider,com.example.tankbattle.cor.TankTankCollider