From 523a4c69a5b425be5a8ce259e60b5c12dca44533 Mon Sep 17 00:00:00 2001 From: MB Date: Sat, 26 Jan 2019 17:29:29 +1100 Subject: [PATCH 1/2] Updated character movement, set up for MP --- Assets/Prefabs/Artifact.prefab | 99 ++ Assets/Prefabs/Artifact.prefab.meta | 8 + Assets/Prefabs/RealLocalPlayer.prefab | 13 - Assets/Prefabs/dummyFloor.prefab | 100 ++ Assets/Prefabs/dummyFloor.prefab.meta | 8 + Assets/Scenes/MainScene.unity | 1116 +++++++++++++++++++++- Assets/Scipts/CharacterMovement.cs | 9 +- Assets/Scipts/GameMode.cs | 6 +- Assets/SpiritBall.meta | 8 + Assets/SpiritBall/New Material.mat | 77 ++ Assets/SpiritBall/New Material.mat.meta | 8 + Assets/SpiritBall/SpiritBall.prefab | 165 ++++ Assets/SpiritBall/SpiritBall.prefab.meta | 8 + 13 files changed, 1579 insertions(+), 46 deletions(-) create mode 100644 Assets/Prefabs/Artifact.prefab create mode 100644 Assets/Prefabs/Artifact.prefab.meta create mode 100644 Assets/Prefabs/dummyFloor.prefab create mode 100644 Assets/Prefabs/dummyFloor.prefab.meta create mode 100644 Assets/SpiritBall.meta create mode 100644 Assets/SpiritBall/New Material.mat create mode 100644 Assets/SpiritBall/New Material.mat.meta create mode 100644 Assets/SpiritBall/SpiritBall.prefab create mode 100644 Assets/SpiritBall/SpiritBall.prefab.meta diff --git a/Assets/Prefabs/Artifact.prefab b/Assets/Prefabs/Artifact.prefab new file mode 100644 index 0000000..27cd19e --- /dev/null +++ b/Assets/Prefabs/Artifact.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1764259581180914} + m_IsPrefabAsset: 1 +--- !u!1 &1764259581180914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4784427277199750} + - component: {fileID: 33120997048387714} + - component: {fileID: 23850162417573716} + - component: {fileID: 136760642014207312} + m_Layer: 0 + m_Name: Artifact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4784427277199750 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1764259581180914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 29.195435, y: 79.46745, z: -54.61373} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23850162417573716 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1764259581180914} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33120997048387714 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1764259581180914} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!136 &136760642014207312 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1764259581180914} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Artifact.prefab.meta b/Assets/Prefabs/Artifact.prefab.meta new file mode 100644 index 0000000..695122a --- /dev/null +++ b/Assets/Prefabs/Artifact.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 052dd7263458ca946b48b08ee2f36654 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/RealLocalPlayer.prefab b/Assets/Prefabs/RealLocalPlayer.prefab index fe3156d..8a6403f 100644 --- a/Assets/Prefabs/RealLocalPlayer.prefab +++ b/Assets/Prefabs/RealLocalPlayer.prefab @@ -36,7 +36,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4713031430525266} - - component: {fileID: 114474640838061042} - component: {fileID: 114470274098260950} - component: {fileID: 114874876091907484} m_Layer: 0 @@ -221,18 +220,6 @@ MonoBehaviour: heldVeggie: Name: Image: {fileID: 0} ---- !u!114 &114474640838061042 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1067952265812482} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23d333a191cbbeb45bcbb229fd3d4f06, type: 3} - m_Name: - m_EditorClassIdentifier: - Speed: 0 --- !u!114 &114874876091907484 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/dummyFloor.prefab b/Assets/Prefabs/dummyFloor.prefab new file mode 100644 index 0000000..0a584b2 --- /dev/null +++ b/Assets/Prefabs/dummyFloor.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1078541982408044} + m_IsPrefabAsset: 1 +--- !u!1 &1078541982408044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4200043227978498} + - component: {fileID: 33719798692597494} + - component: {fileID: 23443777714297938} + - component: {fileID: 64988551033502948} + m_Layer: 0 + m_Name: dummyFloor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4200043227978498 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1078541982408044} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23443777714297938 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1078541982408044} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33719798692597494 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1078541982408044} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64988551033502948 +MeshCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1078541982408044} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/dummyFloor.prefab.meta b/Assets/Prefabs/dummyFloor.prefab.meta new file mode 100644 index 0000000..7039ad3 --- /dev/null +++ b/Assets/Prefabs/dummyFloor.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0911dcd519793448ad6aa371b3f574b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 2acbff9..8aadc57 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -113,6 +113,67 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &20788387 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 149 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (15) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &20788388 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 20788387} +--- !u!1 &20788389 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 20788387} --- !u!1 &35195568 GameObject: m_ObjectHideFlags: 0 @@ -145,9 +206,9 @@ RectTransform: m_Father: {fileID: 1266934409} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 272, y: 192} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -128, y: -58} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &35195570 @@ -236,6 +297,67 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 35195568} m_CullTransparentMesh: 0 +--- !u!1001 &48891236 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -51 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (4) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &48891237 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 48891236} +--- !u!1 &48891238 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 48891236} --- !u!1 &73397751 GameObject: m_ObjectHideFlags: 0 @@ -305,6 +427,67 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!1001 &80095651 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (9) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &80095652 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 80095651} +--- !u!1 &80095653 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 80095651} --- !u!1 &191822287 GameObject: m_ObjectHideFlags: 0 @@ -412,7 +595,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 340012155} m_MethodName: MoveLeft m_Mode: 1 m_Arguments: @@ -491,8 +674,8 @@ RectTransform: m_Father: {fileID: 2000861316} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 302, y: 207} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} @@ -582,6 +765,67 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 252633541} m_CullTransparentMesh: 0 +--- !u!1001 &261548423 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -151 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (3) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &261548424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 261548423} +--- !u!1 &261548425 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 261548423} --- !u!1 &264010774 GameObject: m_ObjectHideFlags: 0 @@ -610,9 +854,9 @@ RectTransform: m_Father: {fileID: 1266934409} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 166} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -84} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &274218296 @@ -928,6 +1172,7 @@ GameObject: - component: {fileID: 340012149} - component: {fileID: 340012151} - component: {fileID: 340012152} + - component: {fileID: 340012155} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -976,14 +1221,44 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LocalPlayer: {fileID: 0} - Tiles: [] - Landmarks: [] - MapGrid: [] - WorldWrapGrid: [] - minX: -50 - maxX: 50 - minZ: -50 - maxZ: 50 + Tiles: + - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + Landmarks: + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + MapGrid: + - {fileID: 80095653} + - {fileID: 998748584} + - {fileID: 1525589193} + - {fileID: 1867518913} + WorldWrapGrid: + - {fileID: 597152929} + - {fileID: 762462614} + - {fileID: 1266121958} + - {fileID: 20788389} + - {fileID: 426260106} + - {fileID: 1273455716} + - {fileID: 48891238} + - {fileID: 1767675317} + - {fileID: 490765257} + - {fileID: 1330873966} + - {fileID: 1622461987} + - {fileID: 261548425} + minX: -80 + maxX: 80 + minZ: -80 + maxZ: 80 --- !u!114 &340012152 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1049,8 +1324,21 @@ MonoBehaviour: type: 2} RemotePlayerPrefab: {fileID: 1899238032005644, guid: 35b69a93d1dd9c24fbf2ba57dfc4aafb, type: 2} - mapTop: {x: 10, y: 1, z: 10} - mapBot: {x: -10, y: 1, z: -10} + mapTop: {x: 80, y: 1, z: 80} + mapBot: {x: -80, y: 1, z: -80} +--- !u!114 &340012155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 340012148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23d333a191cbbeb45bcbb229fd3d4f06, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 5 + localPlayer: {fileID: 0} --- !u!1 &426060142 GameObject: m_ObjectHideFlags: 0 @@ -1113,6 +1401,124 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &426260104 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (8) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &426260105 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 426260104} +--- !u!1 &426260106 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 426260104} +--- !u!1001 &490765255 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -151 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &490765256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 490765255} +--- !u!1 &490765257 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 490765255} --- !u!1 &595369010 GameObject: m_ObjectHideFlags: 0 @@ -1188,7 +1594,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 340012155} m_MethodName: MoveRight m_Mode: 1 m_Arguments: @@ -1235,6 +1641,67 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 595369010} m_CullTransparentMesh: 0 +--- !u!1001 &597152927 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 149 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (12) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &597152928 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 597152927} +--- !u!1 &597152929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 597152927} --- !u!1 &638241847 GameObject: m_ObjectHideFlags: 0 @@ -1382,6 +1849,67 @@ Transform: m_Father: {fileID: 191822288} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1001 &762462612 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 149 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (13) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &762462613 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 762462612} +--- !u!1 &762462614 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 762462612} --- !u!1 &791470959 GameObject: m_ObjectHideFlags: 0 @@ -1928,6 +2456,67 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &998748582 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (10) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &998748583 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 998748582} +--- !u!1 &998748584 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 998748582} --- !u!1 &1001341747 GameObject: m_ObjectHideFlags: 0 @@ -2029,9 +2618,9 @@ RectTransform: m_Father: {fileID: 1266934409} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 274, y: -141} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -126, y: 109} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1039419385 @@ -2355,7 +2944,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 340012155} m_MethodName: MoveDown m_Mode: 1 m_Arguments: @@ -2479,6 +3068,67 @@ Transform: m_Father: {fileID: 191822288} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1001 &1266121956 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 149 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (14) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1266121957 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1266121956} +--- !u!1 &1266121958 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1266121956} --- !u!1 &1266934408 GameObject: m_ObjectHideFlags: 0 @@ -2577,6 +3227,67 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &1273455714 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (11) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1273455715 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1273455714} +--- !u!1 &1273455716 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1273455714} --- !u!1 &1293333579 GameObject: m_ObjectHideFlags: 0 @@ -2646,6 +3357,67 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!1001 &1330873964 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -151 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (1) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1330873965 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1330873964} +--- !u!1 &1330873966 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1330873964} --- !u!1 &1465134982 GameObject: m_ObjectHideFlags: 0 @@ -2716,6 +3488,67 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1465134982} m_CullTransparentMesh: 0 +--- !u!1001 &1525589191 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -51 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (5) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1525589192 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1525589191} +--- !u!1 &1525589193 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1525589191} --- !u!1 &1584314061 GameObject: m_ObjectHideFlags: 0 @@ -2791,6 +3624,172 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1584314061} m_CullTransparentMesh: 0 +--- !u!1001 &1622461985 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -151 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (2) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1622461986 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1622461985} +--- !u!1 &1622461987 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1622461985} +--- !u!1 &1671521402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671521403} + m_Layer: 0 + m_Name: Floors + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1671521403 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671521402} + 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: 490765256} + - {fileID: 1330873965} + - {fileID: 1622461986} + - {fileID: 261548424} + - {fileID: 48891237} + - {fileID: 1525589192} + - {fileID: 1867518912} + - {fileID: 1767675316} + - {fileID: 426260105} + - {fileID: 80095652} + - {fileID: 998748583} + - {fileID: 1273455715} + - {fileID: 597152928} + - {fileID: 762462613} + - {fileID: 1266121957} + - {fileID: 20788388} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1767675315 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -51 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (7) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1767675316 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1767675315} +--- !u!1 &1767675317 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1767675315} --- !u!1 &1779215476 GameObject: m_ObjectHideFlags: 0 @@ -2939,6 +3938,67 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1791178145} m_CullTransparentMesh: 0 +--- !u!1001 &1867518911 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1671521403} + m_Modifications: + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalPosition.z + value: -51 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + propertyPath: m_Name + value: dummyFloor (6) + objectReference: {fileID: 0} + - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + m_IsPrefabAsset: 0 +--- !u!4 &1867518912 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1867518911} +--- !u!1 &1867518913 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, + type: 2} + m_PrefabInternal: {fileID: 1867518911} --- !u!1 &1908726377 GameObject: m_ObjectHideFlags: 0 @@ -3014,7 +4074,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 340012155} m_MethodName: MoveUp m_Mode: 1 m_Arguments: @@ -3242,9 +4302,9 @@ RectTransform: m_Father: {fileID: 1266934409} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -43, y: 175} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -43, y: -75} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2018855992 diff --git a/Assets/Scipts/CharacterMovement.cs b/Assets/Scipts/CharacterMovement.cs index d5d8a16..d1ca25d 100644 --- a/Assets/Scipts/CharacterMovement.cs +++ b/Assets/Scipts/CharacterMovement.cs @@ -5,25 +5,26 @@ using UnityEngine; public class CharacterMovement : MonoBehaviour { public float Speed; + public GameObject localPlayer; //Public movement functions :) public void MoveLeft() { - GetComponent().AddForce(new Vector3(-Speed, 0.0f, 0.0f)); + localPlayer.GetComponent().AddForce(new Vector3(-Speed, 0.0f, 0.0f)); } public void MoveRight() { - GetComponent().AddForce(new Vector3(Speed, 0.0f, 0.0f)); + localPlayer.GetComponent().AddForce(new Vector3(Speed, 0.0f, 0.0f)); } public void MoveUp() { - GetComponent().AddForce(new Vector3(0.0f, 0.0f, Speed)); + localPlayer.GetComponent().AddForce(new Vector3(0.0f, 0.0f, Speed)); } public void MoveDown() { - GetComponent().AddForce(new Vector3(0.0f, 0.0f, -Speed)); + localPlayer.GetComponent().AddForce(new Vector3(0.0f, 0.0f, -Speed)); } } diff --git a/Assets/Scipts/GameMode.cs b/Assets/Scipts/GameMode.cs index 66f578b..e457788 100644 --- a/Assets/Scipts/GameMode.cs +++ b/Assets/Scipts/GameMode.cs @@ -11,7 +11,11 @@ public class GameMode : MonoBehaviour { public float DistanceToWin; - + + private void Start() + { + // Player + } void Update() { diff --git a/Assets/SpiritBall.meta b/Assets/SpiritBall.meta new file mode 100644 index 0000000..d014e87 --- /dev/null +++ b/Assets/SpiritBall.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05b321d04dac0944aa93415c98819066 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpiritBall/New Material.mat b/Assets/SpiritBall/New Material.mat new file mode 100644 index 0000000..bb6798d --- /dev/null +++ b/Assets/SpiritBall/New Material.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0.77614975, b: 1, a: 0.69803923} + - _EmissionColor: {r: 0, g: 9.494952e+29, b: 9.494952e+29, a: 1} diff --git a/Assets/SpiritBall/New Material.mat.meta b/Assets/SpiritBall/New Material.mat.meta new file mode 100644 index 0000000..adf92d8 --- /dev/null +++ b/Assets/SpiritBall/New Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a2aa5eee455f94408e19eb6eadb667e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpiritBall/SpiritBall.prefab b/Assets/SpiritBall/SpiritBall.prefab new file mode 100644 index 0000000..937f457 --- /dev/null +++ b/Assets/SpiritBall/SpiritBall.prefab @@ -0,0 +1,165 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1249102293962904} + m_IsPrefabAsset: 1 +--- !u!1 &1249102293962904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4368395840088698} + - component: {fileID: 33473422529979386} + - component: {fileID: 23985327086753258} + - component: {fileID: 135089075041253096} + m_Layer: 0 + m_Name: SpiritBall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1701959113870576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4917913267246374} + - component: {fileID: 108039385181933194} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4368395840088698 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1249102293962904} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -59.62773, y: 57.87005, z: -81.292244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4917913267246374} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4917913267246374 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1701959113870576} + 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: [] + m_Father: {fileID: 4368395840088698} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23985327086753258 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1249102293962904} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 1a2aa5eee455f94408e19eb6eadb667e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33473422529979386 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1249102293962904} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!108 &108039385181933194 +Light: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1701959113870576} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 2 + m_Color: {r: 0, g: 0.7490196, b: 0.7490196, a: 1} + m_Intensity: 10 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!135 &135089075041253096 +SphereCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1249102293962904} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/SpiritBall/SpiritBall.prefab.meta b/Assets/SpiritBall/SpiritBall.prefab.meta new file mode 100644 index 0000000..50178ab --- /dev/null +++ b/Assets/SpiritBall/SpiritBall.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba9f947be14ade64e81cb6554a4899b0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: From 44b611a70ef798e269a4a112d2b115bbf060b302 Mon Sep 17 00:00:00 2001 From: MB Date: Sat, 26 Jan 2019 17:38:12 +1100 Subject: [PATCH 2/2] Hooked up lobby to game manager scripts --- Assets/Scipts/CharacterMovement.cs | 8 +++++++- Assets/Scipts/GameMode.cs | 9 +++++++-- Assets/Scipts/Map.cs | 4 +++- Assets/Scipts/Recipe.cs | 8 ++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Assets/Scipts/CharacterMovement.cs b/Assets/Scipts/CharacterMovement.cs index d1ca25d..32f4c36 100644 --- a/Assets/Scipts/CharacterMovement.cs +++ b/Assets/Scipts/CharacterMovement.cs @@ -5,7 +5,13 @@ using UnityEngine; public class CharacterMovement : MonoBehaviour { public float Speed; - public GameObject localPlayer; + GameObject localPlayer; + + private void Start() + { + localPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer; + } + //Public movement functions :) public void MoveLeft() diff --git a/Assets/Scipts/GameMode.cs b/Assets/Scipts/GameMode.cs index e457788..7b34379 100644 --- a/Assets/Scipts/GameMode.cs +++ b/Assets/Scipts/GameMode.cs @@ -7,14 +7,19 @@ public class GameMode : MonoBehaviour { //references to all players List Players = new List(); public Recipe recipe; - public GameObject LocalPlayer; + GameObject LocalPlayer; public float DistanceToWin; private void Start() { - // Player + LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer; + Players.Add(LocalPlayer); + foreach (GameObject curPlayer in Multiplayer.PlayersManager.Instance.RemotePlayers.Values) + { + Players.Add(curPlayer); + } } void Update() diff --git a/Assets/Scipts/Map.cs b/Assets/Scipts/Map.cs index 63eda29..daba4b4 100644 --- a/Assets/Scipts/Map.cs +++ b/Assets/Scipts/Map.cs @@ -4,7 +4,7 @@ using UnityEngine; public class Map : MonoBehaviour { - public GameObject LocalPlayer; + GameObject LocalPlayer; public GameObject[] Tiles; public List Landmarks; @@ -31,6 +31,8 @@ public class Map : MonoBehaviour { { //GenerateMap(); CreateDummys(); + LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer; + } //Create dummy players for the world wrapping diff --git a/Assets/Scipts/Recipe.cs b/Assets/Scipts/Recipe.cs index ba8aee7..0664835 100644 --- a/Assets/Scipts/Recipe.cs +++ b/Assets/Scipts/Recipe.cs @@ -7,7 +7,7 @@ using System; public class Recipe : MonoBehaviour { - public Player localPlayer; + Player localPlayer; int PlayerCount; public Vegetable[] Veggies; public Frame[] Frames; @@ -31,7 +31,11 @@ public class Recipe : MonoBehaviour { Frames[i].VegetableSpot.sprite = Veggies[i].Image; Frames[i].Qty.text = Qtys[i] + ""; } - } + localPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer.GetComponent(); + PlayerCount = Multiplayer.PlayersManager.Instance.RemotePlayers.Count + 1; + + + } //Button calls public void OpenRecipe()