From bd34106af18028a0c592ad087ea9bef7e0cbf6d5 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sat, 30 Jan 2016 20:08:24 -0500 Subject: [PATCH] Combine de board with the players and Ouija --- Assets/prefabs/SelectorWithBolts.prefab | 42 ++++++ Assets/scenes/PatScene.unity | 186 +++++++++++++----------- Assets/scripts/GameState.cs | 12 +- 3 files changed, 146 insertions(+), 94 deletions(-) diff --git a/Assets/prefabs/SelectorWithBolts.prefab b/Assets/prefabs/SelectorWithBolts.prefab index 2831abb..a2ec2af 100644 --- a/Assets/prefabs/SelectorWithBolts.prefab +++ b/Assets/prefabs/SelectorWithBolts.prefab @@ -764,6 +764,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &161610 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 423624} + - 136: {fileID: 13625710} + m_Layer: 0 + m_Name: GameObject + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &162206 GameObject: m_ObjectHideFlags: 1 @@ -1637,6 +1653,18 @@ Transform: m_Children: [] m_Father: {fileID: 402326} m_RootOrder: 8 +--- !u!4 &423624 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 161610} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: .200000003, y: .200000003, z: .200000003} + m_Children: [] + m_Father: {fileID: 447650} + m_RootOrder: 8 --- !u!4 &426322 Transform: m_ObjectHideFlags: 1 @@ -1823,6 +1851,7 @@ Transform: - {fileID: 489060} - {fileID: 470522} - {fileID: 417746} + - {fileID: 423624} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &448830 @@ -8047,6 +8076,19 @@ MonoBehaviour: - {fileID: 400966} - {fileID: 460868} - {fileID: 495602} +--- !u!136 &13625710 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 161610} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .970000029 + m_Height: 3.77999997 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!153 &15312058 ConfigurableJoint: m_ObjectHideFlags: 1 diff --git a/Assets/scenes/PatScene.unity b/Assets/scenes/PatScene.unity index 6050089..a9a57fb 100644 --- a/Assets/scenes/PatScene.unity +++ b/Assets/scenes/PatScene.unity @@ -145,6 +145,46 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1229110618} m_Script: {fileID: 11500000, guid: 0f36f7c8f7d8e03418efcbf2c3645cd8, type: 3} +--- !u!1 &867116874 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 867116876} + - 65: {fileID: 867116875} + m_Layer: 0 + m_Name: FloorCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &867116875 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 867116874} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 100, y: 1, z: 100} + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &867116876 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 867116874} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -.300000012, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 --- !u!54 &939277556 stripped Rigidbody: m_PrefabParentObject: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, @@ -237,7 +277,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1008797114} m_LocalRotation: {x: .484580696, y: 0, z: 0, w: .874746561} - m_LocalPosition: {x: 2.5999999, y: 13.8000002, z: -8.89999962} + m_LocalPosition: {x: 0, y: 13.8000002, z: -8.89999962} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -342,6 +382,49 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 9 +--- !u!1 &1173224166 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1173224168} + - 114: {fileID: 1173224167} + m_Layer: 0 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1173224167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1173224166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0659941834f628445b182d075f37a958, type: 3} + m_Name: + m_EditorClassIdentifier: + xScale: 3 + yScale: 3 + dimension: .680000007 + hexagon: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} +--- !u!4 &1173224168 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1173224166} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: -10.8299999, y: -0, z: -2.74000001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} m_RootOrder: 10 --- !u!1001 &1229110618 Prefab: @@ -1605,79 +1688,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} m_IsPrefabParent: 0 ---- !u!1 &2024085281 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 2024085285} - - 33: {fileID: 2024085284} - - 64: {fileID: 2024085283} - - 23: {fileID: 2024085282} - m_Layer: 0 - m_Name: Floor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &2024085282 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024085281} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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!64 &2024085283 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024085281} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &2024085284 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024085281} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &2024085285 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024085281} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5, y: 5, z: 5} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 --- !u!1001 &2031148190 Prefab: m_ObjectHideFlags: 0 @@ -1717,19 +1727,7 @@ Prefab: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 5989208, guid: 435740a68d38e76438007304b084ccf7, type: 2} - propertyPath: m_ConnectedBody - value: - objectReference: {fileID: 939277556} - - target: {fileID: 5956290, guid: 435740a68d38e76438007304b084ccf7, type: 2} - propertyPath: m_ConnectedBody - value: - objectReference: {fileID: 1719848916} - - target: {fileID: 5928330, guid: 435740a68d38e76438007304b084ccf7, type: 2} - propertyPath: m_ConnectedBody - value: - objectReference: {fileID: 1512572444} - - target: {fileID: 2370082, guid: 435740a68d38e76438007304b084ccf7, type: 2} + - target: {fileID: 2308356, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 8af19731d0d7f6c48bac51221c3ad914, type: 2} @@ -1737,10 +1735,22 @@ Prefab: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 8af19731d0d7f6c48bac51221c3ad914, type: 2} - - target: {fileID: 2308356, guid: 435740a68d38e76438007304b084ccf7, type: 2} + - target: {fileID: 2370082, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 8af19731d0d7f6c48bac51221c3ad914, type: 2} + - target: {fileID: 5928330, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: m_ConnectedBody + value: + objectReference: {fileID: 1512572444} + - target: {fileID: 5956290, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: m_ConnectedBody + value: + objectReference: {fileID: 1719848916} + - target: {fileID: 5989208, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: m_ConnectedBody + value: + objectReference: {fileID: 939277556} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 435740a68d38e76438007304b084ccf7, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/scripts/GameState.cs b/Assets/scripts/GameState.cs index 63c7e7a..2741605 100644 --- a/Assets/scripts/GameState.cs +++ b/Assets/scripts/GameState.cs @@ -1,6 +1,6 @@ -using UnityEngine; -using System.Collections; - +using UnityEngine; +using System.Collections; + public class GameState { private static GameState instance = new GameState(); @@ -10,7 +10,7 @@ public class GameState { public int numPlayers = 3; public int wordLength = 5; - public int numRows = 6; + public int numRows = 13; public int numColumns = 5; public Player[] players; @@ -21,5 +21,5 @@ public class GameState { { players[i] = new Player(i+1); } - } -} + } +}