diff --git a/Assets/Prefabs/MainCutscene.prefab b/Assets/Prefabs/MainCutscene.prefab index 3f0cb6f1819ee1216523b667fbe779b03f026bca..2f91582c757f8aa4cf9e33b6ad2565a1a1a756cb 100644 --- a/Assets/Prefabs/MainCutscene.prefab +++ b/Assets/Prefabs/MainCutscene.prefab @@ -380,7 +380,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2c0ee65241d10451ea93798e12b2993a, type: 3} + m_audioClip: {fileID: 8300000, guid: c2bd4befd3407004dbfebeed2835cb5c, type: 3} m_PlayOnAwake: 1 m_Volume: 0.9 m_Pitch: 1 diff --git a/Assets/Prefabs/OpeningCanvas.prefab b/Assets/Prefabs/OpeningCanvas.prefab index 139a21e46a98f488f843623acfd7ea07777caaf4..d852872b045e9546ad54eb3fb718c5b45b32cd2a 100644 --- a/Assets/Prefabs/OpeningCanvas.prefab +++ b/Assets/Prefabs/OpeningCanvas.prefab @@ -339,7 +339,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3163ef7c8c58642ec955d4e082b5491e, type: 3} + m_audioClip: {fileID: 8300000, guid: 64a5cf63dc93c094fb2bc989423d7fe7, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 diff --git a/Assets/Prefabs/ProgressCanvas.prefab b/Assets/Prefabs/ProgressCanvas.prefab index dfb5c95914992a39990ef97ae66902739df82091..d0f8a1feda4f68f3d86af2b4ffd2deebecfb7f61 100644 --- a/Assets/Prefabs/ProgressCanvas.prefab +++ b/Assets/Prefabs/ProgressCanvas.prefab @@ -224,7 +224,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: b1dbb025c055f4b1aa63785e7c4a18ba, type: 3} + m_audioClip: {fileID: 8300000, guid: 732700035063cea459a4a158c2c28016, type: 3} m_PlayOnAwake: 1 m_Volume: 0.8 m_Pitch: 1 diff --git a/Assets/Prefabs/ShopKeeperCanvas.prefab b/Assets/Prefabs/ShopKeeperCanvas.prefab index 387cad3b72f5f412f3e9a204100e97d039e25555..faa79eb3b6f0d4f894cbaeba4edf05557dd586d3 100644 --- a/Assets/Prefabs/ShopKeeperCanvas.prefab +++ b/Assets/Prefabs/ShopKeeperCanvas.prefab @@ -239,7 +239,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 7694.946, y: 140} + m_AnchoredPosition: {x: 7823.336, y: 140} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6427786897761567691 diff --git a/Assets/Scenes/Ending.unity b/Assets/Scenes/Ending.unity index 25090546fb2b8827d119c9881482b6a9c0a76106..e54a3b4da6051c4dfafca75aa552104de9951819 100644 --- a/Assets/Scenes/Ending.unity +++ b/Assets/Scenes/Ending.unity @@ -624,14 +624,14 @@ PrefabInstance: - target: {fileID: -7872298102450243469, guid: e25ebba664f320f4783a61760095f94c, type: 3} propertyPath: m_audioClip value: - objectReference: {fileID: 8300000, guid: dd702210d7e254e769e612c488a58e4d, type: 3} + objectReference: {fileID: 8300000, guid: 6b9282d7f399a074a8a175727afda80b, type: 3} - target: {fileID: 9153430419299577848, guid: e25ebba664f320f4783a61760095f94c, type: 3} propertyPath: dialogue value: objectReference: {fileID: 11400000, guid: 391a27064199f4b1190fe91b2e9a8973, type: 2} - target: {fileID: 9153430419299577848, guid: e25ebba664f320f4783a61760095f94c, type: 3} propertyPath: nextScene - value: + value: LocalScoreBoard objectReference: {fileID: 0} - target: {fileID: 9153430419299577851, guid: e25ebba664f320f4783a61760095f94c, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e675ba41ac740389bcc85b61f1ea3a332bd8b541..f87b304d60f75b023891916926bd7eaf93275567 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028305, g: 0.22571313, b: 0.3069213, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -350,6 +350,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2034525850, guid: 5d9b0e04e9c22b94caa498847bbb75a6, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: LocalScoreboard + objectReference: {fileID: 0} - target: {fileID: 1922826709922847276, guid: 5d9b0e04e9c22b94caa498847bbb75a6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: LoadGame diff --git a/Assets/Scripts/Managers/MainMenuManager.cs b/Assets/Scripts/Managers/MainMenuManager.cs index 6c108c19f72e7b91486d949e4dfbdb82aa52c1a3..381f80eac7a6591c5027587ff092680dac8a1c96 100644 --- a/Assets/Scripts/Managers/MainMenuManager.cs +++ b/Assets/Scripts/Managers/MainMenuManager.cs @@ -41,4 +41,9 @@ public class MainMenuManager : MonoBehaviour { Application.Quit(); } + + public void LocalScoreboard() + { + SceneManager.LoadScene("LocalScoreBoard"); + } } diff --git a/Assets/Scripts/Pets/PetAttack.cs b/Assets/Scripts/Pets/PetAttack.cs index 0f7214bcc58e063bd9ed3b9f3f70c7a163e5988a..3c9096b266ab75067bc045a1346be7fd64ea8149 100644 --- a/Assets/Scripts/Pets/PetAttack.cs +++ b/Assets/Scripts/Pets/PetAttack.cs @@ -8,13 +8,10 @@ public class PetAttack : MonoBehaviour public float timeBetweenAttacks = 0.5f; public int attackDamage = 10; - GameObject[] enemy; - GameObject[] enemyInRange; Animator anim; GameObject player; PlayerHealth playerHealth; EnemyHealth enemyHealth; - bool playerInRange; bool attacking; float timer; @@ -28,7 +25,7 @@ public class PetAttack : MonoBehaviour void OnTriggerStay(Collider other) { - if (enemy.Contains(other.gameObject)) + if (other.tag == "Enemy") { Attack(other.gameObject); } @@ -44,11 +41,6 @@ public class PetAttack : MonoBehaviour { attacking = true; } - - if (playerHealth.currentHealth <= 0) - { - anim.SetTrigger ("PlayerDead"); - } } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6c6bab612bb93976fa49250b47899b925cb7280d..6f558e79cdcd1507843a987ba787830732e4f337 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -35,4 +35,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Ending.unity guid: 5e7e3132bca7b4ae0848cabf302a900b + - enabled: 1 + path: Assets/Scenes/LocalScoreBoard.unity + guid: c2e1d3b6015b27449bf8ba1eac898c7c m_configObjects: {}