guyanqing hace 10 meses
padre
commit
98dd85127f
Se han modificado 100 ficheros con 204 adiciones y 1634 borrados
  1. 0 178
      src/main/java/com/sf/game/GameWin.java
  2. 0 35
      src/main/java/com/sf/game/obj/BgObj.java
  3. 0 41
      src/main/java/com/sf/game/obj/BossBullet.java
  4. 0 116
      src/main/java/com/sf/game/obj/BossObj.java
  5. 0 38
      src/main/java/com/sf/game/obj/DoubleShellObj.java
  6. 0 83
      src/main/java/com/sf/game/obj/Enemy1Obj.java
  7. 0 34
      src/main/java/com/sf/game/obj/Enemy2BulletObj.java
  8. 0 100
      src/main/java/com/sf/game/obj/Enemy2Obj.java
  9. 0 27
      src/main/java/com/sf/game/obj/ExplodeObj.java
  10. 0 113
      src/main/java/com/sf/game/obj/GameObj.java
  11. 0 37
      src/main/java/com/sf/game/obj/GiftObj.java
  12. 0 114
      src/main/java/com/sf/game/obj/LittleBoss1.java
  13. 0 39
      src/main/java/com/sf/game/obj/LittleBoss1Bullet.java
  14. 0 120
      src/main/java/com/sf/game/obj/LittleBoss2.java
  15. 0 106
      src/main/java/com/sf/game/obj/LittleBoss2Bullet.java
  16. 0 176
      src/main/java/com/sf/game/obj/PlaneObj.java
  17. 0 36
      src/main/java/com/sf/game/obj/ShellObj.java
  18. 0 38
      src/main/java/com/sf/game/obj/TripleShellObj.java
  19. 0 29
      src/main/java/com/sf/game/obj/WaringObj.java
  20. 0 81
      src/main/java/com/sf/game/utils/GameUtils.java
  21. 1 1
      src/main/java/com/sf/javase/day01/Test1.java
  22. 1 1
      src/main/java/com/sf/javase/day01/TestC.java
  23. 1 1
      src/main/java/com/sf/javase/day01/TestFirst.java
  24. 1 1
      src/main/java/com/sf/javase/day02/T.java
  25. 1 1
      src/main/java/com/sf/javase/day03/ArrayTest.java
  26. 1 1
      src/main/java/com/sf/javase/day03/ArrayWorker.java
  27. 1 1
      src/main/java/com/sf/javase/day03/T.java
  28. 1 1
      src/main/java/com/sf/javase/day03/T2.java
  29. 1 1
      src/main/java/com/sf/javase/day04/T.java
  30. 1 1
      src/main/java/com/sf/javase/day04/T2.java
  31. 1 1
      src/main/java/com/sf/javase/day05/T.java
  32. 1 1
      src/main/java/com/sf/javase/day06/Animal.java
  33. 1 1
      src/main/java/com/sf/javase/day06/AnimalTest.java
  34. 1 1
      src/main/java/com/sf/javase/day06/Car.java
  35. 1 4
      src/main/java/com/sf/javase/day06/ObjectArray/Student.java
  36. 1 1
      src/main/java/com/sf/javase/day06/Student.java
  37. 1 1
      src/main/java/com/sf/javase/day06/T.java
  38. 1 1
      src/main/java/com/sf/javase/day06/car/BSX.java
  39. 1 3
      src/main/java/com/sf/javase/day06/car/Car.java
  40. 1 1
      src/main/java/com/sf/javase/day06/car/CarTest.java
  41. 1 1
      src/main/java/com/sf/javase/day06/car/DP.java
  42. 1 1
      src/main/java/com/sf/javase/day06/car/FDJ.java
  43. 1 3
      src/main/java/com/sf/javase/day06/person/Person.java
  44. 1 1
      src/main/java/com/sf/javase/day06/person/PersonTest.java
  45. 1 1
      src/main/java/com/sf/javase/day06/person/Phone.java
  46. 1 1
      src/main/java/com/sf/javase/day07/Animal.java
  47. 1 1
      src/main/java/com/sf/javase/day07/AnimalTest.java
  48. 1 1
      src/main/java/com/sf/javase/day07/Student.java
  49. 1 1
      src/main/java/com/sf/javase/day07/T.java
  50. 1 1
      src/main/java/com/sf/javase/day07/extend/Cat.java
  51. 1 1
      src/main/java/com/sf/javase/day07/extend/Dog.java
  52. 1 1
      src/main/java/com/sf/javase/day07/extend/entend1/Animal.java
  53. 1 1
      src/main/java/com/sf/javase/day07/extend/entend1/Cat.java
  54. 1 1
      src/main/java/com/sf/javase/day07/extend/entend1/Dog.java
  55. 1 1
      src/main/java/com/sf/javase/day07/extend/entend1/T.java
  56. 1 1
      src/main/java/com/sf/javase/day07/homework/Book.java
  57. 1 1
      src/main/java/com/sf/javase/day07/homework/CreditCard.java
  58. 1 1
      src/main/java/com/sf/javase/day07/homework/DepositCard.java
  59. 1 2
      src/main/java/com/sf/javase/day07/homework/HomeTest.java
  60. 1 1
      src/main/java/com/sf/javase/day07/homework/Test.java
  61. 1 1
      src/main/java/com/sf/javase/day07/homework/Triangle.java
  62. 1 1
      src/main/java/com/sf/javase/day07/homework/User.java
  63. 1 1
      src/main/java/com/sf/javase/day07/homework/UserManager.java
  64. 1 1
      src/main/java/com/sf/javase/day08/City.java
  65. 1 1
      src/main/java/com/sf/javase/day08/Country.java
  66. 1 3
      src/main/java/com/sf/javase/day08/Student.java
  67. 1 1
      src/main/java/com/sf/javase/day08/T.java
  68. 1 1
      src/main/java/com/sf/javase/day08/T2.java
  69. 1 1
      src/main/java/com/sf/javase/day08/duotai/Animal.java
  70. 1 1
      src/main/java/com/sf/javase/day08/duotai/Cat.java
  71. 1 3
      src/main/java/com/sf/javase/day08/duotai/Dog.java
  72. 1 3
      src/main/java/com/sf/javase/day08/duotai/Monkey.java
  73. 1 1
      src/main/java/com/sf/javase/day08/duotai/Test09.java
  74. 1 1
      src/main/java/com/sf/javase/day08/duotai/Test10.java
  75. 1 1
      src/main/java/com/sf/javase/day08/finalP/T.java
  76. 1 1
      src/main/java/com/sf/javase/day08/finalP/T1.java
  77. 1 1
      src/main/java/com/sf/javase/day08/homework/Child11.java
  78. 1 1
      src/main/java/com/sf/javase/day08/homework/Employee.java
  79. 1 1
      src/main/java/com/sf/javase/day08/homework/Father.java
  80. 1 1
      src/main/java/com/sf/javase/day08/homework/Test.java
  81. 1 1
      src/main/java/com/sf/javase/day08/homework/Test03.java
  82. 1 1
      src/main/java/com/sf/javase/day08/homework/TestP.java
  83. 1 1
      src/main/java/com/sf/javase/day09/A1.java
  84. 1 1
      src/main/java/com/sf/javase/day09/A2.java
  85. 1 1
      src/main/java/com/sf/javase/day09/A3.java
  86. 1 1
      src/main/java/com/sf/javase/day09/Cook.java
  87. 1 1
      src/main/java/com/sf/javase/day09/Employee.java
  88. 1 1
      src/main/java/com/sf/javase/day09/Manager.java
  89. 1 1
      src/main/java/com/sf/javase/day09/homework/Exercise28.java
  90. 1 1
      src/main/java/com/sf/javase/day09/homework/Test07.java
  91. 1 1
      src/main/java/com/sf/javase/day09/homework/lianxi/ShapeInterface.java
  92. 2 2
      src/main/java/com/sf/javase/day09/homework/lianxi/impl/Circle.java
  93. 2 3
      src/main/java/com/sf/javase/day09/homework/lianxi/impl/Rectangle.java
  94. 1 1
      src/main/java/com/sf/javase/day09/interface1/BuildCarsInterface.java
  95. 2 2
      src/main/java/com/sf/javase/day09/interface1/impl/BuildCarsInterfaceImpl.java
  96. 7 0
      src/main/java/com/sf/javase/day10/innerclass/InnerclassDemo.java
  97. 31 0
      src/main/java/com/sf/javase/day10/innerclass/Outer01.java
  98. 43 0
      src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer02.java
  99. 9 0
      src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer02Demo.java
  100. 36 0
      src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer03.java

