Added a tagging system so clicking on objects can have a more defined selection in scripting and fixed an issue with the attack animation starting and looping on start

This commit is contained in:
Gregory Campbell
2020-03-28 18:40:46 -04:00
parent 48944df7b7
commit 1e4c495090
5 changed files with 55 additions and 14 deletions
+1 -1
View File
@@ -95,7 +95,7 @@ AnimationClip:
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
m_HasAdditiveReferencePose: 0 m_HasAdditiveReferencePose: 0
m_LoopTime: 1 m_LoopTime: 0
m_LoopBlend: 0 m_LoopBlend: 0
m_LoopBlendOrientation: 0 m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0 m_LoopBlendPositionY: 0
@@ -11,7 +11,10 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 8090843760006368951} m_State: {fileID: 8090843760006368951}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 270, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -812155198749090587}
m_Position: {x: 280, y: 130, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@@ -21,7 +24,33 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8090843760006368951} m_DefaultState: {fileID: -812155198749090587}
--- !u!1102 &-812155198749090587
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
+4 -4
View File
@@ -380,7 +380,7 @@ GameObject:
- component: {fileID: 617295557} - component: {fileID: 617295557}
m_Layer: 0 m_Layer: 0
m_Name: Party Member 2 m_Name: Party Member 2
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -733,7 +733,7 @@ GameObject:
- component: {fileID: 1394857172} - component: {fileID: 1394857172}
m_Layer: 0 m_Layer: 0
m_Name: Party Member 3 m_Name: Party Member 3
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -1058,7 +1058,7 @@ GameObject:
- component: {fileID: 1935397211} - component: {fileID: 1935397211}
m_Layer: 0 m_Layer: 0
m_Name: Party Member 4 m_Name: Party Member 4
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -1187,7 +1187,7 @@ GameObject:
- component: {fileID: 2058067576} - component: {fileID: 2058067576}
m_Layer: 0 m_Layer: 0
m_Name: Party Member 1 m_Name: Party Member 1
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
+10
View File
@@ -32,6 +32,10 @@ public class GMScript : MonoBehaviour
RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero); RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
if (hit.collider != null) { if (hit.collider != null) {
if(hit.collider.gameObject.tag == "Party")
{
CheckParty(hit.collider.gameObject); CheckParty(hit.collider.gameObject);
if(noRepeat) if(noRepeat)
@@ -42,6 +46,12 @@ public class GMScript : MonoBehaviour
} }
OutputParty(); OutputParty();
}
if(hit.collider.gameObject.tag == "Attack")
{
}
} }
} }
+3 -1
View File
@@ -3,7 +3,9 @@
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 2
tags: [] tags:
- Party
- Attack
layers: layers:
- Default - Default
- TransparentFX - TransparentFX