diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index d4cd70335a8960e88fbf2a6562ca4dbf82ce5fe8..27a012f5776cc74e2921ba6387a10c31e4c6f608 100644 Binary files a/Assets/Scenes/GameScene.unity and b/Assets/Scenes/GameScene.unity differ diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 40a4866b46207534b739be1c630fc175e9d1937a..3dd1e6fe8085d462f5972cca77c0924e3ba122f3 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -44,8 +44,8 @@ public class Enemy : MonoBehaviour { void AttackGodness() { - mainLogic.godnessHP -= Atk; - if (mainLogic.godnessHP <= 0) + mainLogic.godnessManager.godnessHP -= Atk; + if (mainLogic.godnessManager.godnessHP <= 0) mainLogic.OnGodnessClicked(); } } diff --git a/Assets/Scripts/EnemyManager.cs b/Assets/Scripts/EnemyManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..9b109cf92f1630214c9c28e97d6db80814881638 --- /dev/null +++ b/Assets/Scripts/EnemyManager.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; + +public class EnemyManager : MonoBehaviour { + public int lastEnemyNum; + int maxEnemyNum; + public Slider enemySlider; + public Text lastEnemyNumText; + + // Use this for initialization + void Start () { + + maxEnemyNum = Data.EnemyNumber; + } + + // Update is called once per frame + void FixedUpdate () { + enemySlider.value = (float)lastEnemyNum / maxEnemyNum; + lastEnemyNumText.text = lastEnemyNum + " / " + maxEnemyNum; + } +} diff --git a/Assets/Scripts/EnemyManager.cs.meta b/Assets/Scripts/EnemyManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..f61c16bf67a6da63f99db2837c9eb7f61c27e047 --- /dev/null +++ b/Assets/Scripts/EnemyManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1a1690af196fb3546b0fb9950b06d434 +timeCreated: 1454232706 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GodnessManager.cs b/Assets/Scripts/GodnessManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..32ce81ad6b4e8208a3d882ce24dd149fcc60b618 --- /dev/null +++ b/Assets/Scripts/GodnessManager.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; + +public class GodnessManager : MonoBehaviour { + public int godnessHP; + int maxGodnessHP; + public Slider godnessSlider; + public Text godnessHPText; + + // Use this for initialization + void Start () { + + maxGodnessHP = Data.GodnessHP; + } + + // Update is called once per frame + void FixedUpdate () { + godnessSlider.value = (float)godnessHP / maxGodnessHP; + godnessHPText.text = godnessHP + " / " + maxGodnessHP; + } +} diff --git a/Assets/Scripts/GodnessManager.cs.meta b/Assets/Scripts/GodnessManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..056cca7763d4cfdadcf5639deb709ebf8cf831c0 --- /dev/null +++ b/Assets/Scripts/GodnessManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b9fc51f35f222364ca421f62fa958ccc +timeCreated: 1454233827 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MainLogic.cs b/Assets/Scripts/MainLogic.cs index 43fff1a66d7eb8fa758668cfc8e9f4e4b28187df..4e0b35283ce3d734e2d3f4dbaacf18a87d533c7e 100644 --- a/Assets/Scripts/MainLogic.cs +++ b/Assets/Scripts/MainLogic.cs @@ -9,25 +9,23 @@ public class MainLogic : MonoBehaviour { public ClearUI ClearUI; public SpaceUI SpaceUI; public MoneyManager moneyManager; + public EnemyManager enemyManager; + public GodnessManager godnessManager; public Enemy EnemyObject; public Hole HoleObject; public GameObject CreateButton; public Button DestroyButton; public Image NatureImage; public Slider DestroySlider; - public Text GodnessHPText; - public Text lastEnemyNumText; Hole[] holes = new Hole[9]; float nextSpwnrate; int destroyCoolTime = 200; int nowDestroyCoolTime = 200; - public int godnessHP; - int lastEnemyNum; // Use this for initialization void Start () { DestroyButton.interactable = false; - godnessHP = Data.GodnessHP; - lastEnemyNum = Data.EnemyNumber; + godnessManager.godnessHP = Data.GodnessHP; + enemyManager.lastEnemyNum = Data.EnemyNumber; nextSpwnrate = Data.startGen; StartCoroutine(GameLogic()); } @@ -39,8 +37,6 @@ public class MainLogic : MonoBehaviour { NatureImage.color = Color.yellow; else NatureImage.color = Color.red; - GodnessHPText.text = "X " + godnessHP; - lastEnemyNumText.text = "X " + lastEnemyNum; if (nowDestroyCoolTime > 0) { nowDestroyCoolTime--; @@ -65,9 +61,9 @@ public class MainLogic : MonoBehaviour { { while (GameOverUI.gameObject.activeSelf == false) { - if (lastEnemyNum > 0) + if (enemyManager.lastEnemyNum > 0) { - lastEnemyNum--; + enemyManager.lastEnemyNum--; int direction = Random.Range(0, 3); Enemy nowEnemy; if (direction == 0) diff --git "a/\353\247\265 \353\224\224\354\236\220\354\235\270.pptx" "b/\353\247\265 \353\224\224\354\236\220\354\235\270.pptx" index ce194851dcd70ae55805f68e833c9143abd30339..80257ddc9963edfd708e53ad26759df2434363a5 100644 Binary files "a/\353\247\265 \353\224\224\354\236\220\354\235\270.pptx" and "b/\353\247\265 \353\224\224\354\236\220\354\235\270.pptx" differ