diff --git a/Assets/Prefabs/Node_1.prefab b/Assets/Prefabs/Node_1.prefab new file mode 100644 index 0000000..a459af2 --- /dev/null +++ b/Assets/Prefabs/Node_1.prefab @@ -0,0 +1,13 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 0} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Node_1.prefab.meta b/Assets/Prefabs/Node_1.prefab.meta new file mode 100644 index 0000000..1f453c3 --- /dev/null +++ b/Assets/Prefabs/Node_1.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f3ac2d6f98b5d14b9b49ad004510568 +timeCreated: 1439582583 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gab.meta b/Assets/Scenes/gab.meta new file mode 100644 index 0000000..d1a8792 --- /dev/null +++ b/Assets/Scenes/gab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e3b64e062cff77344b510dbbb76be08b +folderAsset: yes +timeCreated: 1439236349 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gab.unity b/Assets/Scenes/gab.unity index 06649c3..16e0328 100644 --- a/Assets/Scenes/gab.unity +++ b/Assets/Scenes/gab.unity @@ -96,6 +96,7 @@ GameObject: m_Component: - 4: {fileID: 50535969} - 114: {fileID: 50535970} + - 135: {fileID: 50535971} m_Layer: 0 m_Name: Node_1 (2) m_TagString: Untagged @@ -126,40 +127,62 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef5779c31ae1e344e918bafb5061a31e, type: 3} m_Name: m_EditorClassIdentifier: - n_up: {fileID: 0} + n_up: {fileID: 1854738419} n_left: {fileID: 1512651309} n_down: {fileID: 0} n_right: {fileID: 0} pos: {x: 0, y: 0, z: 0} ---- !u!1 &67271223 +--- !u!135 &50535971 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 50535968} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: .5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &75578067 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 67271224} + - 4: {fileID: 75578069} + - 114: {fileID: 75578068} m_Layer: 0 - m_Name: Circuit + m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &67271224 +--- !u!114 &75578068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75578067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58bf12fc7f7dfb9419306d55b94c77b6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &75578069 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 67271223} + m_GameObject: {fileID: 75578067} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -14.0600004, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1963152738} - - {fileID: 1374328510} + m_LocalPosition: {x: 0, y: .375, z: 0} + m_LocalScale: {x: .25, y: .25, z: .25} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 0 --- !u!1 &213357629 GameObject: m_ObjectHideFlags: 0 @@ -174,7 +197,7 @@ GameObject: - 114: {fileID: 213357636} m_Layer: 0 m_Name: Capsule - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,11 +253,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 213357629} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: .375, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: .25, y: .25, z: .25} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!114 &213357636 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,9 +266,12 @@ MonoBehaviour: m_GameObject: {fileID: 213357629} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b92a7b6a21a6394881aa93faa068fd1, type: 3} + m_Script: {fileID: 11500000, guid: bee059a115db707408e1a8a8214d1c4c, type: 3} m_Name: m_EditorClassIdentifier: + player: 1 + mm: {fileID: 75578068} + dir: 5 --- !u!1 &343502150 GameObject: m_ObjectHideFlags: 0 @@ -330,80 +356,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!1 &497304146 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 497304147} - - 33: {fileID: 497304150} - - 65: {fileID: 497304149} - - 23: {fileID: 497304148} - m_Layer: 0 - m_Name: Node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &497304147 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 497304146} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 0 ---- !u!23 &497304148 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 497304146} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &497304149 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 497304146} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &497304150 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 497304146} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_RootOrder: 2 --- !u!1 &536756530 GameObject: m_ObjectHideFlags: 0 @@ -433,79 +386,6 @@ Transform: - {fileID: 771859120} m_Father: {fileID: 0} m_RootOrder: 4 ---- !u!1 &755116967 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 755116968} - - 33: {fileID: 755116971} - - 65: {fileID: 755116970} - - 23: {fileID: 755116969} - m_Layer: 0 - m_Name: Node (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &755116968 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 755116967} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 0, z: 2} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 5 ---- !u!23 &755116969 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 755116967} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &755116970 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 755116967} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &755116971 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 755116967} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &771859119 GameObject: m_ObjectHideFlags: 0 @@ -536,81 +416,9 @@ Transform: - {fileID: 50535969} - {fileID: 934480447} - {fileID: 1512651308} + - {fileID: 1854738420} m_Father: {fileID: 536756531} m_RootOrder: 1 ---- !u!1 &777712382 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 777712383} - - 33: {fileID: 777712386} - - 65: {fileID: 777712385} - - 23: {fileID: 777712384} - m_Layer: 0 - m_Name: Node (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &777712383 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 777712382} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 0, z: -2} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 4 ---- !u!23 &777712384 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 777712382} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &777712385 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 777712382} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &777712386 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 777712382} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &904415276 GameObject: m_ObjectHideFlags: 0 @@ -620,6 +428,8 @@ GameObject: m_Component: - 4: {fileID: 904415277} - 114: {fileID: 904415278} + - 135: {fileID: 904415279} + - 135: {fileID: 904415280} m_Layer: 0 m_Name: Node_1 (1) m_TagString: Untagged @@ -655,6 +465,30 @@ MonoBehaviour: n_down: {fileID: 0} n_right: {fileID: 0} pos: {x: 0, y: 0, z: 0} +--- !u!135 &904415279 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 904415276} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: .5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &904415280 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 904415276} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: .5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &934480446 GameObject: m_ObjectHideFlags: 0 @@ -664,6 +498,7 @@ GameObject: m_Component: - 4: {fileID: 934480447} - 114: {fileID: 934480448} + - 135: {fileID: 934480449} m_Layer: 0 m_Name: Node_1 (3) m_TagString: Untagged @@ -699,258 +534,18 @@ MonoBehaviour: n_down: {fileID: 0} n_right: {fileID: 1512651309} pos: {x: 0, y: 0, z: 0} ---- !u!1 &1116155483 -GameObject: +--- !u!135 &934480449 +SphereCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1116155484} - - 33: {fileID: 1116155487} - - 65: {fileID: 1116155486} - - 23: {fileID: 1116155485} - m_Layer: 0 - m_Name: Node (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1116155484 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1116155483} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: -2} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 3 ---- !u!23 &1116155485 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1116155483} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1116155486 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1116155483} + m_GameObject: {fileID: 934480446} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1116155487 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1116155483} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1182091414 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1182091415} - - 33: {fileID: 1182091418} - - 65: {fileID: 1182091417} - - 23: {fileID: 1182091416} - m_Layer: 0 - m_Name: Node (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1182091415 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1182091414} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 2} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 2 ---- !u!23 &1182091416 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1182091414} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1182091417 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1182091414} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1182091418 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1182091414} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1370575701 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1370575702} - - 33: {fileID: 1370575705} - - 65: {fileID: 1370575704} - - 23: {fileID: 1370575703} - m_Layer: 0 - m_Name: Node (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1370575702 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1370575701} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 0} - m_LocalScale: {x: .25, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1963152738} - m_RootOrder: 1 ---- !u!23 &1370575703 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1370575701} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: d69a5d051f78e1e4bb139da129cb646d, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1370575704 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1370575701} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1370575705 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1370575701} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1374328509 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1374328510} - m_Layer: 0 - m_Name: Paths - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1374328510 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1374328509} - 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_Children: - - {fileID: 1919138083} - - {fileID: 1552565369} - - {fileID: 2000262663} - - {fileID: 1608274732} - - {fileID: 1974086886} - - {fileID: 2064453241} - m_Father: {fileID: 67271224} - m_RootOrder: 1 --- !u!1 &1512651307 GameObject: m_ObjectHideFlags: 0 @@ -960,6 +555,7 @@ GameObject: m_Component: - 4: {fileID: 1512651308} - 114: {fileID: 1512651309} + - 135: {fileID: 1512651310} m_Layer: 0 m_Name: Node_1 (4) m_TagString: Untagged @@ -995,79 +591,18 @@ MonoBehaviour: n_down: {fileID: 904415278} n_right: {fileID: 50535970} pos: {x: 0, y: 0, z: 0} ---- !u!1 &1552565368 -GameObject: +--- !u!135 &1512651310 +SphereCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1552565369} - - 33: {fileID: 1552565372} - - 65: {fileID: 1552565371} - - 23: {fileID: 1552565370} - m_Layer: 0 - m_Name: Path - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1552565369 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1552565368} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .5, y: 0, z: 0} - m_LocalScale: {x: .75, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 1 ---- !u!23 &1552565370 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1552565368} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1552565371 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1552565368} + m_GameObject: {fileID: 1512651307} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1552565372 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1552565368} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1582210631 GameObject: m_ObjectHideFlags: 0 @@ -1141,79 +676,63 @@ Transform: m_Children: [] m_Father: {fileID: 536756531} m_RootOrder: 0 ---- !u!1 &1608274731 +--- !u!1 &1854738418 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 1608274732} - - 33: {fileID: 1608274735} - - 65: {fileID: 1608274734} - - 23: {fileID: 1608274733} + - 4: {fileID: 1854738420} + - 114: {fileID: 1854738419} + - 135: {fileID: 1854738421} m_Layer: 0 - m_Name: Path (3) + m_Name: Node_1 (5) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1608274732 +--- !u!114 &1854738419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1854738418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef5779c31ae1e344e918bafb5061a31e, type: 3} + m_Name: + m_EditorClassIdentifier: + n_up: {fileID: 0} + n_left: {fileID: 1893547737} + n_down: {fileID: 50535970} + n_right: {fileID: 0} + pos: {x: 0, y: 0, z: 0} +--- !u!4 &1854738420 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1608274731} + m_GameObject: {fileID: 1854738418} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 0, z: 0} - m_LocalScale: {x: .25, y: .25, z: 3.75} + m_LocalPosition: {x: 3, y: 0, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 3 ---- !u!23 &1608274733 -MeshRenderer: + m_Father: {fileID: 771859120} + m_RootOrder: 5 +--- !u!135 &1854738421 +SphereCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1608274731} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1608274734 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1608274731} + m_GameObject: {fileID: 1854738418} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1608274735 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1608274731} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1893547735 GameObject: m_ObjectHideFlags: 0 @@ -1223,6 +742,7 @@ GameObject: m_Component: - 4: {fileID: 1893547736} - 114: {fileID: 1893547737} + - 135: {fileID: 1893547738} m_Layer: 0 m_Name: Node_1 m_TagString: Untagged @@ -1256,81 +776,20 @@ MonoBehaviour: n_up: {fileID: 0} n_left: {fileID: 0} n_down: {fileID: 1512651309} - n_right: {fileID: 0} + n_right: {fileID: 1854738419} pos: {x: 0, y: 0, z: 0} ---- !u!1 &1919138082 -GameObject: +--- !u!135 &1893547738 +SphereCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1919138083} - - 33: {fileID: 1919138086} - - 65: {fileID: 1919138085} - - 23: {fileID: 1919138084} - m_Layer: 0 - m_Name: Path (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1919138083 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1919138082} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 1} - m_LocalScale: {x: .25, y: .25, z: 1.75} - m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 0 ---- !u!23 &1919138084 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1919138082} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1919138085 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1919138082} + m_GameObject: {fileID: 1893547735} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1919138086 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1919138082} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1960553092 GameObject: m_ObjectHideFlags: 0 @@ -1390,256 +849,4 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 ---- !u!1 &1963152737 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1963152738} - m_Layer: 0 - m_Name: Nodes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1963152738 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1963152737} - 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_Children: - - {fileID: 497304147} - - {fileID: 1370575702} - - {fileID: 1182091415} - - {fileID: 1116155484} - - {fileID: 777712383} - - {fileID: 755116968} - m_Father: {fileID: 67271224} - m_RootOrder: 0 ---- !u!1 &1974086885 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1974086886} - - 33: {fileID: 1974086889} - - 65: {fileID: 1974086888} - - 23: {fileID: 1974086887} - m_Layer: 0 - m_Name: Path (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &1974086886 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974086885} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 0, z: -2} - m_LocalScale: {x: 1.75, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 4 ---- !u!23 &1974086887 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974086885} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1974086888 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974086885} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1974086889 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974086885} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2000262662 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 2000262663} - - 33: {fileID: 2000262666} - - 65: {fileID: 2000262665} - - 23: {fileID: 2000262664} - m_Layer: 0 - m_Name: Path (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &2000262663 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2000262662} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: -1} - m_LocalScale: {x: .25, y: .25, z: 1.75} - m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 2 ---- !u!23 &2000262664 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2000262662} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &2000262665 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2000262662} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &2000262666 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2000262662} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2064453240 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 2064453241} - - 33: {fileID: 2064453244} - - 65: {fileID: 2064453243} - - 23: {fileID: 2064453242} - m_Layer: 0 - m_Name: Path (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &2064453241 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2064453240} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 0, z: 2} - m_LocalScale: {x: 1.75, y: .25, z: .25} - m_Children: [] - m_Father: {fileID: 1374328510} - m_RootOrder: 5 ---- !u!23 &2064453242 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2064453240} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 2100000, guid: f9cd1c8a5acbe7242a6d91dd1e77f8ab, type: 2} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &2064453243 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2064453240} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &2064453244 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2064453240} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_RootOrder: 3 diff --git a/Assets/Scripts/CharacterMovement.cs b/Assets/Scripts/CharacterMovement.cs deleted file mode 100644 index af393dd..0000000 --- a/Assets/Scripts/CharacterMovement.cs +++ /dev/null @@ -1,32 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class CharacterMovement : MonoBehaviour { - - public int player; - - public MovementManager mm; - // code mis en commentaire par sam, raison : cannot convert from string to int (on ne pouvait pas compiler les scnènes dans unity sans mettre cette ligne en commentaire.) - //enum direction { up = "Up",down = "Down", left = "Left", right = "Right", stop = "Stop" }; - enum direction { up, down, left, right, stop}; - - - // Use this for initialization - void Start () { - - - - } - - // Update is called once per frame - void Update () { - - } - - public void UpdateDirection() - { - - - - } -} diff --git a/Assets/Scripts/CharacterMovement.cs.meta b/Assets/Scripts/CharacterMovement.cs.meta deleted file mode 100644 index fba6c5b..0000000 --- a/Assets/Scripts/CharacterMovement.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: bee059a115db707408e1a8a8214d1c4c -timeCreated: 1439332359 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/MovementManager.cs b/Assets/Scripts/MovementManager.cs index 88dffdd..00208e1 100644 --- a/Assets/Scripts/MovementManager.cs +++ b/Assets/Scripts/MovementManager.cs @@ -3,26 +3,50 @@ using System.Collections; using System.Collections.Generic; using System; +/** + * gere les inputs + * + * a placer sur les players +*/ + public class MovementManager : MonoBehaviour { - public Queue p1MovBuffer = new Queue(4); // Buffer de mouvement pour le player 1 - public Queue p2MovBuffer = new Queue(4); //Buffer de mouvement pour le player 2 + public Queue p1MovBuffer = new Queue(4); // Buffer de mouvement pour le player 1 + //public Queue p2MovBuffer = new Queue(4); //Buffer de mouvement pour le player 2 // Use this for initialization void Awake() { - p1MovBuffer.Enqueue("Stop"); - p2MovBuffer.Enqueue("Stop"); + + p1MovBuffer.Enqueue("Up"); + // p2MovBuffer.Enqueue("Up"); + + p1MovBuffer.Enqueue("Right"); + // p2MovBuffer.Enqueue("Right"); + + p1MovBuffer.Enqueue("Down"); + // p2MovBuffer.Enqueue("Down"); + + + } - // Update is called once per frame - void Update() + void Update() { + string[] test = p1MovBuffer.ToArray(); + + Debug.Log(test[0] + " " + test[1] + " " + test[2] + " " + test[3] + " "); + } + + void FixedUpdate() + { ReadMovement(); - Debug.Log(p1MovBuffer.Peek() + " " + p2MovBuffer.Peek()); + Debug.Log(p1MovBuffer.Peek()); + + Debug.Log(Input.GetAxisRaw("Vertical1")); } void ReadMovement() @@ -31,15 +55,15 @@ public class MovementManager : MonoBehaviour { p1MovBuffer.Enqueue("Up"); } - else if (Input.GetKeyDown(KeyCode.A)) + if (Input.GetKeyDown(KeyCode.A)) { p1MovBuffer.Enqueue("Left"); } - else if (Input.GetKeyDown(KeyCode.S)) + if (Input.GetKeyDown(KeyCode.S)) { p1MovBuffer.Enqueue("Down"); } - else if (Input.GetKeyDown(KeyCode.D)) + if (Input.GetKeyDown(KeyCode.D)) { p1MovBuffer.Enqueue("Right"); } @@ -48,39 +72,58 @@ public class MovementManager : MonoBehaviour { p1MovBuffer.Enqueue("Up"); } - else if (Input.GetKeyDown(KeyCode.J)) + if (Input.GetKeyDown(KeyCode.J)) { p1MovBuffer.Enqueue("Left"); } - else if (Input.GetKeyDown(KeyCode.K)) + if (Input.GetKeyDown(KeyCode.K)) { p1MovBuffer.Enqueue("Down"); } - else if (Input.GetKeyDown(KeyCode.L)) + if (Input.GetKeyDown(KeyCode.L)) { p1MovBuffer.Enqueue("Right"); } + + + // Debug.Log(p1MovBuffer.First.ToString() + " " + p2MovBuffer.First.ToString()); } - string getNextDirection(int playerID) + public string[] TransferBuffer(int playerId) { - try + /* switch (playerId) { - if (playerID == 1) - { - return p1MovBuffer.Dequeue(); - } - else if (playerID == 2) - { - return p2MovBuffer.Dequeue(); - } - }catch(InvalidOperationException exception) - { - Debug.LogError("Reached the end of the queue we stop by default!: " + exception); + case 1: - return "Stop"; - } - return null; + fillBuffWithEmpty(1, 4 - p1MovBuffer.Count); + return p1MovBuffer.ToArray(); + + case 2: + fillBuffWithEmpty(2, 4 - p2MovBuffer.Count); + return p2MovBuffer.ToArray(); + }*/ + + + fillBuffWithEmpty(1, 4 - p1MovBuffer.Count); + return p1MovBuffer.ToArray(); } + void fillBuffWithEmpty(int id, int num) + { + for (int u = 0; u < num; u++) + { + if(id == 1){ + p1MovBuffer.Enqueue("Stop"); + } + /* else if(id ==2){ + p2MovBuffer.Enqueue("Stop"); + }*/ + } + + } + + void ResetBuffer() + { + p1MovBuffer = new Queue(4); + } } diff --git a/Assets/Scripts/Node.cs b/Assets/Scripts/Node.cs index 8d2cbb6..743e940 100644 --- a/Assets/Scripts/Node.cs +++ b/Assets/Scripts/Node.cs @@ -8,6 +8,8 @@ public class Node : MonoBehaviour { public Node n_down; public Node n_right; + SquadMovement validSquad; + public Vector3 pos; void Start() @@ -15,7 +17,7 @@ public class Node : MonoBehaviour { pos = gameObject.transform.position; } - + void OnDrawGizmosSelected() { if (n_up != null) { Gizmos.color = Color.red; @@ -32,4 +34,66 @@ public class Node : MonoBehaviour { } } + void OnTriggerEnter(Collider other) + { + if (other.tag == "VampirePlayer" || other.tag == "ZombiePlayer") + { + validSquad = other.GetComponent(); + Node newTarget = sendNextNode(validSquad.ChangeDirection()); + validSquad.changeTarget(newTarget); + Debug.Log((int)validSquad.dir); + } + } + + void OnTriggerExit(Collider other) + { + validSquad = null; + } + + public Node sendNextNode(int direction) + { + switch (direction) + { + case 1: //up + + if (n_up != null) + { + return n_up; + } + + break; + + case 2: //down + + if (n_down != null) + { + return n_down; + } + break; + + case 3: //left + + if (n_left != null) + { + return n_left; + } + break; + + case 4: //right + + if (n_right != null) + { + return n_right; + } + break; + + case 5: //stop + + //validSquad.UpdateDirection(); + return null; + } + + return null; + } + } diff --git a/Assets/Scripts/Node.cs.meta b/Assets/Scripts/Node.cs.meta index d00b157..76b0672 100644 --- a/Assets/Scripts/Node.cs.meta +++ b/Assets/Scripts/Node.cs.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: ef5779c31ae1e344e918bafb5061a31e -timeCreated: 1439240437 +timeCreated: 1439498965 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Path.cs b/Assets/Scripts/Path.cs deleted file mode 100644 index 0ff273e..0000000 --- a/Assets/Scripts/Path.cs +++ /dev/null @@ -1,24 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class Path{ - - Node start; - Node end; - - public Path(Node start,Node end){ - this.start = start; - this.end = end; - - //TODO fonction de points - - } - - - Vector3 getNext() - { - - return Vector3.one; - } - -} diff --git a/Assets/Scripts/Path.cs.meta b/Assets/Scripts/Path.cs.meta deleted file mode 100644 index 48d0aa7..0000000 --- a/Assets/Scripts/Path.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b5515fca9c85963498137a7a41550f13 -timeCreated: 1439240491 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Pathfinding.cs b/Assets/Scripts/Pathfinding.cs deleted file mode 100644 index 41df019..0000000 --- a/Assets/Scripts/Pathfinding.cs +++ /dev/null @@ -1,20 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class Pathfinding : MonoBehaviour { - - public Transform target; - NavMeshAgent agent; - - // Use this for initialization - void Start () { - agent = GetComponent (); - } - - // Update is called once per frame - void Update () { - - agent.SetDestination (target.position); - - } -} diff --git a/Assets/Scripts/SquadMovement.cs b/Assets/Scripts/SquadMovement.cs new file mode 100644 index 0000000..e5c6d12 --- /dev/null +++ b/Assets/Scripts/SquadMovement.cs @@ -0,0 +1,103 @@ +using UnityEngine; +using System.Collections; +using System; +/** + * gere les deplacements des squads + * entre les nodes. + * + * a attacher aux squads + * + **/ + + +public class SquadMovement : MonoBehaviour { + + public float speed; + + String[] movementBuffer = new String[5]; + + int bufferIndex = 0; + + public enum direction : int { up = 1, down = 2, left = 3, right = 4, stop = 5 }; + public direction dir = direction.stop; + + public MovementManager mm; + + Node target; + + // Use this for initialization + void Start () { + movementBuffer[4] = "stop"; + + getNewBuffet(); + } + + // Update is called once per frame + void Update () { + if(target!=null) + { + + transform.position = Vector3.MoveTowards(transform.position, target.pos, speed); + + } + + + if (Input.GetKeyDown(KeyCode.Space)) + { + getNewBuffet(); + } + + } + + public void changeTarget(Node newTarget) + { + target = newTarget; + } + + public int ChangeDirection() + { + string newDir = movementBuffer[bufferIndex]; + + + if (newDir.ToLower().Equals("up")) + { + dir = direction.up; + } + else if (newDir.ToLower().Equals("down")) + { + dir = direction.down; + } + else if (newDir.ToLower().Equals("left")) + { + dir = direction.left; + } + else if (newDir.ToLower().Equals("right")) + { + dir = direction.right; + } + else //if (newDir.ToLower().Equals("stop") || newDir == null) + { + dir = direction.stop; + + } + + movementBuffer[bufferIndex] = "stop"; + + if (bufferIndex < 5) + { + bufferIndex++; + } + + return (int)dir; + } + + public void getNewBuffet() + { + string[] newBuffer = mm.TransferBuffer(0); + for (int i = 0; i < 4; i++) + { + movementBuffer[i] = newBuffer[i]; + } + + } +} diff --git a/Assets/Scripts/Pathfinding.cs.meta b/Assets/Scripts/SquadMovement.cs.meta similarity index 76% rename from Assets/Scripts/Pathfinding.cs.meta rename to Assets/Scripts/SquadMovement.cs.meta index 2ba5f60..6c7eb6f 100644 --- a/Assets/Scripts/Pathfinding.cs.meta +++ b/Assets/Scripts/SquadMovement.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0f200319be173a744b3096ba4d6a1673 -timeCreated: 1439238331 +guid: 2aef95dc5d20b9940b40da72e3a41995 +timeCreated: 1439574844 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2b82844..1110906 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -77,6 +77,7 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 + virtualRealitySupported: 0 productGUID: 54ead80470c104b4682c53a4f7f867b5 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 @@ -254,7 +255,6 @@ PlayerSettings: psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 psmSplashimage: {fileID: 0} - virtualRealitySupported: 0 spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: VZ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2a285eb..8c353d8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.0f3 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0