diff --git a/Assets/# Prototype/Scripts/MeshColorSetter.cs b/Assets/# Prototype/Scripts/MeshColorSetter.cs index f997c31..da843a6 100644 --- a/Assets/# Prototype/Scripts/MeshColorSetter.cs +++ b/Assets/# Prototype/Scripts/MeshColorSetter.cs @@ -13,9 +13,15 @@ namespace __Prototype.Scripts private MaterialPropertyBlock block; + private void OnValidate() + { + meshRenderer ??= GetComponent(); + Paint(); + } + private void Awake() { - block = new MaterialPropertyBlock(); + meshRenderer ??= GetComponent(); } private void Start() @@ -26,6 +32,7 @@ namespace __Prototype.Scripts [GroupDebug, Button(ButtonSizes.Medium)] private void Paint() { + block = new MaterialPropertyBlock(); meshRenderer.GetPropertyBlock(block); block.SetColor(BaseColor, color); meshRenderer.SetPropertyBlock(block); diff --git a/Assets/Resources/Tags/Behaviours.meta b/Assets/Resources/Tags/Behaviours.meta new file mode 100644 index 0000000..bbb9a4d --- /dev/null +++ b/Assets/Resources/Tags/Behaviours.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55184f17fec7946879dfae19e1b1550f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset b/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset new file mode 100644 index 0000000..0e86e6e --- /dev/null +++ b/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab2e7a683f584962a36a133a6ac88b4a, type: 3} + m_Name: behaviour.can-interact + m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Tags.BehaviourTag + code: behaviour.can-interact diff --git a/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset.meta b/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset.meta new file mode 100644 index 0000000..27aabbd --- /dev/null +++ b/Assets/Resources/Tags/Behaviours/behaviour.can-interact.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 658e05d77a47d4e9591207114542f5fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/5. Gameplay.unity b/Assets/Scenes/5. Gameplay.unity index 0936b08..71cea92 100644 --- a/Assets/Scenes/5. Gameplay.unity +++ b/Assets/Scenes/5. Gameplay.unity @@ -146,12 +146,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95093373} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &95093375 BoxCollider: @@ -243,6 +243,7 @@ GameObject: - component: {fileID: 218819663} - component: {fileID: 218819662} - component: {fileID: 218819661} + - component: {fileID: 218819664} m_Layer: 0 m_Name: Cube (7) m_TagString: Untagged @@ -258,12 +259,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 218819659} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &218819661 BoxCollider: @@ -311,7 +312,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -343,6 +344,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 218819659} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &218819664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218819659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 218819662} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &237773309 GameObject: m_ObjectHideFlags: 0 @@ -370,12 +385,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237773309} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &237773311 BoxCollider: @@ -526,12 +541,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 296805961} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &296805963 BoxCollider: @@ -611,6 +626,66 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 296805961} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &320298438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320298439} + m_Layer: 0 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320298439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320298438} + 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: 531468619} + - {fileID: 1777983740} + - {fileID: 2025587385} + - {fileID: 510216994} + - {fileID: 1892732481} + - {fileID: 1264271870} + - {fileID: 381551038} + - {fileID: 2037572776} + - {fileID: 570631793} + - {fileID: 95093374} + - {fileID: 237773310} + - {fileID: 848110828} + - {fileID: 982758292} + - {fileID: 1950344828} + - {fileID: 1655424714} + - {fileID: 866608685} + - {fileID: 783026647} + - {fileID: 296805962} + - {fileID: 1141029883} + - {fileID: 514876628} + - {fileID: 412411640} + - {fileID: 1286810258} + - {fileID: 218819660} + - {fileID: 1987971990} + - {fileID: 2017826519} + - {fileID: 1434619733} + - {fileID: 1031327464} + - {fileID: 1552570365} + - {fileID: 744497484} + m_Father: {fileID: 1187971236} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &381551037 GameObject: m_ObjectHideFlags: 0 @@ -638,12 +713,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 381551037} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 3, z: 28.5} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &381551039 BoxCollider: @@ -750,12 +825,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 412411639} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 3, z: 24.5} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &412411641 BoxCollider: @@ -862,12 +937,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 510216993} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &510216995 BoxCollider: @@ -974,12 +1049,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 514876627} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &514876629 BoxCollider: @@ -1071,6 +1146,7 @@ GameObject: - component: {fileID: 531468622} - component: {fileID: 531468621} - component: {fileID: 531468620} + - component: {fileID: 531468623} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -1086,12 +1162,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 531468618} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &531468620 BoxCollider: @@ -1139,7 +1215,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1171,6 +1247,90 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 531468618} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &531468623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 531468618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 531468621} + color: {r: 0.2801565, g: 1, b: 0, a: 1} +--- !u!1 &539500807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 539500808} + - component: {fileID: 539500810} + - component: {fileID: 539500809} + m_Layer: 0 + m_Name: EntitySensor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &539500808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539500807} + 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: 1478155984} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &539500809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539500807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c464392c6a5944d6805bcdbc8080bdd3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Entities.EntitySensor + tags: + - {fileID: 11400000, guid: 658e05d77a47d4e9591207114542f5fa, type: 2} + behaviours: [] + entityTag: {fileID: 11400000, guid: cbbcb2cf973134168b6cb08bbf9c9dc0, type: 2} +--- !u!135 &539500810 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539500807} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.25 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &570631792 GameObject: m_ObjectHideFlags: 0 @@ -1183,6 +1343,7 @@ GameObject: - component: {fileID: 570631796} - component: {fileID: 570631795} - component: {fileID: 570631794} + - component: {fileID: 570631797} m_Layer: 0 m_Name: Cube (5) m_TagString: Untagged @@ -1198,12 +1359,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 570631792} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &570631794 BoxCollider: @@ -1251,7 +1412,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1283,6 +1444,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 570631792} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &570631797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570631792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 570631795} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -1400,7 +1575,7 @@ Transform: m_LocalScale: {x: 7.872658, y: 1, z: 11.86862} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: -17.753, y: 0, z: 0} --- !u!65 &744497485 BoxCollider: @@ -1521,12 +1696,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 783026646} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &783026648 BoxCollider: @@ -1606,6 +1781,134 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 783026646} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &810748572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 810748573} + - component: {fileID: 810748576} + - component: {fileID: 810748575} + - component: {fileID: 810748574} + - component: {fileID: 810748577} + m_Layer: 0 + m_Name: Switch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &810748573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810748572} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7, y: 1, z: 8} + m_LocalScale: {x: 0.25, y: 2, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2128748249} + m_Father: {fileID: 1187971236} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &810748574 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810748572} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &810748575 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810748572} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &810748576 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810748572} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &810748577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810748572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 810748575} + color: {r: 0.9433962, g: 0.22694907, b: 0.30825463, a: 1} --- !u!1 &848110827 GameObject: m_ObjectHideFlags: 0 @@ -1633,12 +1936,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 848110827} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &848110829 BoxCollider: @@ -1730,6 +2033,7 @@ GameObject: - component: {fileID: 866608688} - component: {fileID: 866608687} - component: {fileID: 866608686} + - component: {fileID: 866608689} m_Layer: 0 m_Name: Cube (6) m_TagString: Untagged @@ -1745,12 +2049,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 866608684} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &866608686 BoxCollider: @@ -1798,7 +2102,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1830,6 +2134,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 866608684} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &866608689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866608684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 866608687} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &873481847 GameObject: m_ObjectHideFlags: 0 @@ -2018,12 +2336,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 982758291} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: -0.5, z: 6} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &982758293 BoxCollider: @@ -2130,12 +2448,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1031327463} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1031327465 BoxCollider: @@ -2242,12 +2560,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141029882} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1141029884 BoxCollider: @@ -2357,7 +2675,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.SentinelBrain subscriptionId: 53c694ecee4d49be8b1852bf3047ed0e - entityTag: {fileID: 11400000, guid: cbbcb2cf973134168b6cb08bbf9c9dc0, type: 2} rootEntity: {fileID: 1478155985} --- !u!4 &1179841130 Transform: @@ -2375,6 +2692,67 @@ Transform: - {fileID: 1809909214} m_Father: {fileID: 2054429927} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1187971235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187971236} + - component: {fileID: 1187971237} + m_Layer: 0 + m_Name: Structure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1187971236 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187971235} + 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: 810748573} + - {fileID: 320298439} + m_Father: {fileID: 1943926653} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1187971237 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187971235} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!1 &1223120086 GameObject: m_ObjectHideFlags: 0 @@ -2388,6 +2766,7 @@ GameObject: - component: {fileID: 1223120092} - component: {fileID: 1223120091} - component: {fileID: 1223120093} + - component: {fileID: 1223120094} m_Layer: 0 m_Name: Follow m_TagString: Untagged @@ -2536,6 +2915,25 @@ MonoBehaviour: useFollowTargetY: 1 projectionYSmoothTime: 0.08 drawDebugProjection: 1 +--- !u!114 &1223120094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223120086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a30e490ac07e4c6982fa770e3cef253f, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Camera.CameraFollowManager + subscriptionId: 16e1ca39a3d74dec8949f9d743a60190 + vcam: {fileID: 1223120090} + startOrthographicSize: 12 + startZoomSmoothTime: 1 + defaultOrthographicSize: 7 + zoomInOrthographicSize: 4 + zoomOutOrthographicSize: 10 --- !u!1 &1264271869 GameObject: m_ObjectHideFlags: 0 @@ -2563,12 +2961,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264271869} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1264271871 BoxCollider: @@ -2708,6 +3106,7 @@ GameObject: - component: {fileID: 1286810261} - component: {fileID: 1286810260} - component: {fileID: 1286810259} + - component: {fileID: 1286810262} m_Layer: 0 m_Name: Cube (3) m_TagString: Untagged @@ -2723,12 +3122,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1286810257} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1286810259 BoxCollider: @@ -2776,7 +3175,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2808,6 +3207,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1286810257} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1286810262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1286810257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 1286810260} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &1372692861 GameObject: m_ObjectHideFlags: 0 @@ -2916,12 +3329,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434619732} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1434619734 BoxCollider: @@ -3036,6 +3449,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 539500808} - {fileID: 1532299329} m_Father: {fileID: 2054429927} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3053,6 +3467,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Sentinel.SentinelEntity id: 12727d5dd6614d1cadf3eb6c27885dcc brain: {fileID: 1179841129} + entitySensor: {fileID: 539500809} unityRigidbody: {fileID: 1478155986} modelTransform: {fileID: 1532299329} modelAnimation: {fileID: 1532299330} @@ -3168,7 +3583,7 @@ GameObject: - component: {fileID: 1524378545} - component: {fileID: 1524378544} m_Layer: 0 - m_Name: BoundaryA (1) + m_Name: BoundaryB m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3395,12 +3810,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552570364} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 3, z: 28.5} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1552570366 BoxCollider: @@ -3492,6 +3907,7 @@ GameObject: - component: {fileID: 1655424717} - component: {fileID: 1655424716} - component: {fileID: 1655424715} + - component: {fileID: 1655424718} m_Layer: 0 m_Name: Cube (2) m_TagString: Untagged @@ -3507,12 +3923,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1655424713} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1655424715 BoxCollider: @@ -3560,7 +3976,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3592,6 +4008,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1655424713} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1655424718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655424713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 1655424716} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1001 &1663952117 PrefabInstance: m_ObjectHideFlags: 0 @@ -3752,6 +4182,7 @@ GameObject: - component: {fileID: 1777983743} - component: {fileID: 1777983742} - component: {fileID: 1777983741} + - component: {fileID: 1777983744} m_Layer: 0 m_Name: Cube (4) m_TagString: Untagged @@ -3767,12 +4198,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777983739} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1777983741 BoxCollider: @@ -3820,7 +4251,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3852,6 +4283,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777983739} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1777983744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777983739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 1777983742} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &1809909213 GameObject: m_ObjectHideFlags: 0 @@ -3976,12 +4421,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892732480} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1892732482 BoxCollider: @@ -4070,7 +4515,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1943926653} - - component: {fileID: 1943926654} m_Layer: 0 m_Name: Stage m_TagString: Untagged @@ -4091,66 +4535,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 531468619} - - {fileID: 1777983740} - - {fileID: 2025587385} - - {fileID: 510216994} - - {fileID: 1892732481} - - {fileID: 1264271870} - - {fileID: 381551038} - - {fileID: 2037572776} - - {fileID: 570631793} - - {fileID: 95093374} - - {fileID: 237773310} - - {fileID: 848110828} - - {fileID: 982758292} - - {fileID: 1950344828} - - {fileID: 1655424714} - - {fileID: 866608685} - - {fileID: 783026647} - - {fileID: 296805962} - - {fileID: 1141029883} - - {fileID: 514876628} - - {fileID: 412411640} - - {fileID: 1286810258} - - {fileID: 218819660} - - {fileID: 1987971990} - - {fileID: 2017826519} - - {fileID: 1434619733} - - {fileID: 1031327464} - - {fileID: 1552570365} - - {fileID: 744497484} - {fileID: 1372692862} - {fileID: 1524378543} + - {fileID: 1187971236} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1943926654 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943926652} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!1 &1950344827 GameObject: m_ObjectHideFlags: 0 @@ -4178,12 +4567,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950344827} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 3, z: 24.5} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1950344829 BoxCollider: @@ -4290,12 +4679,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987971989} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1987971991 BoxCollider: @@ -4449,12 +4838,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2017826518} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6, y: -0.5, z: 2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2017826520 BoxCollider: @@ -4561,12 +4950,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025587384} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10, y: -0.5, z: 10} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2025587386 BoxCollider: @@ -4658,6 +5047,7 @@ GameObject: - component: {fileID: 2037572779} - component: {fileID: 2037572778} - component: {fileID: 2037572777} + - component: {fileID: 2037572780} m_Layer: 0 m_Name: Cube (1) m_TagString: Untagged @@ -4673,12 +5063,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037572775} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: -2} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943926653} + m_Father: {fileID: 320298439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2037572777 BoxCollider: @@ -4726,7 +5116,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4758,6 +5148,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037572775} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &2037572780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037572775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0ba32e2ebe4f2eb4f2e18c11be758d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::__Prototype.Scripts.MeshColorSetter + meshRenderer: {fileID: 2037572778} + color: {r: 0.2801565, g: 1, b: 0, a: 1} --- !u!1 &2054429925 GameObject: m_ObjectHideFlags: 0 @@ -4840,6 +5244,82 @@ MonoBehaviour: enterBlendTime: 1 boundsBlendTime: 0.75 exitBlendTime: 0.5 +--- !u!1 &2128748248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2128748249} + - component: {fileID: 2128748250} + - component: {fileID: 2128748251} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2128748249 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128748248} + 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: 810748573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &2128748250 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128748248} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2128748251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128748248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a682f23a07cd4cfcaca3f2b5bfed2ab5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Camera.CameraProximityTrigger + id: efeabf3065a744fe82cdeeba71e404e7 + mainCollider: {fileID: 2128748250} + entitySensors: + - {fileID: 11400000, guid: cbbcb2cf973134168b6cb08bbf9c9dc0, type: 2} + behaviourTags: + - {fileID: 11400000, guid: 658e05d77a47d4e9591207114542f5fa, type: 2} + radius: 1.5 + zoomLevel: 1 + enterZoomVelocity: 0.5 + exitZoomVelocity: 0.5 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs b/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs new file mode 100644 index 0000000..64f0f22 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs @@ -0,0 +1,102 @@ +using System; +using Intrepid.Core.Camera.Events; +using Intrepid.SimpleEvents; +using Intrepid.Utilities; +using Sirenix.OdinInspector; +using Unity.Cinemachine; +using UnityEngine; + +namespace Intrepid.Core.Camera +{ + public sealed class CameraFollowManager : EventListener + { + [GroupInjections, SerializeField] private CinemachineCamera vcam; + + [GroupConfigurations, SerializeField] private float startOrthographicSize = 12f; + [GroupConfigurations, SerializeField] private float startZoomSmoothTime = 1f; + + [GroupConfigurations, SerializeField] private float defaultOrthographicSize = 7f; + [GroupConfigurations, SerializeField] private float zoomInOrthographicSize = 4f; + [GroupConfigurations, SerializeField] private float zoomOutOrthographicSize = 10f; + + private float TargetOrthographicSize { get; set; } + + private float _zoomSmoothTime; + private float _zoomCurrentVelocity; + + protected override void InitializeVariables() + { + TargetOrthographicSize = defaultOrthographicSize; + _zoomSmoothTime = startZoomSmoothTime; + _zoomCurrentVelocity = 0f; + + var lens = vcam.Lens; + lens.OrthographicSize = startOrthographicSize; + vcam.Lens = lens; + } + + protected override void OnBootstrap() + { + } + + protected override void Subscriptions() + { + Subscribe(OnCameraZoomEvent); + } + + private void OnCameraZoomEvent(CameraZoomEvent e) + { + SetZoomLevel(e.ZoomLevel, e.ZoomVelocity); + } + + [GroupDebug, Button(ButtonSizes.Medium, ButtonStyle.FoldoutButton)] + private void ZoomNone(float zoomSmoothTime = .25f) + { + SetZoomLevel(zoomSmoothTime: zoomSmoothTime); + } + + [GroupDebug, Button(ButtonSizes.Medium, ButtonStyle.FoldoutButton)] + private void ZoomIn(float zoomSmoothTime = .25f) + { + SetZoomLevel(CameraZoomLevel.ZoomIn, zoomSmoothTime); + } + + [GroupDebug, Button(ButtonSizes.Medium, ButtonStyle.FoldoutButton)] + private void ZoomOut(float zoomSmoothTime = .25f) + { + SetZoomLevel(CameraZoomLevel.ZoomOut, zoomSmoothTime); + } + + private void SetZoomLevel( + CameraZoomLevel zoomLevel = CameraZoomLevel.None, + float zoomSmoothTime = .25f) + { + _zoomSmoothTime = Mathf.Max(0.01f, zoomSmoothTime); + _zoomCurrentVelocity = 0f; + + TargetOrthographicSize = zoomLevel switch + { + CameraZoomLevel.None => defaultOrthographicSize, + CameraZoomLevel.ZoomIn => zoomInOrthographicSize, + CameraZoomLevel.ZoomOut => zoomOutOrthographicSize, + _ => throw new ArgumentOutOfRangeException(nameof(zoomLevel), zoomLevel, null) + }; + } + + private void Update() + { + var lens = vcam.Lens; + + lens.OrthographicSize = Mathf.SmoothDamp( + lens.OrthographicSize, + TargetOrthographicSize, + ref _zoomCurrentVelocity, + _zoomSmoothTime, + Mathf.Infinity, + Time.deltaTime + ); + + vcam.Lens = lens; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs.meta b/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs.meta new file mode 100644 index 0000000..0f25775 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraFollowManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a30e490ac07e4c6982fa770e3cef253f +timeCreated: 1779864891 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs b/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs new file mode 100644 index 0000000..3bc4b9b --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs @@ -0,0 +1,44 @@ +using System.Collections.Generic; +using Intrepid.Core.Camera.Events; +using Intrepid.Core.Entities; +using Intrepid.Core.Tags; +using Intrepid.GameManagers; +using Intrepid.Utilities; +using UnityEngine; + +namespace Intrepid.Core.Camera +{ + public class CameraProximityTrigger : EntityTrigger + { + [GroupConfigurations, SerializeField, Range(.5f, 5f)] private float radius = 1.5f; + [GroupConfigurations, SerializeField] private CameraZoomLevel zoomLevel = CameraZoomLevel.ZoomIn; + [GroupConfigurations, SerializeField, Range(.05f, 3f)] private float enterZoomVelocity = .5f; + [GroupConfigurations, SerializeField, Range(.05f, 3f)] private float exitZoomVelocity = .5f; + + protected override void WhenRaiseEnterEvent(Collider other, EntitySensor entitySensor, List behaviourTags) + { + Proxy.Instance.EventBus.Raise(new CameraZoomEvent + { + ZoomLevel = zoomLevel, + ZoomVelocity = enterZoomVelocity + }); + } + + protected override void WhenRaiseExitEvent(Collider other, EntitySensor entitySensor) + { + Proxy.Instance.EventBus.Raise(new CameraZoomEvent + { + ZoomLevel = CameraZoomLevel.None, + ZoomVelocity = exitZoomVelocity + }); + } + +#if UNITY_EDITOR + private void OnDrawGizmos() + { + Gizmos.color = Color.yellow; + Gizmos.DrawWireSphere(transform.position, 2f * radius); + } +#endif + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs.meta b/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs.meta new file mode 100644 index 0000000..0a2054e --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraProximityTrigger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a682f23a07cd4cfcaca3f2b5bfed2ab5 +timeCreated: 1779865779 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs b/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs new file mode 100644 index 0000000..e4d9146 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs @@ -0,0 +1,9 @@ +namespace Intrepid.Core.Camera +{ + public enum CameraZoomLevel + { + None, + ZoomIn, + ZoomOut, + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs.meta b/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs.meta new file mode 100644 index 0000000..24609e5 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/CameraZoomLevel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a55325f141f9488db0f672f1566cfe43 +timeCreated: 1779865325 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs b/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs new file mode 100644 index 0000000..4b2c715 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs @@ -0,0 +1,10 @@ +using Intrepid.SimpleEvents; + +namespace Intrepid.Core.Camera.Events +{ + public class CameraZoomEvent : IEventBase + { + public CameraZoomLevel ZoomLevel { get; set; } + public float ZoomVelocity { get; set; } = .15f; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs.meta b/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs.meta new file mode 100644 index 0000000..990ebbd --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Camera/Events/CameraZoomEvent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8b77f9f8e10b42998ed3496dd5a020f7 +timeCreated: 1779864929 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Entities/Entity.cs b/Assets/Scripts/Intrepid/Core/Entities/Entity.cs index 7e40fac..eb524c9 100644 --- a/Assets/Scripts/Intrepid/Core/Entities/Entity.cs +++ b/Assets/Scripts/Intrepid/Core/Entities/Entity.cs @@ -9,9 +9,9 @@ namespace Intrepid.Core.Entities public abstract class Entity : Identification, IUpdatable { [GroupInjections, SerializeField] private EntityBrain brain; + [GroupInjections, SerializeField] private EntitySensor entitySensor; protected EntityBrain EntityBrain => brain; - protected EntityTag EntityTag => EntityBrain.EntityTag; protected void OnEnable() { diff --git a/Assets/Scripts/Intrepid/Core/Entities/EntityBrain.cs b/Assets/Scripts/Intrepid/Core/Entities/EntityBrain.cs index 30f8df8..4a7820a 100644 --- a/Assets/Scripts/Intrepid/Core/Entities/EntityBrain.cs +++ b/Assets/Scripts/Intrepid/Core/Entities/EntityBrain.cs @@ -1,4 +1,3 @@ -using Intrepid.Core.Tags; using Intrepid.Core.Updatable; using Intrepid.SimpleEvents; using Intrepid.Utilities; @@ -8,11 +7,9 @@ namespace Intrepid.Core.Entities { public abstract class EntityBrain : EventListener, IUpdatable { - [GroupIdentification, SerializeField] private EntityTag entityTag; [GroupInjections, SerializeField] private Entity rootEntity; public string Id => SubscriptionId; - public EntityTag EntityTag => entityTag; protected Entity RootEntity => rootEntity; public abstract void UpdateFromUpdatable(); diff --git a/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs b/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs new file mode 100644 index 0000000..d670d1c --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; +using System.Linq; +using Intrepid.Core.Tags; +using Intrepid.TagSystem; +using Intrepid.Utilities; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace Intrepid.Core.Entities +{ + [RequireComponent(typeof(SphereCollider))] + public class EntitySensor : AbstractTagBehaviour + { + [Title("I am a...")] + [GroupConfigurations, SerializeField] private EntityTag entityTag; + + public SphereCollider Collider { get; private set; } + public EntityTag EntityTag => entityTag; + public bool IsEnabled { get; private set; } + + private void Awake() + { + Collider = GetComponent(); + Collider.isTrigger = true; + IsEnabled = true; + } + + public bool ShouldBeTriggered(IEnumerable entitySensors, IEnumerable behaviourTags) + { + return entitySensors.Contains(EntityTag) && HasAnyTags(behaviourTags); + } + + public bool ShouldNotBeTriggered(IEnumerable entitySensors, IEnumerable behaviourTags) + { + return !ShouldBeTriggered(entitySensors, behaviourTags); + } + + public void Enable() + { + IsEnabled = true; + Collider.enabled = true; + } + + public void Disable() + { + IsEnabled = false; + Collider.enabled = false; + } + + public void ClearFilteringTags() + { + FilteringTags.Clear(); + } + + public void ActivateBehavioursOnly(IEnumerable tags) + { + FilteringTags.RemoveAll(tags.Contains); + } + + public void DeactivateBehavioursOnly(IEnumerable tags) + { + FilteringTags.AddRange(tags); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs.meta b/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs.meta new file mode 100644 index 0000000..ed152ab --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Entities/EntitySensor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c464392c6a5944d6805bcdbc8080bdd3 +timeCreated: 1779868810 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs b/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs new file mode 100644 index 0000000..f3ce132 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; +using Intrepid.Core.Tags; +using Intrepid.Utilities; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace Intrepid.Core.Entities +{ + public abstract class EntityTrigger : Identification + { + [GroupInjections, SerializeField] private Collider mainCollider; + [Title("Entity Sensors we are looking for")] + [GroupConfigurations, SerializeField, PropertySpace, PropertyOrder(10)] private List entitySensors; + [Title("The behaviour which at least one should be accepted")] + [GroupConfigurations, SerializeField, PropertySpace, PropertyOrder(11)] private List behaviourTags; + + protected Collider MainCollider => mainCollider; + protected bool IsEnabled { get; private set; } + + protected virtual void Awake() + { + MainCollider.isTrigger = true; + IsEnabled = true; + } + + protected void OnTriggerEnter(Collider other) + { + if (!other.gameObject.TryGetComponent(out var entitySensor)) return; + if (entitySensor.ShouldNotBeTriggered(entitySensors, behaviourTags)) return; + WhenRaiseEnterEvent(other, entitySensor, behaviourTags); + } + + protected void OnTriggerExit(Collider other) + { + if (!other.gameObject.TryGetComponent(out var entitySensor)) return; + if (entitySensor.ShouldNotBeTriggered(entitySensors, behaviourTags)) return; + WhenRaiseExitEvent(other, entitySensor); + } + + public virtual void Enable() + { + IsEnabled = true; + MainCollider.enabled = true; + } + + public virtual void Disable() + { + IsEnabled = false; + MainCollider.enabled = false; + } + + protected abstract void WhenRaiseEnterEvent(Collider other, EntitySensor entitySensor, List behaviourTags); + protected abstract void WhenRaiseExitEvent(Collider other, EntitySensor entitySensor); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs.meta b/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs.meta new file mode 100644 index 0000000..925762e --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Entities/EntityTrigger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 72825fb78e3241bea78b9ca551491f23 +timeCreated: 1779869029 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs b/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs new file mode 100644 index 0000000..5e0e3d2 --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs @@ -0,0 +1,12 @@ +using System; +using Intrepid.TagSystem; +using UnityEngine; + +namespace Intrepid.Core.Tags +{ + [Serializable] + [CreateAssetMenu(fileName = "New Behaviour Tag", menuName = "GON/Tag/Behaviour Tag")] + public class BehaviourTag : Tag + { + } +} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs.meta b/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs.meta new file mode 100644 index 0000000..177ff8b --- /dev/null +++ b/Assets/Scripts/Intrepid/Core/Tags/BehaviourTag.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ab2e7a683f584962a36a133a6ac88b4a +timeCreated: 1779868684 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Core/Tags/EntityTag.cs b/Assets/Scripts/Intrepid/Core/Tags/EntityTag.cs index f68a251..b665739 100644 --- a/Assets/Scripts/Intrepid/Core/Tags/EntityTag.cs +++ b/Assets/Scripts/Intrepid/Core/Tags/EntityTag.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Intrepid.Core.Tags { [Serializable] - [CreateAssetMenu(fileName = "Entity Tag", menuName = "Intrepid/Tag/Entity Tag")] + [CreateAssetMenu(fileName = "New Entity Tag", menuName = "GON/Tag/Entity Tag")] public class EntityTag : Tag { } diff --git a/Assets/Scripts/Intrepid/Core/Tags/SceneTag.cs b/Assets/Scripts/Intrepid/Core/Tags/SceneTag.cs index 9925ed8..16fe2e8 100644 --- a/Assets/Scripts/Intrepid/Core/Tags/SceneTag.cs +++ b/Assets/Scripts/Intrepid/Core/Tags/SceneTag.cs @@ -8,7 +8,7 @@ using UnityEngine.SceneManagement; namespace Intrepid.Core.Tags { [Serializable] - [CreateAssetMenu(fileName = "Scene Tag", menuName = "Intrepid/Tags/Scene Tag")] + [CreateAssetMenu(fileName = "New Scene Tag", menuName = "GON/Tags/Scene Tag")] public class SceneTag : Tag { public string SceneName => Code; diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs index fbb1724..938a017 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs @@ -5,7 +5,7 @@ using Intrepid.Integration.Input; namespace Intrepid.Gameplay.Entities.Sentinel { public class SentinelBrain : EntityBrain - { + { protected SentinelStateMachine StateMachine { get; private set; } public SentinelEntity Entity => RootEntity as SentinelEntity;