Enemies has weapons
This commit is contained in:
parent
e4d15da38c
commit
841b8f5b11
|
|
@ -1 +1 @@
|
|||
Subproject commit 08e1e8f0ea14d83d82cd81896865b7c1b7664a0f
|
||||
Subproject commit d4790ce4eb5c5acb4a064cb9635f04237154b6c6
|
||||
|
|
@ -63,10 +63,43 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1671077540319194627}
|
||||
- {fileID: 3955427233603104958}
|
||||
- {fileID: 2779095692619510124}
|
||||
- {fileID: 572112015131641624}
|
||||
m_Father: {fileID: 3291032053430181389}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &969880390003901550
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 811677577463755053}
|
||||
m_Layer: 0
|
||||
m_Name: Pivot:RightCanon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &811677577463755053
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 969880390003901550}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7482429727618512454}
|
||||
- {fileID: 3955427233603104958}
|
||||
m_Father: {fileID: 572112015131641624}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1312307913408260796
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -115,6 +148,38 @@ MonoBehaviour:
|
|||
<CurrentHealth>k__BackingField: 10
|
||||
<MaxHealth>k__BackingField: 10
|
||||
<IsInvulnerable>k__BackingField: 0
|
||||
--- !u!1 &1768817052950042673
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 572112015131641624}
|
||||
m_Layer: 0
|
||||
m_Name: Ref:ZForward
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &572112015131641624
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1768817052950042673}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -0.5800019}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 811677577463755053}
|
||||
m_Father: {fileID: 5355765884551595638}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
--- !u!1 &1856154329861502355
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -141,12 +206,12 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856154329861502355}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0.341, y: 0, z: 0.587}
|
||||
m_LocalScale: {x: 0.24, y: 0.4597677, z: 0.19977282}
|
||||
m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5}
|
||||
m_LocalPosition: {x: -0.0070037553, y: 0, z: 0.34099972}
|
||||
m_LocalScale: {x: 0.24000004, y: 0.4597681, z: 0.19977288}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5355765884551595638}
|
||||
m_Father: {fileID: 3567042716935981046}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
|
||||
--- !u!33 &4938033185760690219
|
||||
MeshFilter:
|
||||
|
|
@ -230,6 +295,8 @@ Transform:
|
|||
- {fileID: 4626427865743511805}
|
||||
- {fileID: 3486364872742429245}
|
||||
- {fileID: 5845428820912776804}
|
||||
- {fileID: 7096490151401485619}
|
||||
- {fileID: 5106144230194337297}
|
||||
m_Father: {fileID: 2692714622321691895}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3867128990362458971
|
||||
|
|
@ -552,6 +619,9 @@ MonoBehaviour:
|
|||
_uiFriendlyName: Enemy
|
||||
_entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2}
|
||||
_enemyBaseSet: {fileID: 11400000, guid: e5f25127d92be074aac6e7b745fae107, type: 2}
|
||||
<Weapons>k__BackingField:
|
||||
- {fileID: 5154912354327310122}
|
||||
- {fileID: 5217425462754499093}
|
||||
<Targeter>k__BackingField: {fileID: 2802974253471165353}
|
||||
_navMeshAgent: {fileID: 103375416814990516}
|
||||
--- !u!195 &103375416814990516
|
||||
|
|
@ -609,6 +679,118 @@ Transform:
|
|||
- {fileID: 561887346552595101}
|
||||
m_Father: {fileID: 2692714622321691895}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6041012244919510405
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5106144230194337297}
|
||||
- component: {fileID: 5217425462754499093}
|
||||
m_Layer: 0
|
||||
m_Name: RightWeapon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5106144230194337297
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6041012244919510405}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5123077350175375293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5217425462754499093
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6041012244919510405}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 86bd9978589203b4db636cf6248e263b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<PivotPoint>k__BackingField: {fileID: 811677577463755053}
|
||||
<BarrelEndPoint>k__BackingField: {fileID: 7482429727618512454}
|
||||
<FireRate>k__BackingField: 0.5
|
||||
<Damage>k__BackingField: 1
|
||||
<FireWeapon>k__BackingField: 0
|
||||
_timeUntilFire: 0
|
||||
--- !u!1 &6587578884267603271
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8069824759984300208}
|
||||
m_Layer: 0
|
||||
m_Name: Ref:LeftBarrelEndPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8069824759984300208
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6587578884267603271}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.79999954}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3567042716935981046}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6632207177714851383
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7482429727618512454}
|
||||
m_Layer: 0
|
||||
m_Name: Ref:RightBarrelEndPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7482429727618512454
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6632207177714851383}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.7999994}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 811677577463755053}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6940800288144322101
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -641,6 +823,39 @@ Transform:
|
|||
- {fileID: 7780103704517281592}
|
||||
m_Father: {fileID: 4114072049224310043}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6965908865445823287
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3567042716935981046}
|
||||
m_Layer: 0
|
||||
m_Name: Pivot:LeftCanon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3567042716935981046
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6965908865445823287}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1671077540319194627}
|
||||
- {fileID: 8069824759984300208}
|
||||
m_Father: {fileID: 2779095692619510124}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7089677990206923544
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -754,6 +969,88 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 4114072049224310043}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8161242943652874426
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7096490151401485619}
|
||||
- component: {fileID: 5154912354327310122}
|
||||
m_Layer: 0
|
||||
m_Name: LeftWeapon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7096490151401485619
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8161242943652874426}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5123077350175375293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5154912354327310122
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8161242943652874426}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 86bd9978589203b4db636cf6248e263b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<PivotPoint>k__BackingField: {fileID: 3567042716935981046}
|
||||
<BarrelEndPoint>k__BackingField: {fileID: 8069824759984300208}
|
||||
<FireRate>k__BackingField: 0.5
|
||||
<Damage>k__BackingField: 1
|
||||
<FireWeapon>k__BackingField: 0
|
||||
_timeUntilFire: 0
|
||||
--- !u!1 &8688318302810354426
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2779095692619510124}
|
||||
m_Layer: 0
|
||||
m_Name: Ref:ZForward
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2779095692619510124
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8688318302810354426}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.5800019}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3567042716935981046}
|
||||
m_Father: {fileID: 5355765884551595638}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
--- !u!1 &8831453991117079309
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -865,12 +1162,12 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8931538593362537433}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0.34100002, y: 0, z: -0.603}
|
||||
m_LocalScale: {x: 0.24, y: 0.4597677, z: 0.19977282}
|
||||
m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5}
|
||||
m_LocalPosition: {x: 0.022998841, y: 0, z: 0.3409996}
|
||||
m_LocalScale: {x: 0.24000002, y: 0.45976788, z: 0.19977282}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5355765884551595638}
|
||||
m_Father: {fileID: 811677577463755053}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
|
||||
--- !u!33 &6582230243926515993
|
||||
MeshFilter:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
using System.Collections.Generic;
|
||||
using AsteroidGame.ScriptableObjects;
|
||||
using GameDev.CoreSystems;
|
||||
using UnityEngine;
|
||||
using UnityEngine.AI;
|
||||
|
||||
|
|
@ -8,6 +10,9 @@ namespace AsteroidGame.Entities
|
|||
{
|
||||
[SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet;
|
||||
|
||||
[field: Header("Weapon")]
|
||||
[field: SerializeField] public List<Weapon> Weapons { get; set; }
|
||||
|
||||
[field: Header("Targeter")]
|
||||
[field: SerializeField] public Targeter Targeter { get; set; }
|
||||
|
||||
|
|
@ -42,7 +47,7 @@ namespace AsteroidGame.Entities
|
|||
_navMeshAgent = gameObject.GetComponentInChildren<NavMeshAgent>();
|
||||
}
|
||||
|
||||
_navMeshAgent.speed = 0.1f;
|
||||
//_navMeshAgent.speed = 0.1f;
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
|
|
@ -53,10 +58,24 @@ namespace AsteroidGame.Entities
|
|||
|
||||
private void Update()
|
||||
{
|
||||
if (!Targeter.FindTarget()) return;
|
||||
if (Targeter.FindTarget())
|
||||
{
|
||||
foreach (var weapon in Weapons)
|
||||
{
|
||||
weapon.PivotPoint.transform.LookAt(Targeter.GetTarget().GetCenterPosition());
|
||||
weapon.FireWeapon = true;
|
||||
}
|
||||
|
||||
Targetable = Targeter.GetTarget();
|
||||
_navMeshAgent.SetDestination(Targetable.GetBasePosition());
|
||||
Targetable = Targeter.GetTarget();
|
||||
_navMeshAgent.SetDestination(Targetable.GetBasePosition());
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var weapon in Weapons)
|
||||
{
|
||||
weapon.FireWeapon = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using GameDev.CoreSystems;
|
||||
using UnityEngine;
|
||||
|
||||
|
|
@ -15,7 +16,7 @@ namespace AsteroidGame.Entities
|
|||
[SerializeField] private float _damageDealt = 0f;
|
||||
|
||||
[field: Header("Weapon")]
|
||||
[field: SerializeField] public Weapon Weapon { get; set; }
|
||||
[field: SerializeField] public List<Weapon> Weapons { get; set; }
|
||||
|
||||
[field: Header("Targeter")]
|
||||
[field: SerializeField] public Targeter Targeter { get; set; }
|
||||
|
|
@ -35,12 +36,18 @@ namespace AsteroidGame.Entities
|
|||
{
|
||||
if (Targeter.FindTarget())
|
||||
{
|
||||
Weapon.PivotPoint.transform.LookAt(Targeter.GetTarget().GetCenterPosition());
|
||||
Weapon.FireWeapon = true;
|
||||
foreach (var weapon in Weapons)
|
||||
{
|
||||
weapon.PivotPoint.transform.LookAt(Targeter.GetTarget().GetCenterPosition());
|
||||
weapon.FireWeapon = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Weapon.FireWeapon = false;
|
||||
foreach (var weapon in Weapons)
|
||||
{
|
||||
weapon.FireWeapon = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -348,8 +348,8 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2}
|
||||
<CurrentHealth>k__BackingField: 10
|
||||
<MaxHealth>k__BackingField: 10
|
||||
<CurrentHealth>k__BackingField: 50
|
||||
<MaxHealth>k__BackingField: 50
|
||||
<IsInvulnerable>k__BackingField: 0
|
||||
--- !u!1 &4685821586660635131
|
||||
GameObject:
|
||||
|
|
@ -494,7 +494,7 @@ GameObject:
|
|||
- component: {fileID: 2041380952847458705}
|
||||
- component: {fileID: 5825155873221046368}
|
||||
m_Layer: 0
|
||||
m_Name: Weapon
|
||||
m_Name: MainWeapon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -529,8 +529,8 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
<PivotPoint>k__BackingField: {fileID: 5103935544653627402}
|
||||
<BarrelEndPoint>k__BackingField: {fileID: 2455338187037915645}
|
||||
<FireRate>k__BackingField: 0
|
||||
<Damage>k__BackingField: 0
|
||||
<FireRate>k__BackingField: 2
|
||||
<Damage>k__BackingField: 5
|
||||
<FireWeapon>k__BackingField: 0
|
||||
_timeUntilFire: 0
|
||||
--- !u!1 &5357542139584026431
|
||||
|
|
@ -1149,5 +1149,6 @@ MonoBehaviour:
|
|||
_projectileSpeed: 5
|
||||
_kills: 0
|
||||
_damageDealt: 0
|
||||
<Weapon>k__BackingField: {fileID: 5825155873221046368}
|
||||
<Weapons>k__BackingField:
|
||||
- {fileID: 5825155873221046368}
|
||||
<Targeter>k__BackingField: {fileID: 310569669314672228}
|
||||
|
|
|
|||
|
|
@ -265,12 +265,89 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2079460687}
|
||||
- {fileID: 577983772}
|
||||
- {fileID: 2037644595}
|
||||
- {fileID: 1715656626}
|
||||
- {fileID: 991542217}
|
||||
- {fileID: 1495762292}
|
||||
- {fileID: 1421503444}
|
||||
- {fileID: 1494435109}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &577983771
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 157782261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <Damage>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <FireRate>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.91
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1.13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Turret (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
--- !u!4 &577983772 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
m_PrefabInstance: {fileID: 577983771}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &624469242 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5263199550015624126, guid: 2e352ad6389b4234083764d15d4e6a5f, type: 3}
|
||||
|
|
@ -665,7 +742,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -743,7 +820,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -755,6 +832,72 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1494435108}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1495762291
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 157782261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -8.19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -3.67
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: PowerPlant (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
--- !u!4 &1495762292 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
|
||||
m_PrefabInstance: {fileID: 1495762291}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1702078696
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -850,6 +993,10 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 157782261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 103375416814990516, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
|
||||
propertyPath: m_Speed
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -18.15
|
||||
|
|
@ -1158,6 +1305,80 @@ MonoBehaviour:
|
|||
m_IgnoreFromBuild: 0
|
||||
m_ApplyToChildren: 1
|
||||
m_AffectedAgents: ffffffff
|
||||
--- !u!1001 &2037644594
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 157782261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <Damage>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <FireRate>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -11.32
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -2.18
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Turret (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
--- !u!4 &2037644595 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
m_PrefabInstance: {fileID: 2037644594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2047541735
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1388,14 +1609,6 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 157782261}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <Damage>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: <FireRate>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -3.33
|
||||
|
|
|
|||
Loading…
Reference in New Issue