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

Pull request #77: Added missing Ally tags and sorting order type for enemies

Browse Source 
Merge in CGD/gather-and-defend from dev/tagsAndSortingOrder to main

* commit '507b2ce8e069ed105bb9bc6ac59a5aba39022750':
  Null check so that buildings dont need an animator
  Added missing Ally tags and sorting order type for enemies
This commit is contained in:
Élia Gingras 01 2024-10-27 19:57:46 +00:00
commit 7852709519
8 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Buildings/Castle.prefab
View File

@ -16,7 +16,7 @@ GameObject:
- component: {fileID: -2943795733505287777} - component: {fileID: -2943795733505287777}
m_Layer: 0 m_Layer: 0
m_Name: Castle m_Name: Castle
m_TagString: Untagged m_TagString: Ally
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Buildings/House.prefab
View File

@ -99,7 +99,7 @@ GameObject:
- component: {fileID: 6252103591577139412} - component: {fileID: 6252103591577139412}
m_Layer: 0 m_Layer: 0
m_Name: House m_Name: House
m_TagString: Untagged m_TagString: Ally
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Buildings/Mill.prefab
View File

@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 1045236105932526234} - component: {fileID: 1045236105932526234}
m_Layer: 0 m_Layer: 0
m_Name: Mill m_Name: Mill
m_TagString: Untagged m_TagString: Ally
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

4
Assets/Prefabs/Monsters/Basic_monster.prefab
View File

@ -451,8 +451,8 @@ SortingGroup:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531129202202440418} m_GameObject: {fileID: 1531129202202440418}
m_Enabled: 1 m_Enabled: 1
m_SortingLayerID: 0 m_SortingLayerID: 364159097
m_SortingLayer: 0 m_SortingLayer: 1
m_SortingOrder: 5 m_SortingOrder: 5
--- !u!114 &7161153261079215068 --- !u!114 &7161153261079215068
MonoBehaviour: MonoBehaviour:

4
Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
View File

@ -719,8 +719,8 @@ SortingGroup:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531129202202440418} m_GameObject: {fileID: 1531129202202440418}
m_Enabled: 1 m_Enabled: 1
m_SortingLayerID: 0 m_SortingLayerID: 364159097
m_SortingLayer: 0 m_SortingLayer: 1
m_SortingOrder: 5 m_SortingOrder: 5
--- !u!114 &7161153261079215068 --- !u!114 &7161153261079215068
MonoBehaviour: MonoBehaviour:

4
Assets/Prefabs/Monsters/SmolEye_monster.prefab
View File

@ -365,8 +365,8 @@ SortingGroup:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531129202202440418} m_GameObject: {fileID: 1531129202202440418}
m_Enabled: 1 m_Enabled: 1
m_SortingLayerID: 0 m_SortingLayerID: 364159097
m_SortingLayer: 0 m_SortingLayer: 1
m_SortingOrder: 5 m_SortingOrder: 5
--- !u!114 &7161153261079215068 --- !u!114 &7161153261079215068
MonoBehaviour: MonoBehaviour:

2
Assets/Prefabs/Sticks/Harversters/farmerStick.prefab
View File

@ -408,7 +408,7 @@ GameObject:
- component: {fileID: -6187152107451925345} - component: {fileID: -6187152107451925345}
m_Layer: 0 m_Layer: 0
m_Name: farmerStick m_Name: farmerStick
m_TagString: Untagged m_TagString: Ally
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

5
Assets/Scripts/AnimationEntity.cs
View File

@ -77,9 +77,14 @@ public class AnimationEntity : MonoBehaviour
} }
public void PlayDieAnim() public void PlayDieAnim()
{
// Not every entity needs an animator
if (_animatorEntity != null)
{ {
_animatorEntity.speed = 1; _animatorEntity.speed = 1;
_animatorEntity.Play("die", 0, 0f); _animatorEntity.Play("die", 0, 0f);
}
entityState = EntityAnimationState.Dying; entityState = EntityAnimationState.Dying;
_doSomething = true; _doSomething = true;
_isDead = true; _isDead = true;