+ 0 - 178
src/main/java/com/sf/game/GameWin.java

@@ -1,178 +0,0 @@
-package com.sf.game;
-
-import com.sf.game.obj.*;
-import com.sf.game.utils.GameUtils;
-import org.omg.IOP.TaggedComponentHelper;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.security.PublicKey;
-
-//启动类
-public class GameWin extends JFrame {
-    //记录游戏的状态
-    // 0 未开始  1  游戏中  2 暂停  3 失败  4 成功通关
-    public static int state = 0;
-    //创建背景图片
-    BgObj bgObj = new BgObj(GameUtils.bdImg,0,-1800,2);
-    //定义一个图片的变量
-    Image offScreenImage = null;
-    // 我方法飞机对象
-    PlaneObj planeObj = new PlaneObj(GameUtils.planeImg,37,41,290,550,0,this);
-    //记录游戏绘画的次数
-    int count = 1;
-
-    //先创建小飞机1的对象
-    LittleBoss1 littleBoss1 = new LittleBoss1(GameUtils.littleboss1Img,172,112,-200,350,3,this);
-    //先创建小飞机2的对象
-    LittleBoss2 littleBoss2 = new LittleBoss2(GameUtils.littleboss2Img,172,112,300,-150,2,this);
-    //敌方飞机
-    BossObj bossObj = new BossObj(GameUtils.bossImg,240,172,180,-180,3,this);
-    //获取警告对象
-    WaringObj waringObj = new WaringObj(GameUtils.warningImg,599,90,0,350,0,this);
-    //定一个变量来存储分数
-    public static int score = 0;
-    //我方飞机的下标
-    public static int planeindex = 0;
-    public void launch(){
-        //设置游戏窗口的大小--前提可见
-        this.setVisible(true);
-        //设置窗口的大小
-        this.setSize(600,800);
-        //窗口的位置
-        this.setLocationRelativeTo(null);
-        //设置标题
-        this.setTitle("爱扣钉飞机大战~");
-        //关闭窗口后自动结束进程
-        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        //将所有的要绘画的游戏物件全部放在集合中
-        GameUtils.gameObjList.add(bgObj);
-        GameUtils.gameObjList.add(planeObj);
-        planeindex= GameUtils.gameObjList.indexOf(planeObj);  //获取我放飞机的下标
-
-        //添加鼠标的点击事件
-        this.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-              if(e.getButton() == 1 && state == 0){
-                  state = 1;//游戏已经开始
-              }
-            }
-        });
-
-        // 添加键盘监听事件
-        this.addKeyListener(new KeyAdapter() {
-            @Override
-            public void keyPressed(KeyEvent e) {
-              if(e.getKeyCode() == 32){
-                  if(state == 1){
-                      state = 2;
-                  }else if(state == 2){
-                      state = 1;
-                  }
-              }
-            }
-        });
-
-        while (true){
-            createObj();
-        }
-
-
-
-    }
-
-    private void createObj() {
-        //产生子弹  并且需要控制子弹的速度
-        if(count % 15 ==0){
-            if(planeObj.times ==0){   //产生一级子弹
-                GameUtils.shellObjList.add(new ShellObj(GameUtils.shellImg,14,29,planeObj.getX()+12,
-                        planeObj.getY() - 20,5,this));
-                GameUtils.gameObjList.add(GameUtils.shellObjList.get(GameUtils.shellObjList.size() - 1));
-            }
-            if(planeObj.times ==1) {   //产生二级子弹
-                GameUtils.doubleShellObjList.add(new DoubleShellObj(GameUtils.doubleShellImg,32,64,planeObj.getX()+5,planeObj.getY()-20,8,this));
-                GameUtils.gameObjList.add(GameUtils.doubleShellObjList.get(GameUtils.doubleShellObjList.size()-1));
-            }
-            if(planeObj.times ==2){   //产生三级子弹
-                GameUtils.tripleShellObjList.add(new TripleShellObj(GameUtils.tripleShellImg,64,182,planeObj.getX()-5,planeObj.getY()-100,15,this));
-                GameUtils.gameObjList.add(GameUtils.tripleShellObjList.get(GameUtils.tripleShellObjList.size()-1));
-            }
-        }
-
-        // 构建两种敌方飞机
-        if(count % 15 ==0){   //控制地方飞机的产生速度
-            GameUtils.enemy1ObjList.add(new Enemy1Obj(GameUtils.enemy1Img,32,24,(int)((Math.random()*10)*60),0,5,this));
-            GameUtils.gameObjList.add(GameUtils.enemy1ObjList.get(GameUtils.enemy1ObjList.size()-1));
-        }
-        if(count % 20 ==0) { //控制地方飞机的产生速度
-            if(count % 100 ==0){
-                GameUtils.enemy2ObjList.add(new Enemy2Obj(GameUtils.enemy2Img,44,67,(int)((Math.random()*10)*60),0,2,this));
-                GameUtils.gameObjList.add(GameUtils.enemy2ObjList.get(GameUtils.enemy2ObjList.size()-1));
-            }
-            if(GameUtils.enemy2ObjList.size() > 0){
-                int x  = (GameUtils.enemy2ObjList.get(GameUtils.enemy2ObjList.size()-1)).getX();
-                int y  = (GameUtils.enemy2ObjList.get(GameUtils.enemy2ObjList.size()-1)).getY();
-                GameUtils.enemy2BulletObjList.add(new Enemy2BulletObj(GameUtils.enemy2bulletImg,14,25,x+17,y+=15,5,this));
-                GameUtils.gameObjList.add(GameUtils.enemy2BulletObjList.get(GameUtils.enemy2BulletObjList.size() -1));
-            }
-        }
-
-        if(count==600 && (!GameUtils.gameObjList.contains(littleBoss2))){
-            GameUtils.gameObjList.add(littleBoss2);
-        }
-        if(count==800 && (!GameUtils.gameObjList.contains(littleBoss1))){
-            GameUtils.gameObjList.add(littleBoss1);
-        }
-
-        if(count % 15 == 0){
-            if(GameUtils.gameObjList.contains(littleBoss1)){
-                GameUtils.littleBoss1BulletList.add(new LittleBoss1Bullet(GameUtils.littleBoss1BulletImg,42,42,littleBoss1.getX()+75,littleBoss1.getY()+100,4, this));
-                GameUtils.gameObjList.add(GameUtils.littleBoss1BulletList.get(GameUtils.littleBoss1BulletList.size()-1));
-            }
-        }
-
-        if(count % 40 == 0) {
-            if(GameUtils.gameObjList.contains(littleBoss2)){
-                GameUtils.littleBoss2BulletList.add(new LittleBoss2Bullet(GameUtils.littleBoss2BulletImg,21,59,littleBoss2.getX()+78,littleBoss2.getY()+100,8,this));
-                GameUtils.gameObjList.add(GameUtils.littleBoss2BulletList.get(GameUtils.littleBoss2BulletList.size()-1));
-            }
-        }
-
-        if(count == 1300 && (!GameUtils.gameObjList.contains(bossObj))){
-            GameUtils.gameObjList.add(bossObj);
-        }
-
-        if(count % 20 ==0){
-            if(GameUtils.gameObjList.contains(bossObj)){
-                //这是地方一号子弹
-                GameUtils.littleBoss1BulletList.add(new LittleBoss1Bullet(GameUtils.littleBoss1BulletImg,42,42,bossObj.getX()+10,bossObj.getY()+130,6,this));
-                GameUtils.gameObjList.add(GameUtils.littleBoss1BulletList.get(GameUtils.littleBoss1BulletList.size()-1));
-            }
-
-            if (count % 40 ==0){
-                GameUtils.littleBoss2BulletList.add(new LittleBoss2Bullet(GameUtils.littleBoss2BulletImg,21,59,bossObj.getX()+220,bossObj.getY()+130,10,this));
-                GameUtils.gameObjList.add(GameUtils.littleBoss2BulletList.get(GameUtils.littleBoss2BulletList.size()-1));
-            }
-
-            //boss 子弹
-            GameUtils.bossBulletList.add(new BossBullet(GameUtils.bossBulletImg,51,72,bossObj.getX()+70,bossObj.getY()+100,9,this));
-            GameUtils.gameObjList.add(GameUtils.bossBulletList.get(GameUtils.bossBulletList.size()-1));
-        }
-        if(count ==1225 && (!GameUtils.gameObjList.contains(waringObj))){
-            GameUtils.gameObjList.add(waringObj);
-        }
-        if(count ==1290){
-            GameUtils.removeList.add(waringObj);
-        }
-        }
-
-    public static void main(String[] args) {
-        GameWin gameWin = new GameWin();
-        gameWin.launch();
-    }
-}

