Skip to content
Snippets Groups Projects
Commit 19e6360e authored by MuhamadAjiW's avatar MuhamadAjiW
Browse files

fix: companions

parent 71f793e8
Branches
Tags
1 merge request!2Base arch
...@@ -12,5 +12,5 @@ MonoBehaviour: ...@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 216226ea5552cac49bdf2645569267bf, type: 3} m_Script: {fileID: 11500000, guid: 216226ea5552cac49bdf2645569267bf, type: 3}
m_Name: HealingCompanionData m_Name: HealingCompanionData
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabPath: prefabPath: Prefabs/Pets/HealingCompanion/HealingCompanion
model: {fileID: 0} model: {fileID: 0}
...@@ -16,7 +16,7 @@ GameObject: ...@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &1050311400148833009 --- !u!4 &1050311400148833009
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -46,6 +46,7 @@ MonoBehaviour: ...@@ -46,6 +46,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 875c881f7a9ed2347a9d28ca2c18c4b5, type: 2} data: {fileID: 11400000, guid: 875c881f7a9ed2347a9d28ca2c18c4b5, type: 2}
canAttack: 1
fireRange: 10 fireRange: 10
projectileSpeed: 50 projectileSpeed: 50
--- !u!1001 &3646467262361916678 --- !u!1001 &3646467262361916678
......
...@@ -966,12 +966,11 @@ MonoBehaviour: ...@@ -966,12 +966,11 @@ MonoBehaviour:
maxHealth: 100 maxHealth: 100
health: 100 health: 100
damagedDelay: 1 damagedDelay: 1
baseDamage: 10
weaponList: weaponList:
- {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
baseDamage: 10
weaponLocation: {x: 0.258, y: 0.889, z: 0.375}
companionList: [] companionList: []
activeCompanions: companionActive:
--- !u!54 &1501595417 --- !u!54 &1501595417
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1242,7 +1241,7 @@ GameObject: ...@@ -1242,7 +1241,7 @@ GameObject:
- component: {fileID: 1899092101} - component: {fileID: 1899092101}
- component: {fileID: 1899092100} - component: {fileID: 1899092100}
m_Layer: 0 m_Layer: 0
m_Name: GameControls m_Name: GameInput
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -1328,6 +1327,6 @@ Transform: ...@@ -1328,6 +1327,6 @@ Transform:
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_Roots: m_Roots:
- {fileID: 354420149}
- {fileID: 1993262143} - {fileID: 1993262143}
- {fileID: 354420149}
- {fileID: 1899092101} - {fileID: 1899092101}
...@@ -58,6 +58,7 @@ public abstract class BossEntity : EnemyEntity, IAccompaniable ...@@ -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 // 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); selectedCompanion.transform.position = transform.position - new Vector3(-0.5f, 0, 0);
companionActive[CompanionSelectorIndex] = true; companionActive[CompanionSelectorIndex] = true;
selectedCompanion.Assign(this);
} }
public void DeactivateCompanion(int index) public void DeactivateCompanion(int index)
......
...@@ -58,6 +58,7 @@ public class PlayerEntity : CombatantEntity, IAccompaniable ...@@ -58,6 +58,7 @@ public class PlayerEntity : CombatantEntity, IAccompaniable
// TODO: Set possible spawn locations for companions, for now it will spawn on the left // 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); selectedCompanion.transform.position = transform.position - new Vector3(-0.5f, 0, 0);
companionActive[CompanionSelectorIndex] = true; companionActive[CompanionSelectorIndex] = true;
selectedCompanion.Assign(this);
} }
public void DeactivateCompanion(int index) public void DeactivateCompanion(int index)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment