From 0cdc8f6481f06b996294ee10e1703851ed29e0b6 Mon Sep 17 00:00:00 2001 From: bintang433 <13521003@std.stei.itb.ac.id> Date: Sat, 11 May 2024 15:35:48 +0700 Subject: [PATCH] fix: pet one hit kill cheat --- Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab | 2 +- .../_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab | 2 +- .../Prefabs/Pet/Healer/MushroomSmilePBR.prefab | 2 +- Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab | 2 +- Assets/_CompletedAssets/Scripts/Enemy/EnemyHealth.cs | 4 ++-- Assets/_CompletedAssets/Scripts/Pet/Attack.cs | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab index f1109a0d..3e9cd51f 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab @@ -236,7 +236,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: enemyTag: Enemy - speed: 3 + speed: 6 --- !u!114 &6883497329515407097 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab index b8c7d435..d31ed433 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab @@ -1391,7 +1391,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: enemyTag: Enemy - speed: 4 + speed: 8 --- !u!114 &-1799142497566439833 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab index 37f154c0..97afbc20 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab @@ -30613,7 +30613,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: enemyTag: Enemy - speed: 4 + speed: 8 --- !u!114 &5535656724074623742 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab index 41171169..53d6f801 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab @@ -644,7 +644,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3} m_Name: m_EditorClassIdentifier: - speed: 3 + speed: 6 --- !u!114 &-2414361674754636571 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab index 222f3bf5..940b861c 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab @@ -535,7 +535,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3} m_Name: m_EditorClassIdentifier: - speed: 2 + speed: 4 --- !u!114 &7131411868633399835 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab index 322d5b77..e1b0e963 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab @@ -627,7 +627,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1.5 + speed: 3 --- !u!114 &3485027913414794960 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab index 74c27f06..fac1c0c9 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab @@ -305,7 +305,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: canMove: 0 - moveSpeed: 4 + moveSpeed: 8 --- !u!114 &-7991905058926754014 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab index 8c744a31..8ca81fa6 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab @@ -269,7 +269,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: canMove: 0 - moveSpeed: 3 + moveSpeed: 6 --- !u!114 &-4403744560476453840 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab index 382b4bb6..8ec12f74 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab @@ -842,7 +842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: canMove: 0 - moveSpeed: 3.5 + moveSpeed: 7 --- !u!114 &5040952831542473853 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_CompletedAssets/Scripts/Enemy/EnemyHealth.cs b/Assets/_CompletedAssets/Scripts/Enemy/EnemyHealth.cs index b80ffeee..7b66f542 100644 --- a/Assets/_CompletedAssets/Scripts/Enemy/EnemyHealth.cs +++ b/Assets/_CompletedAssets/Scripts/Enemy/EnemyHealth.cs @@ -49,10 +49,10 @@ namespace CompleteProject } - public void TakeDamage(float amount, Vector3 hitPoint) + public void TakeDamage(float amount, Vector3 hitPoint, bool fromPet = false) { // Death if OneHitKill Cheat activated - if (PlayerPrefs.HasKey("OneHitKill")) + if (PlayerPrefs.HasKey("OneHitKill") && !fromPet) { currentHealth = 0; Death(); diff --git a/Assets/_CompletedAssets/Scripts/Pet/Attack.cs b/Assets/_CompletedAssets/Scripts/Pet/Attack.cs index 1e0491c9..ebf88987 100644 --- a/Assets/_CompletedAssets/Scripts/Pet/Attack.cs +++ b/Assets/_CompletedAssets/Scripts/Pet/Attack.cs @@ -75,7 +75,7 @@ namespace CompleteProject { anim.attack(shootSpike.isRanged); } - enemyHealth.TakeDamage(damage, transform.position); + enemyHealth.TakeDamage(damage, transform.position, true); Debug.Log("pet ngedamage musuh, sisa hp musuh: " + enemyHealth.currentHealth); -- GitLab