diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab index f1109a0db104de56ac9c12e3465e60486f8e3db5..3e9cd51fe5391348d8c619f3f08c39605a3cf17a 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 b8c7d435a3254430f4f015d7cd9546de4f32d04a..d31ed4333e9bf73d6265c59e5c63308d2c5a8a37 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 37f154c0364a1823a3dea42e58dd083542be2110..97afbc2066ff08a908c35361631c01ac17f73e03 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 41171169c344271b0b47742fb920a5765321683b..53d6f801f2f6e534e882afc81533429d3561af6d 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 222f3bf542e38d015133ba2125c013887af2c7a4..940b861ce14853f543295847dd8555b43168fb7e 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 322d5b77ea070f870000da04c87ba31233fba160..e1b0e96353c19168b2621367e9f1d099581e69a6 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 74c27f060b83b8c93ddbd131fbf1049084f164dc..fac1c0c9de8ab84ab6e1b94b69d8dc06f8bb436b 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 8c744a3115e2341ccbb17c5a94838db5d5dc8696..8ca81fa650fc5492886047839a5d8737b8644649 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 382b4bb6659248c6abdfb17e877377df12fb8a4a..8ec12f74ad5724aea657dfbe3b15143a5553fe30 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 b80ffeee222383eed361eaa3361edd0b0d57409e..7b66f5421f55817f31d900326c57c9852f1f71a6 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 1e0491c91bc1abf8a334205edf00b1b2f0f48cc9..ebf88987407d0f6008ba971f9c2478d684d08590 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);