Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

v3

Browse Source
This commit is contained in:
BaptisteGirard 2023-05-19 22:30:00 -04:00
parent e58928ef8b
commit 7d225ccbd0
2 changed files with 16 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Assets/LevelEditor/LevelEditorScene.unity
View File

@ -1926,124 +1926,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1001 &669977698
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6962989255644195630, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_Name
value: baseArcher
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalPosition.x
value: -6.51
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalPosition.y
value: 0.51
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalPosition.z
value: 1.8112363
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
--- !u!1001 &1431912647
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -1491803373025033585, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_Mass
value: 0.0001
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195630, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_Name
value: baseMonster
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalPosition.x
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalPosition.y
value: 0.55
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalPosition.z
value: 1.8112363
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6962989255644195631, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
--- !u!1 &1827197197
GameObject:
m_ObjectHideFlags: 0
@ -2090,7 +1972,7 @@ Transform:
- {fileID: 456843628}
- {fileID: 388196585}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1827197200
MonoBehaviour:

23
Assets/Scripts/Detection.cs
View File

@ -13,8 +13,21 @@ public class Detection : MonoBehaviour
void OnTriggerEnter2D(Collider2D other)
{
//Projectiles detection + damage deal
if(_projectileDamage > 0 && other.gameObject.GetComponent<Entity>() == _entityLinked) {
if(_projectileDamage == 0) {
other.gameObject.GetComponent<Entity>().Hp -= _projectileDamage;
//Kill if no hp
if(other.gameObject.GetComponent<Entity>().Hp <= 0) {
Destroy(other.gameObject);
}
}
}
void OnTriggerStay2D(Collider2D other) {
if(_entityLinked.Enemy == null) {
//Detect the enemy and inform the Ally
if (other.gameObject.tag == "Opponent" && _entityLinked is Ally) {
_entityLinked.IsEnemyDetected = true;
@ -26,14 +39,8 @@ public class Detection : MonoBehaviour
_entityLinked.IsEnemyDetected = true;
_entityLinked.Enemy = other.gameObject.GetComponent<Entity>();
}
}else {
//Projectiles detection
if(_projectileDamage > 0 && other.gameObject.GetComponent<Entity>() == _entityLinked) {
Debug.Log("Touchee !!");
other.gameObject.GetComponent<Entity>().Hp -= _projectileDamage;
}
}
}
void OnTriggerExit2D(Collider2D other)