+ 0 - 35
src/main/java/com/sf/game/obj/BgObj.java

@@ -1,35 +0,0 @@
-package com.sf.game.obj;
-
-
-
-import com.sf.game.GameWin;
-
-import java.awt.*;
-
-public class BgObj extends GameObj{
-	public BgObj() {
-		super();
-	}
-
-	public BgObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public BgObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		if(y>=0){
-			y=-1800;
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 41
src/main/java/com/sf/game/obj/BossBullet.java

@@ -1,41 +0,0 @@
-package com.sf.game.obj;
-
-
-
-import com.sf.game.GameWin;
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-
-public class BossBullet extends GameObj{
-	public BossBullet() {
-		super();
-	}
-
-	public BossBullet(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public BossBullet(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public BossBullet(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 116
src/main/java/com/sf/game/obj/BossObj.java

@@ -1,116 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.GameWin;
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-
-public class BossObj extends GameObj{
-	int health=30;
-	public BossObj() {
-		super();
-	}
-
-	public BossObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public BossObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public BossObj(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		if(y<40){
-			y+=speed;
-		}else {
-			x+=speed;
-			if(x<0||x>360){
-				speed=-speed;
-			}
-		}
-		//首先是我方一级子弹和boss进行碰撞检测
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())&&health>0){
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				health--;
-			} else if (this.getRec().intersects(shellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.state=4;
-				GameWin.score+=10;
-			}
-		}
-		//首先是我方二级子弹和boss进行碰撞检测
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())&&health>0){
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				health-=3;
-			} else if (this.getRec().intersects(doubleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.state=4;
-				GameWin.score+=10;
-			}
-		}
-		//首先是我方三级子弹和boss进行碰撞检测
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())&&health>0){
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				health-=5;
-			} else if (this.getRec().intersects(tripleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.state=4;
-				GameWin.score+=10;
-			}
-		}
-		//白色矩形
-		g.setColor(Color.WHITE);
-		g.fillRect(200,40,200,10);
-		//红色矩形
-		g.setColor(Color.RED);
-		g.fillRect(200,40,health*200/30,10);
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 38
src/main/java/com/sf/game/obj/DoubleShellObj.java

@@ -1,38 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.GameWin;
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-
-public class DoubleShellObj extends GameObj{
-	public DoubleShellObj() {
-		super();
-	}
-
-	public DoubleShellObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public DoubleShellObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public DoubleShellObj(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y-=speed;
-		if(y<0){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 83
src/main/java/com/sf/game/obj/Enemy1Obj.java

@@ -1,83 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-import com.sf.game.GameWin;
-
-import java.awt.*;
-
-public class Enemy1Obj extends GameObj{
-	public Enemy1Obj() {
-		super();
-	}
-
-	public Enemy1Obj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public Enemy1Obj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		//一级子弹和敌方小飞机的碰撞
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				this.setX(-200);
-				this.setY(-200);
-				GameUtils.removeList.add(shellObj);
-				GameUtils.removeList.add(this);
-				GameWin.score+=1;
-			}
-		}
-		//二级子弹和敌方小飞机的碰撞
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				this.setX(-200);
-				this.setY(-200);
-				GameUtils.removeList.add(doubleshellObj);
-				GameUtils.removeList.add(this);
-				GameWin.score+=1;
-			}
-		}
-		//三级子弹和敌方小飞机的碰撞
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				this.setX(-200);
-				this.setY(-200);
-				GameUtils.removeList.add(tripleshellObj);
-				GameUtils.removeList.add(this);
-				GameWin.score+=1;
-			}
-		}
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 34
src/main/java/com/sf/game/obj/Enemy2BulletObj.java

@@ -1,34 +0,0 @@
-package com.sf.game.obj;
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class Enemy2BulletObj extends GameObj{
-	public Enemy2BulletObj() {
-		super();
-	}
-
-	public Enemy2BulletObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public Enemy2BulletObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 100
src/main/java/com/sf/game/obj/Enemy2Obj.java

@@ -1,100 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-import com.sf.game.GameWin;
-public class Enemy2Obj extends GameObj{
-	//设置血量属性
-	int health=3;
-
-	public Enemy2Obj() {
-		super();
-	}
-
-	public Enemy2Obj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public Enemy2Obj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		//一级子弹和敌方大飞机的碰撞检测
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())&&health>0){
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				health--;
-			} else if (this.getRec().intersects(shellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				this.x=-100;
-				this.y=-100;
-				GameUtils.removeList.add(this);
-				GameWin.score+=2;
-			}
-		}
-		//二级子弹和敌方大飞机的碰撞检测
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())&&health>0){
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				health-=3;
-			} else if (this.getRec().intersects(doubleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				this.x=-100;
-				this.y=-100;
-				GameUtils.removeList.add(this);
-				GameWin.score+=2;
-			}
-		}
-		//三级子弹和敌方大飞机的碰撞检测
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())&&health>0){
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				health-=5;
-			} else if (this.getRec().intersects(tripleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				this.x=-100;
-				this.y=-100;
-				GameUtils.removeList.add(this);
-				GameWin.score+=2;
-			}
-		}
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 27
src/main/java/com/sf/game/obj/ExplodeObj.java

@@ -1,27 +0,0 @@
-package com.sf.game.obj;
-
-import java.awt.*;
-import com.sf.game.utils.GameUtils;
-public class ExplodeObj extends GameObj{
-	static Image[] explodePic=new Image[16];
-	int explodeCount=0;
-	static {
-		for(int i=0;i< explodePic.length;i++){
-			explodePic[i]=Toolkit.getDefaultToolkit().getImage("imgs/explode/e"+(i+1)+".gif");
-		}
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		if(explodeCount<16){
-			super.img=explodePic[explodeCount];
-			super.paintSelf(g);
-			explodeCount++;
-		}
-	}
-
-	public ExplodeObj(int x, int y) {
-		super(x, y);
-	}
-}

+ 0 - 113
src/main/java/com/sf/game/obj/GameObj.java

