From a7a693b6fb9d80e6dc094b18ebe743f244451dc3 Mon Sep 17 00:00:00 2001 From: hurteng Date: Mon, 16 Apr 2018 14:25:45 +0800 Subject: [PATCH] Modify configuration file --- .gitignore | 1 + .idea/misc.xml | 15 +------ .idea/modules.xml | 3 +- .idea/runConfigurations.xml | 12 ----- app/build.gradle | 8 ++-- app/src/main/AndroidManifest.xml | 4 +- .../MainActivity.java | 14 +++--- .../bullet/BigPlaneBullet.java | 6 +-- .../bullet/BossDefaultBullet.java | 10 ++--- .../bullet/BossFlameBullet.java | 6 +-- .../bullet/BossGThunderBullet.java | 6 +-- .../bullet/BossRHellfireBullet.java | 6 +-- .../bullet/BossSunBullet.java | 6 +-- .../bullet/BossTriangleBullet.java | 6 +-- .../bullet/BossYHellfireBullet.java | 6 +-- .../bullet/Bullet.java | 6 +-- .../bullet/EnemyBullet.java | 4 +- .../bullet/MyBlueBullet.java | 8 ++-- .../bullet/MyPurpleBullet.java | 10 ++--- .../bullet/MyRedBullet.java | 8 ++-- .../constant/ConstantUtil.java | 2 +- .../constant/DebugConstant.java | 2 +- .../constant/GameConstant.java | 2 +- .../factory/GameObjectFactory.java | 44 +++++++++---------- .../interfaces/IMyPlane.java | 4 +- .../object/GameGoods.java | 4 +- .../object/GameObject.java | 2 +- .../object/LifeGoods.java | 4 +- .../object/MissileGoods.java | 4 +- .../object/PurpleBulletGoods.java | 4 +- .../object/RedBulletGoods.java | 4 +- .../plane/BigPlane.java | 14 +++--- .../plane/BossPlane.java | 28 ++++++------ .../plane/EnemyPlane.java | 4 +- .../plane/MiddlePlane.java | 6 +-- .../plane/MyPlane.java | 26 +++++------ .../plane/SmallPlane.java | 6 +-- .../sounds/GameSoundPool.java | 6 +-- .../view/BaseView.java | 6 +-- .../view/EndView.java | 10 ++--- .../view/MainView.java | 36 +++++++-------- .../view/ReadyView.java | 8 ++-- app/src/main/res/layout/activity_main.xml | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 3 +- 45 files changed, 179 insertions(+), 201 deletions(-) delete mode 100644 .idea/runConfigurations.xml rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/MainActivity.java (90%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BigPlaneBullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossDefaultBullet.java (94%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossFlameBullet.java (93%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossGThunderBullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossRHellfireBullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossSunBullet.java (91%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossTriangleBullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/BossYHellfireBullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/Bullet.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/EnemyBullet.java (94%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/MyBlueBullet.java (90%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/MyPurpleBullet.java (95%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/bullet/MyRedBullet.java (90%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/constant/ConstantUtil.java (95%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/constant/DebugConstant.java (94%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/constant/GameConstant.java (98%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/factory/GameObjectFactory.java (74%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/interfaces/IMyPlane.java (92%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/GameGoods.java (98%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/GameObject.java (98%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/LifeGoods.java (83%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/MissileGoods.java (84%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/PurpleBulletGoods.java (84%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/object/RedBulletGoods.java (83%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/BigPlane.java (93%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/BossPlane.java (96%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/EnemyPlane.java (97%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/MiddlePlane.java (95%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/MyPlane.java (93%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/plane/SmallPlane.java (96%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/sounds/GameSoundPool.java (93%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/view/BaseView.java (93%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/view/EndView.java (96%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/view/MainView.java (95%) rename app/src/main/java/com/hurteng/{sandstorm => stormplane}/view/ReadyView.java (97%) diff --git a/.gitignore b/.gitignore index 21719c9..44b6e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ captures/ # Intellij *.iml +.idea/ .idea/workspace.xml .idea/tasks.xml .idea/gradle.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index a7a16aa..688b6dc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index c4a1280..32db7b1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,7 @@ - - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ff656d..484d8b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 16 - buildToolsVersion "25.0.3" + compileSdkVersion 26 + buildToolsVersion '26.0.3' defaultConfig { - applicationId "com.hurteng.sandstorm" + applicationId "com.hurteng.stormplane" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c4c5ebb..a95df3b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > diff --git a/app/src/main/java/com/hurteng/sandstorm/MainActivity.java b/app/src/main/java/com/hurteng/stormplane/MainActivity.java similarity index 90% rename from app/src/main/java/com/hurteng/sandstorm/MainActivity.java rename to app/src/main/java/com/hurteng/stormplane/MainActivity.java index 8b533ba..57905a9 100644 --- a/app/src/main/java/com/hurteng/sandstorm/MainActivity.java +++ b/app/src/main/java/com/hurteng/stormplane/MainActivity.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm; +package com.hurteng.stormplane; import android.annotation.SuppressLint; import android.app.Activity; @@ -10,12 +10,12 @@ import android.view.WindowManager; import android.widget.Toast; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.constant.DebugConstant; -import com.hurteng.sandstorm.sounds.GameSoundPool; -import com.hurteng.sandstorm.view.EndView; -import com.hurteng.sandstorm.view.MainView; -import com.hurteng.sandstorm.view.ReadyView; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.constant.DebugConstant; +import com.hurteng.stormplane.sounds.GameSoundPool; +import com.hurteng.stormplane.view.EndView; +import com.hurteng.stormplane.view.MainView; +import com.hurteng.stormplane.view.ReadyView; public class MainActivity extends Activity { private EndView endView; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BigPlaneBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BigPlaneBullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BigPlaneBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BigPlaneBullet.java index c652dd6..1a5e425 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BigPlaneBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BigPlaneBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; /** * 大型机的烈焰飘雪弹 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossDefaultBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossDefaultBullet.java similarity index 94% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossDefaultBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossDefaultBullet.java index c21c7ed..7c08e28 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossDefaultBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossDefaultBullet.java @@ -1,14 +1,14 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.plane.MyPlane; -import com.hurteng.sandstorm.plane.SmallPlane; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.plane.MyPlane; +import com.hurteng.stormplane.plane.SmallPlane; /** * Boss默认的子弹 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossFlameBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossFlameBullet.java similarity index 93% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossFlameBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossFlameBullet.java index 6526378..621881f 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossFlameBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossFlameBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossGThunderBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossGThunderBullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossGThunderBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossGThunderBullet.java index 24c16c7..f152890 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossGThunderBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossGThunderBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossRHellfireBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossRHellfireBullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossRHellfireBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossRHellfireBullet.java index 2929586..6a89c9d 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossRHellfireBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossRHellfireBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossSunBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossSunBullet.java similarity index 91% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossSunBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossSunBullet.java index 0498488..157c7b7 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossSunBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossSunBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossTriangleBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossTriangleBullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossTriangleBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossTriangleBullet.java index 1070afd..8374d45 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossTriangleBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossTriangleBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/BossYHellfireBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/BossYHellfireBullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/BossYHellfireBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/BossYHellfireBullet.java index 4800cc4..45fc3dc 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/BossYHellfireBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/BossYHellfireBullet.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/Bullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/Bullet.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/bullet/Bullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/Bullet.java index 7211de2..cb9511c 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/Bullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/Bullet.java @@ -1,10 +1,10 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Canvas; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.plane.SmallPlane; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.plane.SmallPlane; /** * 子弹类 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/EnemyBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/EnemyBullet.java similarity index 94% rename from app/src/main/java/com/hurteng/sandstorm/bullet/EnemyBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/EnemyBullet.java index 76cff2d..ccf4a6b 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/EnemyBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/EnemyBullet.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Canvas; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.object.GameObject; /** * 敌方子弹类 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/MyBlueBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/MyBlueBullet.java similarity index 90% rename from app/src/main/java/com/hurteng/sandstorm/bullet/MyBlueBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/MyBlueBullet.java index 1b80511..dc34f8d 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/MyBlueBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/MyBlueBullet.java @@ -1,13 +1,13 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; /** * 我方机体的蓝色激光粒子弹 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/MyPurpleBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/MyPurpleBullet.java similarity index 95% rename from app/src/main/java/com/hurteng/sandstorm/bullet/MyPurpleBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/MyPurpleBullet.java index dd8e6f0..0916f33 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/MyPurpleBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/MyPurpleBullet.java @@ -1,14 +1,14 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.plane.SmallPlane; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.plane.SmallPlane; /** * 我方机体的紫色双螺旋粒子炮 diff --git a/app/src/main/java/com/hurteng/sandstorm/bullet/MyRedBullet.java b/app/src/main/java/com/hurteng/stormplane/bullet/MyRedBullet.java similarity index 90% rename from app/src/main/java/com/hurteng/sandstorm/bullet/MyRedBullet.java rename to app/src/main/java/com/hurteng/stormplane/bullet/MyRedBullet.java index cde7bfb..f16215b 100644 --- a/app/src/main/java/com/hurteng/sandstorm/bullet/MyRedBullet.java +++ b/app/src/main/java/com/hurteng/stormplane/bullet/MyRedBullet.java @@ -1,13 +1,13 @@ -package com.hurteng.sandstorm.bullet; +package com.hurteng.stormplane.bullet; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; /** * 我方机体的红色追踪战斧冲击波 diff --git a/app/src/main/java/com/hurteng/sandstorm/constant/ConstantUtil.java b/app/src/main/java/com/hurteng/stormplane/constant/ConstantUtil.java similarity index 95% rename from app/src/main/java/com/hurteng/sandstorm/constant/ConstantUtil.java rename to app/src/main/java/com/hurteng/stormplane/constant/ConstantUtil.java index 61e2162..805c2d1 100644 --- a/app/src/main/java/com/hurteng/sandstorm/constant/ConstantUtil.java +++ b/app/src/main/java/com/hurteng/stormplane/constant/ConstantUtil.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.constant; +package com.hurteng.stormplane.constant; public class ConstantUtil { // 物品的方向常量 diff --git a/app/src/main/java/com/hurteng/sandstorm/constant/DebugConstant.java b/app/src/main/java/com/hurteng/stormplane/constant/DebugConstant.java similarity index 94% rename from app/src/main/java/com/hurteng/sandstorm/constant/DebugConstant.java rename to app/src/main/java/com/hurteng/stormplane/constant/DebugConstant.java index 05a09cf..e7904d1 100644 --- a/app/src/main/java/com/hurteng/sandstorm/constant/DebugConstant.java +++ b/app/src/main/java/com/hurteng/stormplane/constant/DebugConstant.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.constant; +package com.hurteng.stormplane.constant; /** * 调试相关的常量 diff --git a/app/src/main/java/com/hurteng/sandstorm/constant/GameConstant.java b/app/src/main/java/com/hurteng/stormplane/constant/GameConstant.java similarity index 98% rename from app/src/main/java/com/hurteng/sandstorm/constant/GameConstant.java rename to app/src/main/java/com/hurteng/stormplane/constant/GameConstant.java index 6e2e9c8..9741f0f 100644 --- a/app/src/main/java/com/hurteng/sandstorm/constant/GameConstant.java +++ b/app/src/main/java/com/hurteng/stormplane/constant/GameConstant.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.constant; +package com.hurteng.stormplane.constant; /** * 游戏数据常量 diff --git a/app/src/main/java/com/hurteng/sandstorm/factory/GameObjectFactory.java b/app/src/main/java/com/hurteng/stormplane/factory/GameObjectFactory.java similarity index 74% rename from app/src/main/java/com/hurteng/sandstorm/factory/GameObjectFactory.java rename to app/src/main/java/com/hurteng/stormplane/factory/GameObjectFactory.java index 60823b3..13bbf47 100644 --- a/app/src/main/java/com/hurteng/sandstorm/factory/GameObjectFactory.java +++ b/app/src/main/java/com/hurteng/stormplane/factory/GameObjectFactory.java @@ -1,28 +1,28 @@ -package com.hurteng.sandstorm.factory; +package com.hurteng.stormplane.factory; import android.content.res.Resources; -import com.hurteng.sandstorm.plane.BigPlane; -import com.hurteng.sandstorm.bullet.BigPlaneBullet; -import com.hurteng.sandstorm.bullet.BossFlameBullet; -import com.hurteng.sandstorm.bullet.BossSunBullet; -import com.hurteng.sandstorm.bullet.BossTriangleBullet; -import com.hurteng.sandstorm.bullet.BossGThunderBullet; -import com.hurteng.sandstorm.bullet.BossYHellfireBullet; -import com.hurteng.sandstorm.bullet.BossRHellfireBullet; -import com.hurteng.sandstorm.bullet.BossDefaultBullet; -import com.hurteng.sandstorm.plane.BossPlane; -import com.hurteng.sandstorm.object.PurpleBulletGoods; -import com.hurteng.sandstorm.object.RedBulletGoods; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.object.LifeGoods; -import com.hurteng.sandstorm.plane.MiddlePlane; -import com.hurteng.sandstorm.object.MissileGoods; -import com.hurteng.sandstorm.bullet.MyBlueBullet; -import com.hurteng.sandstorm.bullet.MyPurpleBullet; -import com.hurteng.sandstorm.bullet.MyRedBullet; -import com.hurteng.sandstorm.plane.MyPlane; -import com.hurteng.sandstorm.plane.SmallPlane; +import com.hurteng.stormplane.plane.BigPlane; +import com.hurteng.stormplane.bullet.BigPlaneBullet; +import com.hurteng.stormplane.bullet.BossFlameBullet; +import com.hurteng.stormplane.bullet.BossSunBullet; +import com.hurteng.stormplane.bullet.BossTriangleBullet; +import com.hurteng.stormplane.bullet.BossGThunderBullet; +import com.hurteng.stormplane.bullet.BossYHellfireBullet; +import com.hurteng.stormplane.bullet.BossRHellfireBullet; +import com.hurteng.stormplane.bullet.BossDefaultBullet; +import com.hurteng.stormplane.plane.BossPlane; +import com.hurteng.stormplane.object.PurpleBulletGoods; +import com.hurteng.stormplane.object.RedBulletGoods; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.object.LifeGoods; +import com.hurteng.stormplane.plane.MiddlePlane; +import com.hurteng.stormplane.object.MissileGoods; +import com.hurteng.stormplane.bullet.MyBlueBullet; +import com.hurteng.stormplane.bullet.MyPurpleBullet; +import com.hurteng.stormplane.bullet.MyRedBullet; +import com.hurteng.stormplane.plane.MyPlane; +import com.hurteng.stormplane.plane.SmallPlane; /** diff --git a/app/src/main/java/com/hurteng/sandstorm/interfaces/IMyPlane.java b/app/src/main/java/com/hurteng/stormplane/interfaces/IMyPlane.java similarity index 92% rename from app/src/main/java/com/hurteng/sandstorm/interfaces/IMyPlane.java rename to app/src/main/java/com/hurteng/stormplane/interfaces/IMyPlane.java index ac30567..f81c2d4 100644 --- a/app/src/main/java/com/hurteng/sandstorm/interfaces/IMyPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/interfaces/IMyPlane.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.interfaces; +package com.hurteng.stormplane.interfaces; import android.graphics.Canvas; -import com.hurteng.sandstorm.plane.EnemyPlane; +import com.hurteng.stormplane.plane.EnemyPlane; import java.util.List; diff --git a/app/src/main/java/com/hurteng/sandstorm/object/GameGoods.java b/app/src/main/java/com/hurteng/stormplane/object/GameGoods.java similarity index 98% rename from app/src/main/java/com/hurteng/sandstorm/object/GameGoods.java rename to app/src/main/java/com/hurteng/stormplane/object/GameGoods.java index ebfa242..804eb08 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/GameGoods.java +++ b/app/src/main/java/com/hurteng/stormplane/object/GameGoods.java @@ -1,10 +1,10 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.ConstantUtil; +import com.hurteng.stormplane.constant.ConstantUtil; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/object/GameObject.java b/app/src/main/java/com/hurteng/stormplane/object/GameObject.java similarity index 98% rename from app/src/main/java/com/hurteng/sandstorm/object/GameObject.java rename to app/src/main/java/com/hurteng/stormplane/object/GameObject.java index b8386b7..162e7dd 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/GameObject.java +++ b/app/src/main/java/com/hurteng/stormplane/object/GameObject.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.Canvas; diff --git a/app/src/main/java/com/hurteng/sandstorm/object/LifeGoods.java b/app/src/main/java/com/hurteng/stormplane/object/LifeGoods.java similarity index 83% rename from app/src/main/java/com/hurteng/sandstorm/object/LifeGoods.java rename to app/src/main/java/com/hurteng/stormplane/object/LifeGoods.java index 9255a09..9bcb851 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/LifeGoods.java +++ b/app/src/main/java/com/hurteng/stormplane/object/LifeGoods.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.BitmapFactory; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.myplane.R; /** * 生命物品 diff --git a/app/src/main/java/com/hurteng/sandstorm/object/MissileGoods.java b/app/src/main/java/com/hurteng/stormplane/object/MissileGoods.java similarity index 84% rename from app/src/main/java/com/hurteng/sandstorm/object/MissileGoods.java rename to app/src/main/java/com/hurteng/stormplane/object/MissileGoods.java index 96c9e54..b0c6646 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/MissileGoods.java +++ b/app/src/main/java/com/hurteng/stormplane/object/MissileGoods.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.BitmapFactory; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.myplane.R; /** * 导弹物品 diff --git a/app/src/main/java/com/hurteng/sandstorm/object/PurpleBulletGoods.java b/app/src/main/java/com/hurteng/stormplane/object/PurpleBulletGoods.java similarity index 84% rename from app/src/main/java/com/hurteng/sandstorm/object/PurpleBulletGoods.java rename to app/src/main/java/com/hurteng/stormplane/object/PurpleBulletGoods.java index 9b75539..8109937 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/PurpleBulletGoods.java +++ b/app/src/main/java/com/hurteng/stormplane/object/PurpleBulletGoods.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.BitmapFactory; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.myplane.R; /** * 紫色弹药物品 diff --git a/app/src/main/java/com/hurteng/sandstorm/object/RedBulletGoods.java b/app/src/main/java/com/hurteng/stormplane/object/RedBulletGoods.java similarity index 83% rename from app/src/main/java/com/hurteng/sandstorm/object/RedBulletGoods.java rename to app/src/main/java/com/hurteng/stormplane/object/RedBulletGoods.java index f65ce02..0573ac3 100644 --- a/app/src/main/java/com/hurteng/sandstorm/object/RedBulletGoods.java +++ b/app/src/main/java/com/hurteng/stormplane/object/RedBulletGoods.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.object; +package com.hurteng.stormplane.object; import android.content.res.Resources; import android.graphics.BitmapFactory; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.myplane.R; /** * 红色弹药物品 diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/BigPlane.java b/app/src/main/java/com/hurteng/stormplane/plane/BigPlane.java similarity index 93% rename from app/src/main/java/com/hurteng/sandstorm/plane/BigPlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/BigPlane.java index 5c125de..7b5df2b 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/BigPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/BigPlane.java @@ -1,16 +1,16 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.bullet.BigPlaneBullet; -import com.hurteng.sandstorm.bullet.Bullet; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.factory.GameObjectFactory; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.bullet.BigPlaneBullet; +import com.hurteng.stormplane.bullet.Bullet; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.factory.GameObjectFactory; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/BossPlane.java b/app/src/main/java/com/hurteng/stormplane/plane/BossPlane.java similarity index 96% rename from app/src/main/java/com/hurteng/sandstorm/plane/BossPlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/BossPlane.java index a27d2ed..7bebaf4 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/BossPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/BossPlane.java @@ -1,23 +1,23 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.bullet.BossFlameBullet; -import com.hurteng.sandstorm.bullet.BossSunBullet; -import com.hurteng.sandstorm.bullet.BossTriangleBullet; -import com.hurteng.sandstorm.bullet.BossGThunderBullet; -import com.hurteng.sandstorm.bullet.BossYHellfireBullet; -import com.hurteng.sandstorm.bullet.BossRHellfireBullet; -import com.hurteng.sandstorm.bullet.BossDefaultBullet; -import com.hurteng.sandstorm.bullet.Bullet; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.factory.GameObjectFactory; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.bullet.BossFlameBullet; +import com.hurteng.stormplane.bullet.BossSunBullet; +import com.hurteng.stormplane.bullet.BossTriangleBullet; +import com.hurteng.stormplane.bullet.BossGThunderBullet; +import com.hurteng.stormplane.bullet.BossYHellfireBullet; +import com.hurteng.stormplane.bullet.BossRHellfireBullet; +import com.hurteng.stormplane.bullet.BossDefaultBullet; +import com.hurteng.stormplane.bullet.Bullet; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.factory.GameObjectFactory; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/EnemyPlane.java b/app/src/main/java/com/hurteng/stormplane/plane/EnemyPlane.java similarity index 97% rename from app/src/main/java/com/hurteng/sandstorm/plane/EnemyPlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/EnemyPlane.java index 4be9527..264e5a7 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/EnemyPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/EnemyPlane.java @@ -1,9 +1,9 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Canvas; -import com.hurteng.sandstorm.object.GameObject; +import com.hurteng.stormplane.object.GameObject; /** * 敌机类 diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/MiddlePlane.java b/app/src/main/java/com/hurteng/stormplane/plane/MiddlePlane.java similarity index 95% rename from app/src/main/java/com/hurteng/sandstorm/plane/MiddlePlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/MiddlePlane.java index 7976354..5aad178 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/MiddlePlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/MiddlePlane.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.myplane.R; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/MyPlane.java b/app/src/main/java/com/hurteng/stormplane/plane/MyPlane.java similarity index 93% rename from app/src/main/java/com/hurteng/sandstorm/plane/MyPlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/MyPlane.java index 63e6ca7..1587887 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/MyPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/MyPlane.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Bitmap; @@ -6,18 +6,18 @@ import android.graphics.Canvas; import android.os.SystemClock; -import com.hurteng.sandstorm.bullet.Bullet; -import com.hurteng.sandstorm.bullet.MyBlueBullet; -import com.hurteng.sandstorm.bullet.MyPurpleBullet; -import com.hurteng.sandstorm.bullet.MyRedBullet; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.constant.DebugConstant; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.factory.GameObjectFactory; -import com.hurteng.sandstorm.interfaces.IMyPlane; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.view.MainView; +import com.hurteng.stormplane.bullet.Bullet; +import com.hurteng.stormplane.bullet.MyBlueBullet; +import com.hurteng.stormplane.bullet.MyPurpleBullet; +import com.hurteng.stormplane.bullet.MyRedBullet; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.constant.DebugConstant; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.factory.GameObjectFactory; +import com.hurteng.stormplane.interfaces.IMyPlane; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.view.MainView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hurteng/sandstorm/plane/SmallPlane.java b/app/src/main/java/com/hurteng/stormplane/plane/SmallPlane.java similarity index 96% rename from app/src/main/java/com/hurteng/sandstorm/plane/SmallPlane.java rename to app/src/main/java/com/hurteng/stormplane/plane/SmallPlane.java index 74dacab..457c81c 100644 --- a/app/src/main/java/com/hurteng/sandstorm/plane/SmallPlane.java +++ b/app/src/main/java/com/hurteng/stormplane/plane/SmallPlane.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.plane; +package com.hurteng.stormplane.plane; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.myplane.R; import java.util.Random; diff --git a/app/src/main/java/com/hurteng/sandstorm/sounds/GameSoundPool.java b/app/src/main/java/com/hurteng/stormplane/sounds/GameSoundPool.java similarity index 93% rename from app/src/main/java/com/hurteng/sandstorm/sounds/GameSoundPool.java rename to app/src/main/java/com/hurteng/stormplane/sounds/GameSoundPool.java index 14854e5..c8e38c1 100644 --- a/app/src/main/java/com/hurteng/sandstorm/sounds/GameSoundPool.java +++ b/app/src/main/java/com/hurteng/stormplane/sounds/GameSoundPool.java @@ -1,12 +1,12 @@ -package com.hurteng.sandstorm.sounds; +package com.hurteng.stormplane.sounds; import android.annotation.SuppressLint; import android.content.Context; import android.media.AudioManager; import android.media.SoundPool; -import com.hurteng.sandstorm.MainActivity; -import com.hurteng.sandstorm.myplane.R; +import com.hurteng.stormplane.MainActivity; +import com.hurteng.stormplane.myplane.R; import java.util.HashMap; diff --git a/app/src/main/java/com/hurteng/sandstorm/view/BaseView.java b/app/src/main/java/com/hurteng/stormplane/view/BaseView.java similarity index 93% rename from app/src/main/java/com/hurteng/sandstorm/view/BaseView.java rename to app/src/main/java/com/hurteng/stormplane/view/BaseView.java index 56bf290..ebc2434 100644 --- a/app/src/main/java/com/hurteng/sandstorm/view/BaseView.java +++ b/app/src/main/java/com/hurteng/stormplane/view/BaseView.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.view; +package com.hurteng.stormplane.view; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Canvas; @@ -6,8 +6,8 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; -import com.hurteng.sandstorm.MainActivity; -import com.hurteng.sandstorm.sounds.GameSoundPool; +import com.hurteng.stormplane.MainActivity; +import com.hurteng.stormplane.sounds.GameSoundPool; @SuppressLint("ViewConstructor") public class BaseView extends SurfaceView implements SurfaceHolder.Callback, Runnable { diff --git a/app/src/main/java/com/hurteng/sandstorm/view/EndView.java b/app/src/main/java/com/hurteng/stormplane/view/EndView.java similarity index 96% rename from app/src/main/java/com/hurteng/sandstorm/view/EndView.java rename to app/src/main/java/com/hurteng/stormplane/view/EndView.java index bb36130..bcfa71b 100644 --- a/app/src/main/java/com/hurteng/sandstorm/view/EndView.java +++ b/app/src/main/java/com/hurteng/stormplane/view/EndView.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.view; +package com.hurteng.stormplane.view; import android.annotation.SuppressLint; import android.content.Context; @@ -9,10 +9,10 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.MainActivity; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.sounds.GameSoundPool; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.MainActivity; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.sounds.GameSoundPool; /** * 游戏结束 diff --git a/app/src/main/java/com/hurteng/sandstorm/view/MainView.java b/app/src/main/java/com/hurteng/stormplane/view/MainView.java similarity index 95% rename from app/src/main/java/com/hurteng/sandstorm/view/MainView.java rename to app/src/main/java/com/hurteng/stormplane/view/MainView.java index b2032c9..9086d61 100644 --- a/app/src/main/java/com/hurteng/sandstorm/view/MainView.java +++ b/app/src/main/java/com/hurteng/stormplane/view/MainView.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.view; +package com.hurteng.stormplane.view; import android.annotation.SuppressLint; import android.content.Context; @@ -10,23 +10,23 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.constant.DebugConstant; -import com.hurteng.sandstorm.constant.GameConstant; -import com.hurteng.sandstorm.factory.GameObjectFactory; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.object.RedBulletGoods; -import com.hurteng.sandstorm.object.GameObject; -import com.hurteng.sandstorm.object.LifeGoods; -import com.hurteng.sandstorm.object.MissileGoods; -import com.hurteng.sandstorm.object.PurpleBulletGoods; -import com.hurteng.sandstorm.plane.BigPlane; -import com.hurteng.sandstorm.plane.BossPlane; -import com.hurteng.sandstorm.plane.EnemyPlane; -import com.hurteng.sandstorm.plane.MiddlePlane; -import com.hurteng.sandstorm.plane.MyPlane; -import com.hurteng.sandstorm.plane.SmallPlane; -import com.hurteng.sandstorm.sounds.GameSoundPool; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.constant.DebugConstant; +import com.hurteng.stormplane.constant.GameConstant; +import com.hurteng.stormplane.factory.GameObjectFactory; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.object.RedBulletGoods; +import com.hurteng.stormplane.object.GameObject; +import com.hurteng.stormplane.object.LifeGoods; +import com.hurteng.stormplane.object.MissileGoods; +import com.hurteng.stormplane.object.PurpleBulletGoods; +import com.hurteng.stormplane.plane.BigPlane; +import com.hurteng.stormplane.plane.BossPlane; +import com.hurteng.stormplane.plane.EnemyPlane; +import com.hurteng.stormplane.plane.MiddlePlane; +import com.hurteng.stormplane.plane.MyPlane; +import com.hurteng.stormplane.plane.SmallPlane; +import com.hurteng.stormplane.sounds.GameSoundPool; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hurteng/sandstorm/view/ReadyView.java b/app/src/main/java/com/hurteng/stormplane/view/ReadyView.java similarity index 97% rename from app/src/main/java/com/hurteng/sandstorm/view/ReadyView.java rename to app/src/main/java/com/hurteng/stormplane/view/ReadyView.java index 07d21fa..a1f5a1c 100644 --- a/app/src/main/java/com/hurteng/sandstorm/view/ReadyView.java +++ b/app/src/main/java/com/hurteng/stormplane/view/ReadyView.java @@ -1,4 +1,4 @@ -package com.hurteng.sandstorm.view; +package com.hurteng.stormplane.view; import android.annotation.SuppressLint; import android.content.Context; @@ -9,9 +9,9 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; -import com.hurteng.sandstorm.constant.ConstantUtil; -import com.hurteng.sandstorm.myplane.R; -import com.hurteng.sandstorm.sounds.GameSoundPool; +import com.hurteng.stormplane.constant.ConstantUtil; +import com.hurteng.stormplane.myplane.R; +import com.hurteng.stormplane.sounds.GameSoundPool; /** * 开始游戏的界面 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 98e4125..bc67297 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,7 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.hurteng.sandstorm.MainActivity" > + tools:context="com.hurteng.stormplane.MainActivity" >