diff --git a/Assets/NPCType.cs b/Assets/NPCType.cs index b065bbb3..c44edc2a 100644 --- a/Assets/NPCType.cs +++ b/Assets/NPCType.cs @@ -4,5 +4,23 @@ using UnityEngine; public class NPCType : MonoBehaviour { + + public GameObject lumberjack; public int isQuest; + public string name; + + void Start() + { + NPCDialogue npcdialogue = lumberjack.GetComponent(); + name = npcdialogue.name; + isQuest = PlayerPrefs.GetInt(name); + npcdialogue.isQuest = isQuest; + } + + void Update() + { + NPCDialogue npcdialogue = lumberjack.GetComponent(); + isQuest = npcdialogue.isQuest; + PlayerPrefs.SetInt(name, isQuest); + } } diff --git a/Assets/NewGame.cs b/Assets/NewGame.cs index da51dc5b..1d253f74 100644 --- a/Assets/NewGame.cs +++ b/Assets/NewGame.cs @@ -12,5 +12,17 @@ public class NewGame : MonoBehaviour PlayerPrefs.SetString("pickaxe1", pickaxe1); string name = "none"; PlayerPrefs.SetString("name", name); + int isQuest = 1; + PlayerPrefs.SetInt("lumberjack", isQuest); + int isKilled = 0; + PlayerPrefs.SetInt("bat0", isKilled); + PlayerPrefs.SetInt("bat1", isKilled); + PlayerPrefs.SetInt("skeleton0", isKilled); + PlayerPrefs.SetInt("slime0", isKilled); + PlayerPrefs.SetInt("slime1", isKilled); + float health = 10.0f; + PlayerPrefs.SetFloat("health", health); + + } } diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index 2870a7fc..d028803e 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -54488,6 +54488,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 81223f4044aba464faed4fa279d6c9b1, type: 3} m_Name: m_EditorClassIdentifier: + name: lumberjack nameText: {fileID: 749129730} nameText1: {fileID: 1534487215} dialogueText: {fileID: 2145520340} @@ -54538,7 +54539,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e949be2a455e78458dc423198660daf, type: 3} m_Name: m_EditorClassIdentifier: + lumberjack: {fileID: 551619101} isQuest: 1 + name: --- !u!1 &589833388 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d5247fd3..6d447067 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -367,7 +367,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 3 - enemyName: + enemyName: bat1 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 1 @@ -383,6 +383,7 @@ MonoBehaviour: player: {fileID: 167690937} thrust: 5 knockTime: 0.2 + isKilled: 0 --- !u!1 &23852502 GameObject: m_ObjectHideFlags: 0 @@ -683,7 +684,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 6 - enemyName: + enemyName: skeleton0 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 0 @@ -694,6 +695,7 @@ MonoBehaviour: currentGoal: {fileID: 0} roundingDistance: 0 anim: {fileID: 0} + isKilled: 0 --- !u!95 &68076404 Animator: serializedVersion: 3 @@ -773,7 +775,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 2.5 - enemyName: + enemyName: skeleton0 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 2 @@ -789,6 +791,7 @@ MonoBehaviour: player: {fileID: 167690937} thrust: 5 knockTime: 0.2 + isKilled: 0 --- !u!1 &84519187 GameObject: m_ObjectHideFlags: 0 @@ -2017,7 +2020,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 0 - enemyName: + enemyName: bat0 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 1 @@ -2028,6 +2031,7 @@ MonoBehaviour: currentGoal: {fileID: 0} roundingDistance: 0 anim: {fileID: 0} + isKilled: 0 --- !u!50 &242009515 Rigidbody2D: serializedVersion: 4 @@ -2088,7 +2092,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 2.8 - enemyName: + enemyName: bat0 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 1 @@ -2104,6 +2108,7 @@ MonoBehaviour: player: {fileID: 167690937} thrust: 5 knockTime: 0.2 + isKilled: 0 --- !u!1 &246924466 GameObject: m_ObjectHideFlags: 0 @@ -31372,7 +31377,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 2 - enemyName: + enemyName: slime0 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 0.5 @@ -31388,6 +31393,7 @@ MonoBehaviour: player: {fileID: 167690937} thrust: 5 knockTime: 0.2 + isKilled: 0 --- !u!1 &652174079 GameObject: m_ObjectHideFlags: 0 @@ -31658,7 +31664,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 1.2 - enemyName: + enemyName: slime1 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} health: 0 baseAttack: 0.5 @@ -31674,6 +31680,7 @@ MonoBehaviour: player: {fileID: 167690937} thrust: 5 knockTime: 0.2 + isKilled: 0 --- !u!1 &683424791 GameObject: m_ObjectHideFlags: 0 @@ -138797,6 +138804,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 81223f4044aba464faed4fa279d6c9b1, type: 3} m_Name: m_EditorClassIdentifier: + name: nameText: {fileID: 1081484092} nameText1: {fileID: 1081484092} dialogueText: {fileID: 1736078185} diff --git a/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs b/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs index e6b1a4ec..2ba1dafc 100644 --- a/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs +++ b/Assets/Scripts/Enemies' Scprits/FollowingEnemy.cs @@ -28,10 +28,19 @@ public class FollowingEnemy : Enemy public float thrust; public float knockTime; + public int isKilled; + //isKilled = 0 - mob ALIVE + //isKilled = 1 - mob DEAD + // Start is called before the first frame update void Start() { + isKilled = PlayerPrefs.GetInt(enemyName); + if (isKilled == 1) + { + gameObject.SetActive(false); + } myRigidbody = GetComponent(); anim = GetComponent(); target = GameObject.FindWithTag("Player").transform; @@ -75,6 +84,11 @@ public class FollowingEnemy : Enemy TakeKnockback(); } } + if (gameObject.active == false) + { + isKilled = 1; + PlayerPrefs.SetInt(enemyName, isKilled); + } } diff --git a/Assets/Scripts/Enemies' Scprits/PatrollingEnemy.cs b/Assets/Scripts/Enemies' Scprits/PatrollingEnemy.cs index 66061a40..b5298c85 100644 --- a/Assets/Scripts/Enemies' Scprits/PatrollingEnemy.cs +++ b/Assets/Scripts/Enemies' Scprits/PatrollingEnemy.cs @@ -13,9 +13,18 @@ public class PatrollingEnemy : Enemy //public Transform target; public Animator anim; + public int isKilled; + //isKilled = 0 - mob ALIVE + //isKilled = 1 - mob DEAD + // Start is called before the first frame update void Start() { + isKilled = PlayerPrefs.GetInt(enemyName); + if(isKilled == 1) + { + gameObject.SetActive(false); + } myRigidbody = GetComponent(); anim = GetComponent(); } @@ -33,6 +42,11 @@ public class PatrollingEnemy : Enemy { changeGoal(); } + if(gameObject.active == false) + { + isKilled = 1; + PlayerPrefs.SetInt(enemyName, isKilled); + } } private void changeGoal() diff --git a/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs b/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs index e67441cf..d5c8b6ab 100644 --- a/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs +++ b/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; public class NPCDialogue : MonoBehaviour { - + public string name; public Text nameText; public Text nameText1; public Text dialogueText; diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 0e3a321b..4e532e2c 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -34,8 +34,9 @@ public class Player : MonoBehaviour { rb = gameObject.GetComponent(); myAnimator = GetComponent(); - currentHealth = maxHealth.initialValue; + currentHealth = PlayerPrefs.GetFloat("health"); healthBar.SetMaxHealth(maxHealth.initialValue); + healthBar.SetHealth(currentHealth); walkSpeed = 4f; } @@ -144,8 +145,10 @@ public class Player : MonoBehaviour } } } - //} + PlayerPrefs.SetFloat("health", currentHealth); + //} + HandleInput(); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 90e05ee7..78617fd0 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,16 +24,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 vcSharedLogLevel: value: 0d5e400f0650