From c4b21d028433a05e8e5e24bc0fa47def01302cec Mon Sep 17 00:00:00 2001 From: bingor_yhj Date: Thu, 6 Apr 2023 22:22:30 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=9D=A6=E5=85=8B=E5=A4=A7=E6=88=98(?= =?UTF-8?q?=E4=B8=80=E6=9C=9F)-master=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=88=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1src=E8=B7=AF=E5=BE=84=EF=BC=89"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit aedef00c --- {src/main/resources => resources}/config.properties | 0 {src/main/resources => resources}/images/0.gif | Bin {src/main/resources => resources}/images/1.gif | Bin {src/main/resources => resources}/images/10.gif | Bin {src/main/resources => resources}/images/2.gif | Bin {src/main/resources => resources}/images/3.gif | Bin {src/main/resources => resources}/images/4.gif | Bin {src/main/resources => resources}/images/5.gif | Bin {src/main/resources => resources}/images/6.gif | Bin {src/main/resources => resources}/images/7.gif | Bin {src/main/resources => resources}/images/8.gif | Bin {src/main/resources => resources}/images/9.gif | Bin .../resources => resources}/images/BadTank1.png | Bin .../resources => resources}/images/BadTank2.png | Bin .../resources => resources}/images/GoodTank1.png | Bin .../resources => resources}/images/GoodTank2.png | Bin .../main/resources => resources}/images/bulletD.gif | Bin .../main/resources => resources}/images/bulletL.gif | Bin .../main/resources => resources}/images/bulletR.gif | Bin .../main/resources => resources}/images/bulletU.gif | Bin .../main/resources => resources}/images/bulletU.png | Bin {src/main/resources => resources}/images/e1.gif | Bin {src/main/resources => resources}/images/e10.gif | Bin {src/main/resources => resources}/images/e11.gif | Bin {src/main/resources => resources}/images/e12.gif | Bin {src/main/resources => resources}/images/e13.gif | Bin {src/main/resources => resources}/images/e14.gif | Bin {src/main/resources => resources}/images/e15.gif | Bin {src/main/resources => resources}/images/e16.gif | Bin {src/main/resources => resources}/images/e2.gif | Bin {src/main/resources => resources}/images/e3.gif | Bin {src/main/resources => resources}/images/e4.gif | Bin {src/main/resources => resources}/images/e5.gif | Bin {src/main/resources => resources}/images/e6.gif | Bin {src/main/resources => resources}/images/e7.gif | Bin {src/main/resources => resources}/images/e8.gif | Bin {src/main/resources => resources}/images/e9.gif | Bin .../resources => resources}/images/missileLD.gif | Bin .../resources => resources}/images/missileLU.gif | Bin .../resources => resources}/images/missileRD.gif | Bin .../resources => resources}/images/missileRU.gif | Bin .../main/resources => resources}/images/square0.jpg | Bin .../main/resources => resources}/images/square1.jpg | Bin .../main/resources => resources}/images/square2.jpg | Bin .../main/resources => resources}/images/square3.jpg | Bin .../main/resources => resources}/images/square4.jpg | Bin .../main/resources => resources}/images/square5.jpg | Bin .../main/resources => resources}/images/square6.jpg | Bin {src/main/resources => resources}/images/tank.png | Bin {src/main/resources => resources}/images/tankD.gif | Bin {src/main/resources => resources}/images/tankL.gif | Bin {src/main/resources => resources}/images/tankLD.gif | Bin {src/main/resources => resources}/images/tankLU.gif | Bin {src/main/resources => resources}/images/tankR.gif | Bin {src/main/resources => resources}/images/tankRD.gif | Bin {src/main/resources => resources}/images/tankRU.gif | Bin {src/main/resources => resources}/images/tankU.gif | Bin src/{main/java => }/com/msb/Bullet.java | 0 src/{main/java => }/com/msb/DirEnum.java | 0 src/{main/java => }/com/msb/Explode.java | 0 src/{main/java => }/com/msb/GroupEnum.java | 0 src/{main/java => }/com/msb/PropertyMgr.java | 0 src/{main/java => }/com/msb/ResourcesMgr.java | 0 src/{main/java => }/com/msb/Tank.java | 0 src/{main/java => }/com/msb/TankDemo.java | 6 +++--- src/{main/java => }/com/msb/TankFrame.java | 0 .../java/com/msb => com/msb/test}/CommonTest.java | 3 ++- src/{main/java => }/com/msb/util/ImageUtil.java | 0 68 files changed, 5 insertions(+), 4 deletions(-) rename {src/main/resources => resources}/config.properties (100%) rename {src/main/resources => resources}/images/0.gif (100%) rename {src/main/resources => resources}/images/1.gif (100%) rename {src/main/resources => resources}/images/10.gif (100%) rename {src/main/resources => resources}/images/2.gif (100%) rename {src/main/resources => resources}/images/3.gif (100%) rename {src/main/resources => resources}/images/4.gif (100%) rename {src/main/resources => resources}/images/5.gif (100%) rename {src/main/resources => resources}/images/6.gif (100%) rename {src/main/resources => resources}/images/7.gif (100%) rename {src/main/resources => resources}/images/8.gif (100%) rename {src/main/resources => resources}/images/9.gif (100%) rename {src/main/resources => resources}/images/BadTank1.png (100%) rename {src/main/resources => resources}/images/BadTank2.png (100%) rename {src/main/resources => resources}/images/GoodTank1.png (100%) rename {src/main/resources => resources}/images/GoodTank2.png (100%) rename {src/main/resources => resources}/images/bulletD.gif (100%) rename {src/main/resources => resources}/images/bulletL.gif (100%) rename {src/main/resources => resources}/images/bulletR.gif (100%) rename {src/main/resources => resources}/images/bulletU.gif (100%) rename {src/main/resources => resources}/images/bulletU.png (100%) rename {src/main/resources => resources}/images/e1.gif (100%) rename {src/main/resources => resources}/images/e10.gif (100%) rename {src/main/resources => resources}/images/e11.gif (100%) rename {src/main/resources => resources}/images/e12.gif (100%) rename {src/main/resources => resources}/images/e13.gif (100%) rename {src/main/resources => resources}/images/e14.gif (100%) rename {src/main/resources => resources}/images/e15.gif (100%) rename {src/main/resources => resources}/images/e16.gif (100%) rename {src/main/resources => resources}/images/e2.gif (100%) rename {src/main/resources => resources}/images/e3.gif (100%) rename {src/main/resources => resources}/images/e4.gif (100%) rename {src/main/resources => resources}/images/e5.gif (100%) rename {src/main/resources => resources}/images/e6.gif (100%) rename {src/main/resources => resources}/images/e7.gif (100%) rename {src/main/resources => resources}/images/e8.gif (100%) rename {src/main/resources => resources}/images/e9.gif (100%) rename {src/main/resources => resources}/images/missileLD.gif (100%) rename {src/main/resources => resources}/images/missileLU.gif (100%) rename {src/main/resources => resources}/images/missileRD.gif (100%) rename {src/main/resources => resources}/images/missileRU.gif (100%) rename {src/main/resources => resources}/images/square0.jpg (100%) rename {src/main/resources => resources}/images/square1.jpg (100%) rename {src/main/resources => resources}/images/square2.jpg (100%) rename {src/main/resources => resources}/images/square3.jpg (100%) rename {src/main/resources => resources}/images/square4.jpg (100%) rename {src/main/resources => resources}/images/square5.jpg (100%) rename {src/main/resources => resources}/images/square6.jpg (100%) rename {src/main/resources => resources}/images/tank.png (100%) rename {src/main/resources => resources}/images/tankD.gif (100%) rename {src/main/resources => resources}/images/tankL.gif (100%) rename {src/main/resources => resources}/images/tankLD.gif (100%) rename {src/main/resources => resources}/images/tankLU.gif (100%) rename {src/main/resources => resources}/images/tankR.gif (100%) rename {src/main/resources => resources}/images/tankRD.gif (100%) rename {src/main/resources => resources}/images/tankRU.gif (100%) rename {src/main/resources => resources}/images/tankU.gif (100%) rename src/{main/java => }/com/msb/Bullet.java (100%) rename src/{main/java => }/com/msb/DirEnum.java (100%) rename src/{main/java => }/com/msb/Explode.java (100%) rename src/{main/java => }/com/msb/GroupEnum.java (100%) rename src/{main/java => }/com/msb/PropertyMgr.java (100%) rename src/{main/java => }/com/msb/ResourcesMgr.java (100%) rename src/{main/java => }/com/msb/Tank.java (100%) rename src/{main/java => }/com/msb/TankDemo.java (72%) rename src/{main/java => }/com/msb/TankFrame.java (100%) rename src/{test/java/com/msb => com/msb/test}/CommonTest.java (96%) rename src/{main/java => }/com/msb/util/ImageUtil.java (100%) diff --git a/src/main/resources/config.properties b/resources/config.properties similarity index 100% rename from src/main/resources/config.properties rename to resources/config.properties diff --git a/src/main/resources/images/0.gif b/resources/images/0.gif similarity index 100% rename from src/main/resources/images/0.gif rename to resources/images/0.gif diff --git a/src/main/resources/images/1.gif b/resources/images/1.gif similarity index 100% rename from src/main/resources/images/1.gif rename to resources/images/1.gif diff --git a/src/main/resources/images/10.gif b/resources/images/10.gif similarity index 100% rename from src/main/resources/images/10.gif rename to resources/images/10.gif diff --git a/src/main/resources/images/2.gif b/resources/images/2.gif similarity index 100% rename from src/main/resources/images/2.gif rename to resources/images/2.gif diff --git a/src/main/resources/images/3.gif b/resources/images/3.gif similarity index 100% rename from src/main/resources/images/3.gif rename to resources/images/3.gif diff --git a/src/main/resources/images/4.gif b/resources/images/4.gif similarity index 100% rename from src/main/resources/images/4.gif rename to resources/images/4.gif diff --git a/src/main/resources/images/5.gif b/resources/images/5.gif similarity index 100% rename from src/main/resources/images/5.gif rename to resources/images/5.gif diff --git a/src/main/resources/images/6.gif b/resources/images/6.gif similarity index 100% rename from src/main/resources/images/6.gif rename to resources/images/6.gif diff --git a/src/main/resources/images/7.gif b/resources/images/7.gif similarity index 100% rename from src/main/resources/images/7.gif rename to resources/images/7.gif diff --git a/src/main/resources/images/8.gif b/resources/images/8.gif similarity index 100% rename from src/main/resources/images/8.gif rename to resources/images/8.gif diff --git a/src/main/resources/images/9.gif b/resources/images/9.gif similarity index 100% rename from src/main/resources/images/9.gif rename to resources/images/9.gif diff --git a/src/main/resources/images/BadTank1.png b/resources/images/BadTank1.png similarity index 100% rename from src/main/resources/images/BadTank1.png rename to resources/images/BadTank1.png diff --git a/src/main/resources/images/BadTank2.png b/resources/images/BadTank2.png similarity index 100% rename from src/main/resources/images/BadTank2.png rename to resources/images/BadTank2.png diff --git a/src/main/resources/images/GoodTank1.png b/resources/images/GoodTank1.png similarity index 100% rename from src/main/resources/images/GoodTank1.png rename to resources/images/GoodTank1.png diff --git a/src/main/resources/images/GoodTank2.png b/resources/images/GoodTank2.png similarity index 100% rename from src/main/resources/images/GoodTank2.png rename to resources/images/GoodTank2.png diff --git a/src/main/resources/images/bulletD.gif b/resources/images/bulletD.gif similarity index 100% rename from src/main/resources/images/bulletD.gif rename to resources/images/bulletD.gif diff --git a/src/main/resources/images/bulletL.gif b/resources/images/bulletL.gif similarity index 100% rename from src/main/resources/images/bulletL.gif rename to resources/images/bulletL.gif diff --git a/src/main/resources/images/bulletR.gif b/resources/images/bulletR.gif similarity index 100% rename from src/main/resources/images/bulletR.gif rename to resources/images/bulletR.gif diff --git a/src/main/resources/images/bulletU.gif b/resources/images/bulletU.gif similarity index 100% rename from src/main/resources/images/bulletU.gif rename to resources/images/bulletU.gif diff --git a/src/main/resources/images/bulletU.png b/resources/images/bulletU.png similarity index 100% rename from src/main/resources/images/bulletU.png rename to resources/images/bulletU.png diff --git a/src/main/resources/images/e1.gif b/resources/images/e1.gif similarity index 100% rename from src/main/resources/images/e1.gif rename to resources/images/e1.gif diff --git a/src/main/resources/images/e10.gif b/resources/images/e10.gif similarity index 100% rename from src/main/resources/images/e10.gif rename to resources/images/e10.gif diff --git a/src/main/resources/images/e11.gif b/resources/images/e11.gif similarity index 100% rename from src/main/resources/images/e11.gif rename to resources/images/e11.gif diff --git a/src/main/resources/images/e12.gif b/resources/images/e12.gif similarity index 100% rename from src/main/resources/images/e12.gif rename to resources/images/e12.gif diff --git a/src/main/resources/images/e13.gif b/resources/images/e13.gif similarity index 100% rename from src/main/resources/images/e13.gif rename to resources/images/e13.gif diff --git a/src/main/resources/images/e14.gif b/resources/images/e14.gif similarity index 100% rename from src/main/resources/images/e14.gif rename to resources/images/e14.gif diff --git a/src/main/resources/images/e15.gif b/resources/images/e15.gif similarity index 100% rename from src/main/resources/images/e15.gif rename to resources/images/e15.gif diff --git a/src/main/resources/images/e16.gif b/resources/images/e16.gif similarity index 100% rename from src/main/resources/images/e16.gif rename to resources/images/e16.gif diff --git a/src/main/resources/images/e2.gif b/resources/images/e2.gif similarity index 100% rename from src/main/resources/images/e2.gif rename to resources/images/e2.gif diff --git a/src/main/resources/images/e3.gif b/resources/images/e3.gif similarity index 100% rename from src/main/resources/images/e3.gif rename to resources/images/e3.gif diff --git a/src/main/resources/images/e4.gif b/resources/images/e4.gif similarity index 100% rename from src/main/resources/images/e4.gif rename to resources/images/e4.gif diff --git a/src/main/resources/images/e5.gif b/resources/images/e5.gif similarity index 100% rename from src/main/resources/images/e5.gif rename to resources/images/e5.gif diff --git a/src/main/resources/images/e6.gif b/resources/images/e6.gif similarity index 100% rename from src/main/resources/images/e6.gif rename to resources/images/e6.gif diff --git a/src/main/resources/images/e7.gif b/resources/images/e7.gif similarity index 100% rename from src/main/resources/images/e7.gif rename to resources/images/e7.gif diff --git a/src/main/resources/images/e8.gif b/resources/images/e8.gif similarity index 100% rename from src/main/resources/images/e8.gif rename to resources/images/e8.gif diff --git a/src/main/resources/images/e9.gif b/resources/images/e9.gif similarity index 100% rename from src/main/resources/images/e9.gif rename to resources/images/e9.gif diff --git a/src/main/resources/images/missileLD.gif b/resources/images/missileLD.gif similarity index 100% rename from src/main/resources/images/missileLD.gif rename to resources/images/missileLD.gif diff --git a/src/main/resources/images/missileLU.gif b/resources/images/missileLU.gif similarity index 100% rename from src/main/resources/images/missileLU.gif rename to resources/images/missileLU.gif diff --git a/src/main/resources/images/missileRD.gif b/resources/images/missileRD.gif similarity index 100% rename from src/main/resources/images/missileRD.gif rename to resources/images/missileRD.gif diff --git a/src/main/resources/images/missileRU.gif b/resources/images/missileRU.gif similarity index 100% rename from src/main/resources/images/missileRU.gif rename to resources/images/missileRU.gif diff --git a/src/main/resources/images/square0.jpg b/resources/images/square0.jpg similarity index 100% rename from src/main/resources/images/square0.jpg rename to resources/images/square0.jpg diff --git a/src/main/resources/images/square1.jpg b/resources/images/square1.jpg similarity index 100% rename from src/main/resources/images/square1.jpg rename to resources/images/square1.jpg diff --git a/src/main/resources/images/square2.jpg b/resources/images/square2.jpg similarity index 100% rename from src/main/resources/images/square2.jpg rename to resources/images/square2.jpg diff --git a/src/main/resources/images/square3.jpg b/resources/images/square3.jpg similarity index 100% rename from src/main/resources/images/square3.jpg rename to resources/images/square3.jpg diff --git a/src/main/resources/images/square4.jpg b/resources/images/square4.jpg similarity index 100% rename from src/main/resources/images/square4.jpg rename to resources/images/square4.jpg diff --git a/src/main/resources/images/square5.jpg b/resources/images/square5.jpg similarity index 100% rename from src/main/resources/images/square5.jpg rename to resources/images/square5.jpg diff --git a/src/main/resources/images/square6.jpg b/resources/images/square6.jpg similarity index 100% rename from src/main/resources/images/square6.jpg rename to resources/images/square6.jpg diff --git a/src/main/resources/images/tank.png b/resources/images/tank.png similarity index 100% rename from src/main/resources/images/tank.png rename to resources/images/tank.png diff --git a/src/main/resources/images/tankD.gif b/resources/images/tankD.gif similarity index 100% rename from src/main/resources/images/tankD.gif rename to resources/images/tankD.gif diff --git a/src/main/resources/images/tankL.gif b/resources/images/tankL.gif similarity index 100% rename from src/main/resources/images/tankL.gif rename to resources/images/tankL.gif diff --git a/src/main/resources/images/tankLD.gif b/resources/images/tankLD.gif similarity index 100% rename from src/main/resources/images/tankLD.gif rename to resources/images/tankLD.gif diff --git a/src/main/resources/images/tankLU.gif b/resources/images/tankLU.gif similarity index 100% rename from src/main/resources/images/tankLU.gif rename to resources/images/tankLU.gif diff --git a/src/main/resources/images/tankR.gif b/resources/images/tankR.gif similarity index 100% rename from src/main/resources/images/tankR.gif rename to resources/images/tankR.gif diff --git a/src/main/resources/images/tankRD.gif b/resources/images/tankRD.gif similarity index 100% rename from src/main/resources/images/tankRD.gif rename to resources/images/tankRD.gif diff --git a/src/main/resources/images/tankRU.gif b/resources/images/tankRU.gif similarity index 100% rename from src/main/resources/images/tankRU.gif rename to resources/images/tankRU.gif diff --git a/src/main/resources/images/tankU.gif b/resources/images/tankU.gif similarity index 100% rename from src/main/resources/images/tankU.gif rename to resources/images/tankU.gif diff --git a/src/main/java/com/msb/Bullet.java b/src/com/msb/Bullet.java similarity index 100% rename from src/main/java/com/msb/Bullet.java rename to src/com/msb/Bullet.java diff --git a/src/main/java/com/msb/DirEnum.java b/src/com/msb/DirEnum.java similarity index 100% rename from src/main/java/com/msb/DirEnum.java rename to src/com/msb/DirEnum.java diff --git a/src/main/java/com/msb/Explode.java b/src/com/msb/Explode.java similarity index 100% rename from src/main/java/com/msb/Explode.java rename to src/com/msb/Explode.java diff --git a/src/main/java/com/msb/GroupEnum.java b/src/com/msb/GroupEnum.java similarity index 100% rename from src/main/java/com/msb/GroupEnum.java rename to src/com/msb/GroupEnum.java diff --git a/src/main/java/com/msb/PropertyMgr.java b/src/com/msb/PropertyMgr.java similarity index 100% rename from src/main/java/com/msb/PropertyMgr.java rename to src/com/msb/PropertyMgr.java diff --git a/src/main/java/com/msb/ResourcesMgr.java b/src/com/msb/ResourcesMgr.java similarity index 100% rename from src/main/java/com/msb/ResourcesMgr.java rename to src/com/msb/ResourcesMgr.java diff --git a/src/main/java/com/msb/Tank.java b/src/com/msb/Tank.java similarity index 100% rename from src/main/java/com/msb/Tank.java rename to src/com/msb/Tank.java diff --git a/src/main/java/com/msb/TankDemo.java b/src/com/msb/TankDemo.java similarity index 72% rename from src/main/java/com/msb/TankDemo.java rename to src/com/msb/TankDemo.java index 2f5edd7..b9e0274 100644 --- a/src/main/java/com/msb/TankDemo.java +++ b/src/com/msb/TankDemo.java @@ -11,15 +11,15 @@ import java.util.Random; public class TankDemo { public static void main(String[] args) throws InterruptedException { - com.msb.TankFrame tankFrame = new com.msb.TankFrame(); + TankFrame tankFrame = new TankFrame(); Random random = new Random(); - int initTankCount = Integer.parseInt(com.msb.PropertyMgr.getString("initTankCount")); + int initTankCount = Integer.parseInt(PropertyMgr.getString("initTankCount")); //创建5个敌方坦克 for (int i=0; i