@@ -1,113 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.GameWin;
-import java.awt.*;
-
-//所有游戏元素的父类
-public class GameObj {
-	//元素的图片
-	Image img;
-	//游戏元素的大小
-	int width;
-	int height;
-	//游戏元素的位置
-	int x;
-	int y;
-	//元素的运动速度
-	double speed;
-	//窗口类
-	GameWin frame;
-
-	//set和get方法
-	public Image getImg() {
-		return img;
-	}
-
-	public void setImg(Image img) {
-		this.img = img;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public void setWidth(int width) {
-		this.width = width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-
-	public void setHeight(int height) {
-		this.height = height;
-	}
-
-	public int getX() {
-		return x;
-	}
-
-	public void setX(int x) {
-		this.x = x;
-	}
-
-	public int getY() {
-		return y;
-	}
-
-	public void setY(int y) {
-		this.y = y;
-	}
-
-	public double getSpeed() {
-		return speed;
-	}
-
-	public void setSpeed(double speed) {
-		this.speed = speed;
-	}
-
-	public GameWin getFrame() {
-		return frame;
-	}
-
-	public void setFrame(GameWin frame) {
-		this.frame = frame;
-	}
-    //构造方法
-	public GameObj() {
-	}
-
-	public GameObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		this.img = img;
-		this.width = width;
-		this.height = height;
-		this.x = x;
-		this.y = y;
-		this.speed = speed;
-		this.frame = frame;
-	}
-
-	public GameObj(Image img, int x, int y, double speed) {
-		this.img = img;
-		this.x = x;
-		this.y = y;
-		this.speed = speed;
-	}
-
-	public GameObj(int x, int y) {
-		this.x = x;
-		this.y = y;
-	}
-
-	//绘制元素自身的方法
-	public void paintSelf(Graphics g){
-		g.drawImage(img,x,y,null);
-	}
-	//获取自身矩形的方法,用来进行碰撞检测
-	public Rectangle getRec(){
-		return new Rectangle(x,y,width,height);
-	}
-
-}

+ 0 - 37
src/main/java/com/sf/game/obj/GiftObj.java

@@ -1,37 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.utils.GameUtils;
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class GiftObj extends GameObj{
-	public GiftObj() {
-		super();
-	}
-
-	public GiftObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public GiftObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public GiftObj(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.img= GameUtils.giftImg;
-		super.width=64;
-		super.height=62;
-		super.paintSelf(g);
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 114
src/main/java/com/sf/game/obj/LittleBoss1.java

@@ -1,114 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.utils.GameUtils;
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class LittleBoss1 extends GameObj{
-	int health=10;
-	public LittleBoss1() {
-		super();
-	}
-
-	public LittleBoss1(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public LittleBoss1(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public LittleBoss1(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		x+=speed;
-		if(x>400){
-			speed=-1;
-		}
-		//敌方1号boss和我方子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())&&health>0){
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				health--;
-			} else if (this.getRec().intersects(shellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-		//敌方1号boss和我方二级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())&&health>0){
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				health-=3;
-			} else if (this.getRec().intersects(doubleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-		//敌方1号boss和我方三级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())&&health>0){
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				health-=5;
-			} else if (this.getRec().intersects(tripleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 39
src/main/java/com/sf/game/obj/LittleBoss1Bullet.java

@@ -1,39 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class LittleBoss1Bullet extends GameObj{
-	public LittleBoss1Bullet() {
-		super();
-	}
-
-	public LittleBoss1Bullet(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public LittleBoss1Bullet(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public LittleBoss1Bullet(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y+=speed;
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 120
src/main/java/com/sf/game/obj/LittleBoss2.java

@@ -1,120 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.utils.GameUtils;
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class LittleBoss2 extends GameObj{
-	int health=10;
-	public LittleBoss2() {
-		super();
-	}
-
-	public LittleBoss2(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public LittleBoss2(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public LittleBoss2(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		if(y<150){
-			y+=2;
-		}else{
-			x+=speed;
-			if(x>400||x<10){
-				speed=-speed;
-			}
-		}
-
-		//敌方1号boss和我方子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())&&health>0){
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				health--;
-			} else if (this.getRec().intersects(shellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-
-				shellObj.setX(-100);
-				shellObj.setY(-100);
-				GameUtils.removeList.add(shellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-		//敌方2号boss和我方二级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())&&health>0){
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				health-=3;
-			} else if (this.getRec().intersects(doubleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setY(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-		//敌方2号boss和我方三级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())&&health>0){
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				health-=5;
-			} else if (this.getRec().intersects(tripleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//当敌方小boss被击毁的时候才会出现补给品
-				GiftObj giftObj=new GiftObj(this.x,this.y);
-				GameUtils.giftObjList.add(giftObj);
-				GameUtils.gameObjList.addAll(GameUtils.giftObjList);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setY(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=5;
-			}
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 106
src/main/java/com/sf/game/obj/LittleBoss2Bullet.java

@@ -1,106 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class LittleBoss2Bullet extends GameObj{
-	int health=2;
-	public LittleBoss2Bullet() {
-		super();
-	}
-
-	public LittleBoss2Bullet(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public LittleBoss2Bullet(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public LittleBoss2Bullet(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		//实现追踪功能
-		this.y+=speed;
-		this.x-=(this.x-GameUtils.gameObjList.get(GameWin.planeindex).getX())/30;
-
-		//敌方2号boss子弹和我方子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(ShellObj shellObj: GameUtils.shellObjList){
-			if(this.getRec().intersects(shellObj.getRec())&&health>0){
-				shellObj.setX(-100);
-				shellObj.setX(-100);
-				GameUtils.removeList.add(shellObj);
-				health--;
-			} else if (this.getRec().intersects(shellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				shellObj.setX(-100);
-				shellObj.setX(-100);
-				GameUtils.removeList.add(shellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=3;
-			}
-		}
-		//敌方2号boss子弹和我方二级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(DoubleShellObj doubleshellObj: GameUtils.doubleShellObjList){
-			if(this.getRec().intersects(doubleshellObj.getRec())&&health>0){
-				doubleshellObj.setX(-100);
-				doubleshellObj.setX(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				health-=3;
-			} else if (this.getRec().intersects(doubleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				doubleshellObj.setX(-100);
-				doubleshellObj.setX(-100);
-				GameUtils.removeList.add(doubleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=3;
-			}
-		}
-		//敌方2号boss子弹和我方三级子弹碰撞之后,我方子弹消失,当1号boss血量为0的时候,1号boss也会消失,否则不会消失
-		for(TripleShellObj tripleshellObj: GameUtils.tripleShellObjList){
-			if(this.getRec().intersects(tripleshellObj.getRec())&&health>0){
-				tripleshellObj.setX(-100);
-				tripleshellObj.setX(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				health-=5;
-			} else if (this.getRec().intersects(tripleshellObj.getRec())&&health<=0) {
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				tripleshellObj.setX(-100);
-				tripleshellObj.setX(-100);
-				GameUtils.removeList.add(tripleshellObj);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.score+=3;
-			}
-		}
-		//越界判断
-		if(this.y>800){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 176
src/main/java/com/sf/game/obj/PlaneObj.java

@@ -1,176 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-import com.sf.game.GameWin;
-
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class PlaneObj extends GameObj{
-	//记录我方飞机碰撞补给的次数
-	public static int times=1;
-	LittleBoss1 littleBoss1=new LittleBoss1();
-	LittleBoss2 littleBoss2=new LittleBoss2();
-	public PlaneObj() {
-		super();
-	}
-
-	public PlaneObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-		//添加鼠标的移动事件
-		this.frame.addMouseMotionListener(new MouseAdapter() {
-			@Override
-			public void mouseMoved(MouseEvent e) {
-				PlaneObj.super.x=e.getX()-19;
-				PlaneObj.super.y=e.getY()-20;
-			}
-		});
-	}
-
-	public PlaneObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		//我方飞机与敌方小飞机的碰撞检测,碰撞时候我方飞机和敌方小飞机都会消失
-		for(Enemy1Obj enemy1Obj:GameUtils.enemy1ObjList){
-			if(this.getRec().intersects(enemy1Obj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//让敌方小飞机消失的处理方法就是改变其坐标,让它消失在游戏窗口中,并不是真正的消失
-				enemy1Obj.setX(-100);
-				enemy1Obj.setY(-100);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(enemy1Obj);
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-		//我方飞机与敌方大飞机的碰撞检测,碰撞时候我方飞机和敌方大飞机都会消失
-		for(Enemy2Obj enemy2Obj:GameUtils.enemy2ObjList){
-			if(this.getRec().intersects(enemy2Obj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//让敌方小飞机消失的处理方法就是改变其坐标,让它消失在游戏窗口中,并不是真正的消失
-				enemy2Obj.setX(-100);
-				enemy2Obj.setY(-100);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(enemy2Obj);
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-		//我方飞机与敌方大飞机子弹的碰撞检测,碰撞时候我方飞机和敌方大飞机子弹都会消失
-		for(Enemy2BulletObj enemy2BulletObj:GameUtils.enemy2BulletObjList){
-			if(this.getRec().intersects(enemy2BulletObj.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				//让敌方小飞机消失的处理方法就是改变其坐标,让它消失在游戏窗口中,并不是真正的消失
-				enemy2BulletObj.setX(-100);
-				enemy2BulletObj.setY(-100);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(enemy2BulletObj);
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-		//当敌方boss1和我方飞机碰撞的时候,我方飞机消失,敌方飞机不消失
-		if(this.getRec().intersects(littleBoss1.getRec())){
-			//绘制爆炸
-			ExplodeObj explodeObj=new ExplodeObj(x,y);
-			GameUtils.explodeObjList.add(explodeObj);
-			GameUtils.removeList.add(explodeObj);
-			this.x=-200;
-			this.y=-200;
-			GameUtils.removeList.add(this);
-			GameWin.state=3;
-		}
-		//当敌方boss2和我方飞机碰撞的时候,我方飞机消失,敌方飞机不消失
-		if(this.getRec().intersects(littleBoss2.getRec())){
-			//绘制爆炸
-			ExplodeObj explodeObj=new ExplodeObj(x,y);
-			GameUtils.explodeObjList.add(explodeObj);
-			GameUtils.removeList.add(explodeObj);
-			this.x=-200;
-			this.y=-200;
-			GameUtils.removeList.add(this);
-			GameWin.state=3;
-		}
-		//当我方飞机和敌方1号boss子弹碰撞之后,两者都消失
-		for (LittleBoss1Bullet littleBoss1Bullet:GameUtils.littleBoss1BulletList) {
-			if(this.getRec().intersects(littleBoss1Bullet.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				littleBoss1Bullet.setX(-100);
-				littleBoss1Bullet.setY(-100);
-				GameUtils.removeList.add(littleBoss1Bullet);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-		//当我方飞机和敌方2号boss子弹碰撞之后,两者都消失
-		for (LittleBoss2Bullet littleBoss2Bullet:GameUtils.littleBoss2BulletList) {
-			if(this.getRec().intersects(littleBoss2Bullet.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				littleBoss2Bullet.setX(-100);
-				littleBoss2Bullet.setY(-100);
-				GameUtils.removeList.add(littleBoss2Bullet);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-		//我方飞机碰撞补给之后,补给消失,我方飞机不消失
-		for (GiftObj giftObj: GameUtils.giftObjList) {
-			if(this.getRec().intersects(giftObj.getRec())){
-				giftObj.setX(-100);
-				giftObj.setY(-100);
-				GameUtils.removeList.add(giftObj);
-				times++;
-			}
-		}
-		//我方飞机碰撞boss子弹后,两者都消失
-		for(BossBullet bossBullet:GameUtils.bossBulletList){
-			if(this.getRec().intersects(bossBullet.getRec())){
-				//绘制爆炸
-				ExplodeObj explodeObj=new ExplodeObj(x,y);
-				GameUtils.explodeObjList.add(explodeObj);
-				GameUtils.removeList.add(explodeObj);
-				bossBullet.setX(-100);
-				bossBullet.setY(-100);
-				this.x=-200;
-				this.y=-200;
-				GameUtils.removeList.add(bossBullet);
-				GameUtils.removeList.add(this);
-				GameWin.state=3;
-			}
-		}
-
-
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 36
src/main/java/com/sf/game/obj/ShellObj.java

@@ -1,36 +0,0 @@
-package com.sf.game.obj;
-
-
-import com.sf.game.utils.GameUtils;
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class ShellObj extends GameObj{
-	public ShellObj() {
-		super();
-	}
-
-	public ShellObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public ShellObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		//实现子弹的移动,改变子弹的纵坐标
-		y -= speed;
-
-		if(y<0){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 38
src/main/java/com/sf/game/obj/TripleShellObj.java

@@ -1,38 +0,0 @@
-package com.sf.game.obj;
-
-import com.sf.game.utils.GameUtils;
-
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class TripleShellObj extends GameObj{
-	public TripleShellObj() {
-		super();
-	}
-
-	public TripleShellObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public TripleShellObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public TripleShellObj(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-		y-=speed;
-		if(y<0){
-			GameUtils.removeList.add(this);
-		}
-	}
-
-	@Override
-	public Rectangle getRec() {
-		return super.getRec();
-	}
-}

+ 0 - 29
src/main/java/com/sf/game/obj/WaringObj.java

@@ -1,29 +0,0 @@
-package com.sf.game.obj;
-import com.sf.game.utils.GameUtils;
-
-
-import java.awt.*;
-import com.sf.game.GameWin;
-
-public class WaringObj extends GameObj{
-	public WaringObj() {
-		super();
-	}
-
-	public WaringObj(Image img, int width, int height, int x, int y, double speed, GameWin frame) {
-		super(img, width, height, x, y, speed, frame);
-	}
-
-	public WaringObj(Image img, int x, int y, double speed) {
-		super(img, x, y, speed);
-	}
-
-	public WaringObj(int x, int y) {
-		super(x, y);
-	}
-
-	@Override
-	public void paintSelf(Graphics g) {
-		super.paintSelf(g);
-	}
-}

+ 0 - 81
src/main/java/com/sf/game/utils/GameUtils.java

@@ -1,81 +0,0 @@
-package com.sf.game.utils;
-
-import com.sf.game.obj.*;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
-//这个类是游戏元素的父类
-public class GameUtils {
-	//获取背景图片
-	public static Image bdImg= Toolkit.getDefaultToolkit().getImage("imgs/bg.jpg");
-	//获取boss图片
-	public static Image bossImg= Toolkit.getDefaultToolkit().getImage("imgs/boss.png");
-	//获取爆炸图片
-	public static Image explodeImg= Toolkit.getDefaultToolkit().getImage("imgs/explode/e6.gif");
-	//获取我方飞机图片
-	public static Image planeImg= Toolkit.getDefaultToolkit().getImage("imgs/plane.png");
-	//获取我方飞机子弹的图片
-	public static Image shellImg= Toolkit.getDefaultToolkit().getImage("imgs/shell.png");
-	//获取敌方小飞机的图片
-	public static Image enemy1Img= Toolkit.getDefaultToolkit().getImage("imgs/enemy1.png");
-	//获取敌方大飞机的图片
-	public static Image enemy2Img= Toolkit.getDefaultToolkit().getImage("imgs/enemy2.png");
-	//获取敌方大飞机子弹的图片
-	public static Image enemy2bulletImg= Toolkit.getDefaultToolkit().getImage("imgs/enemy2bullet.png");
-	//获取敌方小boss1的图片
-	public static Image littleboss1Img= Toolkit.getDefaultToolkit().getImage("imgs/littleboss1.png");
-	//获取敌方小boss1的图片
-	public static Image littleboss2Img= Toolkit.getDefaultToolkit().getImage("imgs/littleboss2.png");
-	//获取敌方1号boss子弹的图片
-	public static Image littleBoss1BulletImg= Toolkit.getDefaultToolkit().getImage("imgs/littleboss1bullet.png");
-	//获取敌方2号boss子弹的图片
-	public static Image littleBoss2BulletImg= Toolkit.getDefaultToolkit().getImage("imgs/littleboss2bullet.png");
-	//获取补给的图片
-	public static Image giftImg= Toolkit.getDefaultToolkit().getImage("imgs/gift.png");
-	//获取二级子弹的图片
-	public static Image doubleShellImg= Toolkit.getDefaultToolkit().getImage("imgs/doubleshell.png");
-	//获取三级子弹的图片
-	public static Image tripleShellImg= Toolkit.getDefaultToolkit().getImage("imgs/tripleshell.png");
-	//获取boss子弹的图片
-	public static Image bossBulletImg= Toolkit.getDefaultToolkit().getImage("imgs/bossbullet.png");
-	//获取警示标志的图片
-	public static Image warningImg= Toolkit.getDefaultToolkit().getImage("imgs/warning.gif");
-
-
-	//创建我方飞机子弹的集合
-	public static List<ShellObj> shellObjList=new ArrayList<>();
-	//创建敌方小飞机的集合
-	public static List<Enemy1Obj> enemy1ObjList=new ArrayList<>();
-	//创建敌方大飞机的集合
-	public static List<Enemy2Obj> enemy2ObjList=new ArrayList<>();
-	//创建敌方大飞机子弹的集合
-	public static List<Enemy2BulletObj> enemy2BulletObjList=new ArrayList<>();
-	//所有元素集合
-	public static List<GameObj> gameObjList=new ArrayList<>();
-	//所有要移除的元素的集合
-	public static List<GameObj> removeList=new ArrayList<>();
-	//爆炸集合
-	public static List<ExplodeObj> explodeObjList=new ArrayList<>();
-	//1号boss子弹的集合
-	public static List<LittleBoss1Bullet> littleBoss1BulletList=new ArrayList<>();
-	//2号boss子弹的集合
-	public static List<LittleBoss2Bullet> littleBoss2BulletList=new ArrayList<>();
-	//补给的集合
-	public static List<GiftObj> giftObjList=new ArrayList<>();
-	//二级子弹的集合
-	public static List<DoubleShellObj> doubleShellObjList=new ArrayList<>();
-	//三级子弹的集合
-	public static List<TripleShellObj> tripleShellObjList=new ArrayList<>();
-	//boss子弹的集合
-	public static List<BossBullet> bossBulletList=new ArrayList<>();
-
-	//这个方法是用来绘制文字的
-	public static void drawWord(Graphics gImage,String str,Color color,int size,int x,int y){
-		gImage.setColor(color);
-		gImage.setFont(new Font("仿宋",Font.BOLD,size));
-		gImage.drawString(str,x,y);
-	}
-
-
-}

+ 1 - 1
src/main/java/com/sf/day01/Test1.java → src/main/java/com/sf/javase/day01/Test1.java

@@ -1,4 +1,4 @@
-package com.sf.day01;
+package com.sf.javase.day01;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day01/TestC.java → src/main/java/com/sf/javase/day01/TestC.java

@@ -1,4 +1,4 @@
-package com.sf.day01;
+package com.sf.javase.day01;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day01/TestFirst.java → src/main/java/com/sf/javase/day01/TestFirst.java

@@ -1,4 +1,4 @@
-package com.sf.day01;
+package com.sf.javase.day01;
 
 /**
  * 这是java第一个类

+ 1 - 1
src/main/java/com/sf/day02/T.java → src/main/java/com/sf/javase/day02/T.java

@@ -1,4 +1,4 @@
-package com.sf.day02;
+package com.sf.javase.day02;
 
 import org.junit.jupiter.api.Test;
 import sun.java2d.pipe.SpanIterator;

+ 1 - 1
src/main/java/com/sf/day03/ArrayTest.java → src/main/java/com/sf/javase/day03/ArrayTest.java

@@ -1,4 +1,4 @@
-package com.sf.day03;
+package com.sf.javase.day03;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day03/ArrayWorker.java → src/main/java/com/sf/javase/day03/ArrayWorker.java

@@ -1,4 +1,4 @@
-package com.sf.day03;
+package com.sf.javase.day03;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day03/T.java → src/main/java/com/sf/javase/day03/T.java

@@ -1,4 +1,4 @@
-package com.sf.day03;
+package com.sf.javase.day03;
 import org.junit.jupiter.api.Test;
 import java.util.Arrays;
 

+ 1 - 1
src/main/java/com/sf/day03/T2.java → src/main/java/com/sf/javase/day03/T2.java

@@ -1,4 +1,4 @@
-package com.sf.day03;
+package com.sf.javase.day03;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day04/T.java → src/main/java/com/sf/javase/day04/T.java

@@ -1,4 +1,4 @@
-package com.sf.day04;
+package com.sf.javase.day04;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day04/T2.java → src/main/java/com/sf/javase/day04/T2.java

@@ -1,4 +1,4 @@
-package com.sf.day04;
+package com.sf.javase.day04;
 
 import com.beust.ah.A;
 import org.junit.jupiter.api.Test;

+ 1 - 1
src/main/java/com/sf/day05/T.java → src/main/java/com/sf/javase/day05/T.java

@@ -1,4 +1,4 @@
-package com.sf.day05;
+package com.sf.javase.day05;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day06/Animal.java → src/main/java/com/sf/javase/day06/Animal.java

@@ -1,4 +1,4 @@
-package com.sf.day06;
+package com.sf.javase.day06;
 
 /**
  * 这是动物类

+ 1 - 1
src/main/java/com/sf/day06/AnimalTest.java → src/main/java/com/sf/javase/day06/AnimalTest.java

@@ -1,4 +1,4 @@
-package com.sf.day06;
+package com.sf.javase.day06;
 
 /**
  * 这是小动物的测试类

+ 1 - 1
src/main/java/com/sf/day06/Car.java → src/main/java/com/sf/javase/day06/Car.java

@@ -1,4 +1,4 @@
-package com.sf.day06;
+package com.sf.javase.day06;
 
 import java.util.Arrays;
 

+ 1 - 4
src/main/java/com/sf/day06/ObjectArray/Student.java → src/main/java/com/sf/javase/day06/ObjectArray/Student.java

@@ -1,7 +1,4 @@
-package com.sf.day06.ObjectArray;
-
-import com.sf.game.obj.ShellObj;
-import sun.text.UCompactIntArray;
+package com.sf.javase.day06.ObjectArray;
 
 import java.util.Arrays;
 

+ 1 - 1
src/main/java/com/sf/day06/Student.java → src/main/java/com/sf/javase/day06/Student.java

@@ -1,4 +1,4 @@
-package com.sf.day06;
+package com.sf.javase.day06;
 
 /**
  * 这是一个学生类

+ 1 - 1
src/main/java/com/sf/day06/T.java → src/main/java/com/sf/javase/day06/T.java

@@ -1,4 +1,4 @@
-package com.sf.day06;
+package com.sf.javase.day06;
 import org.junit.jupiter.api.Test;
 
 /**

+ 1 - 1
src/main/java/com/sf/day06/car/BSX.java → src/main/java/com/sf/javase/day06/car/BSX.java

@@ -1,4 +1,4 @@
-package com.sf.day06.car;
+package com.sf.javase.day06.car;
 
 /**
  * 这是变速箱类

+ 1 - 3
src/main/java/com/sf/day06/car/Car.java → src/main/java/com/sf/javase/day06/car/Car.java

@@ -1,6 +1,4 @@
-package com.sf.day06.car;
-
-import org.omg.CORBA.PUBLIC_MEMBER;
+package com.sf.javase.day06.car;
 
 /**
  * 这是汽车类

+ 1 - 1
src/main/java/com/sf/day06/car/CarTest.java → src/main/java/com/sf/javase/day06/car/CarTest.java

@@ -1,4 +1,4 @@
-package com.sf.day06.car;
+package com.sf.javase.day06.car;
 
 /**
  * 这是car的测试类

+ 1 - 1
src/main/java/com/sf/day06/car/DP.java → src/main/java/com/sf/javase/day06/car/DP.java

@@ -1,4 +1,4 @@
-package com.sf.day06.car;
+package com.sf.javase.day06.car;
 
 public class DP {
     int  xgType;

+ 1 - 1
src/main/java/com/sf/day06/car/FDJ.java → src/main/java/com/sf/javase/day06/car/FDJ.java

@@ -1,4 +1,4 @@
-package com.sf.day06.car;
+package com.sf.javase.day06.car;
 
 /**
  * 这是发动机类

+ 1 - 3
src/main/java/com/sf/day06/person/Person.java → src/main/java/com/sf/javase/day06/person/Person.java

@@ -1,6 +1,4 @@
-package com.sf.day06.person;
-
-import java.io.PipedOutputStream;
+package com.sf.javase.day06.person;
 
 /**
  * 这是person类

+ 1 - 1
src/main/java/com/sf/day06/person/PersonTest.java → src/main/java/com/sf/javase/day06/person/PersonTest.java

@@ -1,4 +1,4 @@
-package com.sf.day06.person;
+package com.sf.javase.day06.person;
 
 
 /**

+ 1 - 1
src/main/java/com/sf/day06/person/Phone.java → src/main/java/com/sf/javase/day06/person/Phone.java

@@ -1,4 +1,4 @@
-package com.sf.day06.person;
+package com.sf.javase.day06.person;
 
 public class Phone {
    String cpu;

+ 1 - 1
src/main/java/com/sf/day07/Animal.java → src/main/java/com/sf/javase/day07/Animal.java

@@ -1,4 +1,4 @@
-package com.sf.day07;
+package com.sf.javase.day07;
 
 /**
  * 封装

+ 1 - 1
src/main/java/com/sf/day07/AnimalTest.java → src/main/java/com/sf/javase/day07/AnimalTest.java

@@ -1,4 +1,4 @@
-package com.sf.day07;
+package com.sf.javase.day07;
 
 public class AnimalTest {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day07/Student.java → src/main/java/com/sf/javase/day07/Student.java

@@ -1,4 +1,4 @@
-package com.sf.day07;
+package com.sf.javase.day07;
 
 
 

+ 1 - 1
src/main/java/com/sf/day07/T.java → src/main/java/com/sf/javase/day07/T.java

@@ -1,4 +1,4 @@
-package com.sf.day07;
+package com.sf.javase.day07;
 
 public class T {
     int id;

+ 1 - 1
src/main/java/com/sf/day07/extend/Cat.java → src/main/java/com/sf/javase/day07/extend/Cat.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend;
+package com.sf.javase.day07.extend;
 
 public class Cat {
     private String name;

+ 1 - 1
src/main/java/com/sf/day07/extend/Dog.java → src/main/java/com/sf/javase/day07/extend/Dog.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend;
+package com.sf.javase.day07.extend;
 
 public class Dog {
     private String name;

+ 1 - 1
src/main/java/com/sf/day07/extend/entend1/Animal.java → src/main/java/com/sf/javase/day07/extend/entend1/Animal.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend.entend1;
+package com.sf.javase.day07.extend.entend1;
 
 public class Animal {
     private String name;

+ 1 - 1
src/main/java/com/sf/day07/extend/entend1/Cat.java → src/main/java/com/sf/javase/day07/extend/entend1/Cat.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend.entend1;
+package com.sf.javase.day07.extend.entend1;
 
 /**
  * 子类   继承  extends 父类 (成员 )

+ 1 - 1
src/main/java/com/sf/day07/extend/entend1/Dog.java → src/main/java/com/sf/javase/day07/extend/entend1/Dog.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend.entend1;
+package com.sf.javase.day07.extend.entend1;
 
 public class Dog extends Animal{
     public void dd(){

+ 1 - 1
src/main/java/com/sf/day07/extend/entend1/T.java → src/main/java/com/sf/javase/day07/extend/entend1/T.java

@@ -1,4 +1,4 @@
-package com.sf.day07.extend.entend1;
+package com.sf.javase.day07.extend.entend1;
 
 import java.util.Arrays;
 import java.util.Scanner;

+ 1 - 1
src/main/java/com/sf/day07/homework/Book.java → src/main/java/com/sf/javase/day07/homework/Book.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 import java.util.Arrays;
 

+ 1 - 1
src/main/java/com/sf/day07/homework/CreditCard.java → src/main/java/com/sf/javase/day07/homework/CreditCard.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 public class CreditCard extends DepositCard{
     private Double maxDraft;//本月可透支总额度

+ 1 - 1
src/main/java/com/sf/day07/homework/DepositCard.java → src/main/java/com/sf/javase/day07/homework/DepositCard.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 import java.text.BreakIterator;
 

+ 1 - 2
src/main/java/com/sf/day07/homework/HomeTest.java → src/main/java/com/sf/javase/day07/homework/HomeTest.java

@@ -1,6 +1,5 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
-import com.sun.org.apache.regexp.internal.RE;
 import org.junit.jupiter.api.Test;
 
 /**

+ 1 - 1
src/main/java/com/sf/day07/homework/Test.java → src/main/java/com/sf/javase/day07/homework/Test.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 public class Test {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day07/homework/Triangle.java → src/main/java/com/sf/javase/day07/homework/Triangle.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 public class Triangle {
     /**

+ 1 - 1
src/main/java/com/sf/day07/homework/User.java → src/main/java/com/sf/javase/day07/homework/User.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 public class User {
     private String userName;

+ 1 - 1
src/main/java/com/sf/day07/homework/UserManager.java → src/main/java/com/sf/javase/day07/homework/UserManager.java

@@ -1,4 +1,4 @@
-package com.sf.day07.homework;
+package com.sf.javase.day07.homework;
 
 public class UserManager {
 

+ 1 - 1
src/main/java/com/sf/day08/City.java → src/main/java/com/sf/javase/day08/City.java

@@ -1,4 +1,4 @@
-package com.sf.day08;
+package com.sf.javase.day08;
 
 public class City extends Country{
     String name = "shanghai属性";   //cityName  cName   countryName

+ 1 - 1
src/main/java/com/sf/day08/Country.java → src/main/java/com/sf/javase/day08/Country.java

@@ -1,4 +1,4 @@
-package com.sf.day08;
+package com.sf.javase.day08;
 
 public class Country {
     String name = "china属性";

+ 1 - 3
src/main/java/com/sf/day08/Student.java → src/main/java/com/sf/javase/day08/Student.java

@@ -1,6 +1,4 @@
-package com.sf.day08;
-
-import java.util.Scanner;
+package com.sf.javase.day08;
 
 public class Student {
 

+ 1 - 1
src/main/java/com/sf/day08/T.java → src/main/java/com/sf/javase/day08/T.java

@@ -1,4 +1,4 @@
-package com.sf.day08;
+package com.sf.javase.day08;
 
 import org.junit.jupiter.api.Test;
 

+ 1 - 1
src/main/java/com/sf/day08/T2.java → src/main/java/com/sf/javase/day08/T2.java

@@ -1,4 +1,4 @@
-package com.sf.day08;
+package com.sf.javase.day08;
 
 public class T2 {
     private int id;

+ 1 - 1
src/main/java/com/sf/day08/duotai/Animal.java → src/main/java/com/sf/javase/day08/duotai/Animal.java

@@ -1,4 +1,4 @@
-package com.sf.day08.duotai;
+package com.sf.javase.day08.duotai;
 
 public class Animal {
     /**

+ 1 - 1
src/main/java/com/sf/day08/duotai/Cat.java → src/main/java/com/sf/javase/day08/duotai/Cat.java

@@ -1,4 +1,4 @@
-package com.sf.day08.duotai;
+package com.sf.javase.day08.duotai;
 
 public class Cat extends Animal{
     private String color;   //自己独特的属性

+ 1 - 3
src/main/java/com/sf/day08/duotai/Dog.java → src/main/java/com/sf/javase/day08/duotai/Dog.java

@@ -1,6 +1,4 @@
-package com.sf.day08.duotai;
-
-import jdk.management.resource.internal.inst.SocketOutputStreamRMHooks;
+package com.sf.javase.day08.duotai;
 
 public class Dog extends Animal{
     private String XX;

+ 1 - 3
src/main/java/com/sf/day08/duotai/Monkey.java → src/main/java/com/sf/javase/day08/duotai/Monkey.java

@@ -1,6 +1,4 @@
-package com.sf.day08.duotai;
-
-import java.sql.SQLOutput;
+package com.sf.javase.day08.duotai;
 
 public class Monkey extends Animal{
     public void shut(){

+ 1 - 1
src/main/java/com/sf/day08/duotai/Test09.java → src/main/java/com/sf/javase/day08/duotai/Test09.java

@@ -1,4 +1,4 @@
-package com.sf.day08.duotai;
+package com.sf.javase.day08.duotai;
 
 public class Test09 {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day08/duotai/Test10.java → src/main/java/com/sf/javase/day08/duotai/Test10.java

@@ -1,4 +1,4 @@
-package com.sf.day08.duotai;
+package com.sf.javase.day08.duotai;
 
 public class Test10 {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day08/finalP/T.java → src/main/java/com/sf/javase/day08/finalP/T.java

@@ -1,4 +1,4 @@
-package com.sf.day08.finalP;
+package com.sf.javase.day08.finalP;
 
 /**
  * final:

+ 1 - 1
src/main/java/com/sf/day08/finalP/T1.java → src/main/java/com/sf/javase/day08/finalP/T1.java

@@ -1,4 +1,4 @@
-package com.sf.day08.finalP;
+package com.sf.javase.day08.finalP;
 
 public class T1 extends T{
 

+ 1 - 1
src/main/java/com/sf/day08/homework/Child11.java → src/main/java/com/sf/javase/day08/homework/Child11.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 public class Child11 extends Father{
     /**

+ 1 - 1
src/main/java/com/sf/day08/homework/Employee.java → src/main/java/com/sf/javase/day08/homework/Employee.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 import java.util.Arrays;
 import java.util.Scanner;

+ 1 - 1
src/main/java/com/sf/day08/homework/Father.java → src/main/java/com/sf/javase/day08/homework/Father.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 public class Father {
     public Father(){

+ 1 - 1
src/main/java/com/sf/day08/homework/Test.java → src/main/java/com/sf/javase/day08/homework/Test.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 public class Test extends TestP{
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day08/homework/Test03.java → src/main/java/com/sf/javase/day08/homework/Test03.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 public class Test03 {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day08/homework/TestP.java → src/main/java/com/sf/javase/day08/homework/TestP.java

@@ -1,4 +1,4 @@
-package com.sf.day08.homework;
+package com.sf.javase.day08.homework;
 
 public class TestP {
     private int id;

+ 1 - 1
src/main/java/com/sf/day09/A1.java → src/main/java/com/sf/javase/day09/A1.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 public abstract class A1 {
     public abstract void A1M1();

+ 1 - 1
src/main/java/com/sf/day09/A2.java → src/main/java/com/sf/javase/day09/A2.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 public abstract class A2 extends A1{
     public abstract void A2M2();

+ 1 - 1
src/main/java/com/sf/day09/A3.java → src/main/java/com/sf/javase/day09/A3.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 public class A3 extends A2{
     @Override

+ 1 - 1
src/main/java/com/sf/day09/Cook.java → src/main/java/com/sf/javase/day09/Cook.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 public class Cook extends Employee{
     @Override

+ 1 - 1
src/main/java/com/sf/day09/Employee.java → src/main/java/com/sf/javase/day09/Employee.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 /**
  * 抽象类

+ 1 - 1
src/main/java/com/sf/day09/Manager.java → src/main/java/com/sf/javase/day09/Manager.java

@@ -1,4 +1,4 @@
-package com.sf.day09;
+package com.sf.javase.day09;
 
 public class Manager extends Employee{
 

+ 1 - 1
src/main/java/com/sf/day09/homework/Exercise28.java → src/main/java/com/sf/javase/day09/homework/Exercise28.java

@@ -1,4 +1,4 @@
-package com.sf.day09.homework;
+package com.sf.javase.day09.homework;
 
 public class Exercise28 {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day09/homework/Test07.java → src/main/java/com/sf/javase/day09/homework/Test07.java

@@ -1,4 +1,4 @@
-package com.sf.day09.homework;
+package com.sf.javase.day09.homework;
 
 public class Test07 {
     public static void main(String[] args) {

+ 1 - 1
src/main/java/com/sf/day09/homework/lianxi/ShapeInterface.java → src/main/java/com/sf/javase/day09/homework/lianxi/ShapeInterface.java

@@ -1,4 +1,4 @@
-package com.sf.day09.homework.lianxi;
+package com.sf.javase.day09.homework.lianxi;
 
 public interface ShapeInterface {
 

+ 2 - 2
src/main/java/com/sf/day09/homework/lianxi/impl/Circle.java → src/main/java/com/sf/javase/day09/homework/lianxi/impl/Circle.java

@@ -1,6 +1,6 @@
-package com.sf.day09.homework.lianxi.impl;
+package com.sf.javase.day09.homework.lianxi.impl;
 
-import com.sf.day09.homework.lianxi.ShapeInterface;
+import com.sf.javase.day09.homework.lianxi.ShapeInterface;
 
 public class Circle implements ShapeInterface {
     private Double radius;

+ 2 - 3
src/main/java/com/sf/day09/homework/lianxi/impl/Rectangle.java → src/main/java/com/sf/javase/day09/homework/lianxi/impl/Rectangle.java

@@ -1,7 +1,6 @@
-package com.sf.day09.homework.lianxi.impl;
+package com.sf.javase.day09.homework.lianxi.impl;
 
-import com.sf.day07.homework.Triangle;
-import com.sf.day09.homework.lianxi.ShapeInterface;
+import com.sf.javase.day09.homework.lianxi.ShapeInterface;
 
 /**
  * 矩形类

+ 1 - 1
src/main/java/com/sf/day09/interface1/BuildCarsInterface.java → src/main/java/com/sf/javase/day09/interface1/BuildCarsInterface.java

@@ -1,4 +1,4 @@
-package com.sf.day09.interface1;
+package com.sf.javase.day09.interface1;
 
 public interface BuildCarsInterface {
 

+ 2 - 2
src/main/java/com/sf/day09/interface1/impl/BuildCarsInterfaceImpl.java → src/main/java/com/sf/javase/day09/interface1/impl/BuildCarsInterfaceImpl.java

@@ -1,6 +1,6 @@
-package com.sf.day09.interface1.impl;
+package com.sf.javase.day09.interface1.impl;
 
-import com.sf.day09.interface1.BuildCarsInterface;
+import com.sf.javase.day09.interface1.BuildCarsInterface;
 
 public class BuildCarsInterfaceImpl implements BuildCarsInterface {
     @Override

+ 7 - 0
src/main/java/com/sf/javase/day10/innerclass/InnerclassDemo.java

@@ -0,0 +1,7 @@
+package com.sf.javase.day10.innerclass;
+
+public class InnerclassDemo {
+    public static void main(String[] args) {
+        Outer01.Inner01 dmain = new Outer01.Inner01("dmain");
+    }
+}

+ 31 - 0
src/main/java/com/sf/javase/day10/innerclass/Outer01.java

@@ -0,0 +1,31 @@
+package com.sf.javase.day10.innerclass;
+
+/**
+ * 这是外部类
+ */
+public class Outer01 {
+    public static String sc_name = "XX程序";
+    private static String name = "XX程序";
+
+    //定义一个内部类(静态)
+    public static class Inner01{
+        private String name;
+
+        public Inner01(String name) {
+            this.name = name;
+        }
+
+        public void showName(){
+            System.out.println(name);
+            System.out.println(sc_name);
+            System.out.println(Outer01.name);
+        }
+    }
+
+    public static void main(String[] args) {
+        // 创建静态内部类对象。
+        // 外部类.内部类  变量 = new  外部类.内部类构造器;
+        Inner01 inner01 = new Inner01("admin");
+        inner01.showName();
+    }
+}

+ 43 - 0
src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer02.java

@@ -0,0 +1,43 @@
+package com.sf.javase.day10.innerclass.instanceinnerclass;
+
+public class Outer02 {
+    private String out_name = "XXX";
+    private String name = "ww";
+
+    public Outer02() {
+    }
+
+    public Outer02(String out_name) {
+        this.out_name = out_name;
+    }
+
+    public String getOut_name() {
+        return out_name;
+    }
+
+    public void setOut_name(String out_name) {
+        this.out_name = out_name;
+    }
+
+
+    // 成员内部类
+    public class Inner02{
+        private String name;
+
+        public Inner02() {
+        }
+
+        public Inner02(String name) {
+            this.name = name;
+        }
+
+        public void showName(){
+            System.out.println(name);
+            System.out.println(out_name);
+            System.out.println(Outer02.this.name);
+//            Outer02 outer02 = new Outer02();
+//            System.out.println(outer02.name);
+        }
+
+    }
+}

+ 9 - 0
src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer02Demo.java

@@ -0,0 +1,9 @@
+package com.sf.javase.day10.innerclass.instanceinnerclass;
+
+public class Outer02Demo {
+    public static void main(String[] args) {
+        // 获取内部类  成员
+        Outer02.Inner02 admin = new Outer02().new Inner02("admin");
+        admin.showName();
+    }
+}

+ 36 - 0
src/main/java/com/sf/javase/day10/innerclass/instanceinnerclass/Outer03.java

@@ -0,0 +1,36 @@
+package com.sf.javase.day10.innerclass.instanceinnerclass;
+
+public class Outer03 {
+    private String name = "aaa";
+    private String innerName  ="BB";
+
+    public Outer03() {
+    }
+
+    public Outer03(String name) {
+        this.name = name;
+    }
+
+    public void showName(){
+        class  Inner03{
+            private String innerName = "CCC";
+
+            public Inner03() {
+            }
+
+            public Inner03(String innerName) {
+                this.innerName = innerName;
+            }
+
+            public void t1(){
+                System.out.println(innerName);
+                System.out.println(name);
+                System.out.println(Outer03.this.innerName);
+            }
+        }
+        Inner03 inner03 = new Inner03();
+        inner03.t1();
+    }
+
+
+}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio