From 19e6360e4da60dc56d6c71eac4fac3ecf95b6348 Mon Sep 17 00:00:00 2001 From: MuhamadAjiW <16521119@mahasiswa.itb.ac.id> Date: Wed, 24 Apr 2024 01:40:50 +0700 Subject: [PATCH] fix: companions --- .../EntityData/CompanionData/HealingCompanionData.asset | 2 +- .../Prefabs/Weapons/TestWeapon/TestWeapon.prefab | 3 ++- Assets/Scenes/DevRoom.unity | 9 ++++----- Assets/_Scripts/Core/Entities/Mobs/BossEntity.cs | 1 + .../Library/BaseClasses/EntityObject/PlayerEntity.cs | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/Resources/Data/EntityData/CompanionData/HealingCompanionData.asset b/Assets/Resources/Data/EntityData/CompanionData/HealingCompanionData.asset index 29fc558a..39249cc3 100644 --- a/Assets/Resources/Data/EntityData/CompanionData/HealingCompanionData.asset +++ b/Assets/Resources/Data/EntityData/CompanionData/HealingCompanionData.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 216226ea5552cac49bdf2645569267bf, type: 3} m_Name: HealingCompanionData m_EditorClassIdentifier: - prefabPath: + prefabPath: Prefabs/Pets/HealingCompanion/HealingCompanion model: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Weapons/TestWeapon/TestWeapon.prefab b/Assets/Resources/Prefabs/Weapons/TestWeapon/TestWeapon.prefab index 9de67d75..31422c4b 100644 --- a/Assets/Resources/Prefabs/Weapons/TestWeapon/TestWeapon.prefab +++ b/Assets/Resources/Prefabs/Weapons/TestWeapon/TestWeapon.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1050311400148833009 Transform: m_ObjectHideFlags: 0 @@ -46,6 +46,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: data: {fileID: 11400000, guid: 875c881f7a9ed2347a9d28ca2c18c4b5, type: 2} + canAttack: 1 fireRange: 10 projectileSpeed: 50 --- !u!1001 &3646467262361916678 diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity index 8d08122f..a11d7bee 100644 --- a/Assets/Scenes/DevRoom.unity +++ b/Assets/Scenes/DevRoom.unity @@ -966,12 +966,11 @@ MonoBehaviour: maxHealth: 100 health: 100 damagedDelay: 1 + baseDamage: 10 weaponList: - {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - baseDamage: 10 - weaponLocation: {x: 0.258, y: 0.889, z: 0.375} companionList: [] - activeCompanions: + companionActive: --- !u!54 &1501595417 Rigidbody: m_ObjectHideFlags: 0 @@ -1242,7 +1241,7 @@ GameObject: - component: {fileID: 1899092101} - component: {fileID: 1899092100} m_Layer: 0 - m_Name: GameControls + m_Name: GameInput m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1328,6 +1327,6 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 354420149} - {fileID: 1993262143} + - {fileID: 354420149} - {fileID: 1899092101} diff --git a/Assets/_Scripts/Core/Entities/Mobs/BossEntity.cs b/Assets/_Scripts/Core/Entities/Mobs/BossEntity.cs index 943bdd0e..cb33094d 100644 --- a/Assets/_Scripts/Core/Entities/Mobs/BossEntity.cs +++ b/Assets/_Scripts/Core/Entities/Mobs/BossEntity.cs @@ -58,6 +58,7 @@ public abstract class BossEntity : EnemyEntity, IAccompaniable // TODO: Set possible spawn locations for companions, for now it will spawn on the left selectedCompanion.transform.position = transform.position - new Vector3(-0.5f, 0, 0); companionActive[CompanionSelectorIndex] = true; + selectedCompanion.Assign(this); } public void DeactivateCompanion(int index) diff --git a/Assets/_Scripts/Library/BaseClasses/EntityObject/PlayerEntity.cs b/Assets/_Scripts/Library/BaseClasses/EntityObject/PlayerEntity.cs index b293d1d2..7ded1158 100644 --- a/Assets/_Scripts/Library/BaseClasses/EntityObject/PlayerEntity.cs +++ b/Assets/_Scripts/Library/BaseClasses/EntityObject/PlayerEntity.cs @@ -58,6 +58,7 @@ public class PlayerEntity : CombatantEntity, IAccompaniable // TODO: Set possible spawn locations for companions, for now it will spawn on the left selectedCompanion.transform.position = transform.position - new Vector3(-0.5f, 0, 0); companionActive[CompanionSelectorIndex] = true; + selectedCompanion.Assign(this); } public void DeactivateCompanion(int index) -- GitLab