From 83382e75fb816140a4191ca37b0dcfec9979c2f0 Mon Sep 17 00:00:00 2001 From: Rob Lang Date: Wed, 23 Aug 2017 09:43:42 +0100 Subject: [PATCH] Converted object into assets, added GameManager --- Assets/Prefabs.meta | 9 + Assets/Prefabs/Anticyclone.prefab | 127 ++++++++ Assets/Prefabs/Anticyclone.prefab.meta | 9 + Assets/Prefabs/Cloudship.prefab | 220 +++++++++++++ Assets/Prefabs/Cloudship.prefab.meta | 9 + Assets/Scenes/main.unity | 425 ++++++++----------------- Assets/Scripts/GameManager.cs | 16 + Assets/Scripts/GameManager.cs.meta | 12 + Assets/Scripts/PlayerController.cs | 11 +- 9 files changed, 541 insertions(+), 297 deletions(-) create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/Anticyclone.prefab create mode 100644 Assets/Prefabs/Anticyclone.prefab.meta create mode 100644 Assets/Prefabs/Cloudship.prefab create mode 100644 Assets/Prefabs/Cloudship.prefab.meta create mode 100644 Assets/Scripts/GameManager.cs create mode 100644 Assets/Scripts/GameManager.cs.meta diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..6e48b91 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b8e9194c53a20504785ff13d9d0bcec6 +folderAsset: yes +timeCreated: 1503476878 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Anticyclone.prefab b/Assets/Prefabs/Anticyclone.prefab new file mode 100644 index 0000000..19488ef --- /dev/null +++ b/Assets/Prefabs/Anticyclone.prefab @@ -0,0 +1,127 @@ +%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_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1144079346509390} + m_IsPrefabParent: 1 +--- !u!1 &1144079346509390 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4562654999839626} + - component: {fileID: 114511352423719916} + m_Layer: 0 + m_Name: Anticyclone + m_TagString: WeatherSystem + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1536789788005452 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4264140202816798} + - component: {fileID: 33404751190262678} + - component: {fileID: 23360675665739814} + m_Layer: 0 + m_Name: Disc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4264140202816798 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1536789788005452} + 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: 4562654999839626} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4562654999839626 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1144079346509390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.39, y: 0.372, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4264140202816798} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23360675665739814 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1536789788005452} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: ad30e0956801a3b40b914d88cebc0a55, 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: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 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 &33404751190262678 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1536789788005452} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &114511352423719916 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1144079346509390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b71fbbfe50926fa4cafcdeff771ec819, type: 3} + m_Name: + m_EditorClassIdentifier: + Diameter: 25 + PointOfBestSpeed: 0.7 + Speed: 10 + Disc: {fileID: 1536789788005452} diff --git a/Assets/Prefabs/Anticyclone.prefab.meta b/Assets/Prefabs/Anticyclone.prefab.meta new file mode 100644 index 0000000..3e2b8f2 --- /dev/null +++ b/Assets/Prefabs/Anticyclone.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 09cb3adbeac165f44a5de7b5101140b9 +timeCreated: 1503476911 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Cloudship.prefab b/Assets/Prefabs/Cloudship.prefab new file mode 100644 index 0000000..d4e5acc --- /dev/null +++ b/Assets/Prefabs/Cloudship.prefab @@ -0,0 +1,220 @@ +%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_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1432351309316322} + m_IsPrefabParent: 1 +--- !u!1 &1275241416657500 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4312340392071748} + - component: {fileID: 20175178893904176} + - component: {fileID: 92056205005586974} + - component: {fileID: 124327449349244490} + - component: {fileID: 81289516183465632} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1432351309316322 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4077828997907110} + - component: {fileID: 33835020259300398} + - component: {fileID: 23343728890206520} + - component: {fileID: 136954252957583926} + - component: {fileID: 54714144301063226} + - component: {fileID: 114218498763122706} + m_Layer: 8 + m_Name: Cloudship + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4077828997907110 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.59, y: 0.5, z: -2.14} + m_LocalScale: {x: 0.5, y: 0.02, z: 1} + m_Children: + - {fileID: 4312340392071748} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4312340392071748 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1275241416657500} + m_LocalRotation: {x: 0.10452846, y: -0, z: -0, w: 0.9945219} + m_LocalPosition: {x: 0, y: 25, z: -2} + m_LocalScale: {x: 2, y: 47.881874, z: 3.118137} + m_Children: [] + m_Father: {fileID: 4077828997907110} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 12, y: 0, z: 0} +--- !u!20 &20175178893904176 +Camera: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1275241416657500} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!23 &23343728890206520 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 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 &33835020259300398 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &54714144301063226 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0.1 + m_AngularDrag: 0.1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 0 +--- !u!81 &81289516183465632 +AudioListener: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1275241416657500} + m_Enabled: 1 +--- !u!92 &92056205005586974 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1275241416657500} + m_Enabled: 1 +--- !u!114 &114218498763122706 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3c16866670a624db6081dea131156d, type: 3} + m_Name: + m_EditorClassIdentifier: + thrust: 0 + turn: 0 + velocity: 0 + Speed: 12 + Torque: 2 + MaxVelocity: 0.4 +--- !u!124 &124327449349244490 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1275241416657500} + m_Enabled: 1 +--- !u!136 &136954252957583926 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1432351309316322} + 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/Cloudship.prefab.meta b/Assets/Prefabs/Cloudship.prefab.meta new file mode 100644 index 0000000..992c24e --- /dev/null +++ b/Assets/Prefabs/Cloudship.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c00a0010c86c86f4283b6e9c4c6aff5e +timeCreated: 1503476892 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index d7d402b..8554cef 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -187,51 +187,81 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &816895618 -GameObject: +--- !u!1001 &691912809 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 816895619} - - component: {fileID: 816895620} - m_Layer: 0 - m_Name: Anticyclone - m_TagString: WeatherSystem - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &816895619 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 816895618} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.39, y: 0.372, z: -2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1506401051} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &816895620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 816895618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b71fbbfe50926fa4cafcdeff771ec819, type: 3} - m_Name: - m_EditorClassIdentifier: - Diameter: 25 - PointOfBestSpeed: 0.7 - Speed: 10 - Disc: {fileID: 1506401047} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalPosition.x + value: 3.59 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalPosition.z + value: -2.14 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4077828997907110, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalPosition.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalPosition.z + value: -2.45 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.x + value: 0.1564345 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalRotation.w + value: 0.98768836 + objectReference: {fileID: 0} + - target: {fileID: 4312340392071748, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + propertyPath: m_LocalEulerAnglesHint.x + value: 18 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c00a0010c86c86f4283b6e9c4c6aff5e, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &816895618 stripped +GameObject: + m_PrefabParentObject: {fileID: 1144079346509390, guid: 09cb3adbeac165f44a5de7b5101140b9, + type: 2} + m_PrefabInternal: {fileID: 1988986127} --- !u!1 &1173164697 GameObject: m_ObjectHideFlags: 0 @@ -314,279 +344,86 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1197116391 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1197116395} - - component: {fileID: 1197116394} - - component: {fileID: 1197116392} - - component: {fileID: 1197116393} - - component: {fileID: 1197116396} - - component: {fileID: 1197116397} - m_Layer: 8 - m_Name: Cloudship - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1197116392 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 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!136 &1197116393 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} - 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} ---- !u!33 &1197116394 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1197116395 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 0.5, z: -2.14} - m_LocalScale: {x: 0.5, y: 0.02, z: 1} - m_Children: - - {fileID: 2023537110} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1197116396 -Rigidbody: +--- !u!1001 &1988986127 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} serializedVersion: 2 - m_Mass: 1 - m_Drag: 0.1 - m_AngularDrag: 0.1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 84 - m_CollisionDetection: 0 ---- !u!114 &1197116397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1197116391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b3c16866670a624db6081dea131156d, type: 3} - m_Name: - m_EditorClassIdentifier: - thrust: 0 - turn: 0 - velocity: 0 - Speed: 12 - Torque: 2 - MaxVelocity: 0.4 ---- !u!1 &1506401047 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalPosition.x + value: -8.39 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalPosition.y + value: 0.372 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4562654999839626, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 09cb3adbeac165f44a5de7b5101140b9, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &2111925490 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1506401051} - - component: {fileID: 1506401050} - - component: {fileID: 1506401048} + - component: {fileID: 2111925491} + - component: {fileID: 2111925492} m_Layer: 0 - m_Name: Disc + m_Name: GameManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!23 &1506401048 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1506401047} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: ad30e0956801a3b40b914d88cebc0a55, 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: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 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 &1506401050 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1506401047} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1506401051 +--- !u!4 &2111925491 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1506401047} + m_GameObject: {fileID: 2111925490} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -8.39, y: 0.37199998, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 816895619} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2023537105 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2023537110} - - component: {fileID: 2023537109} - - component: {fileID: 2023537108} - - component: {fileID: 2023537107} - - component: {fileID: 2023537106} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &2023537106 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2023537105} - m_Enabled: 1 ---- !u!124 &2023537107 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2023537105} - m_Enabled: 1 ---- !u!92 &2023537108 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2023537105} - m_Enabled: 1 ---- !u!20 &2023537109 -Camera: +--- !u!114 &2111925492 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2023537105} + m_GameObject: {fileID: 2111925490} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 ---- !u!4 &2023537110 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2023537105} - m_LocalRotation: {x: 0.10452846, y: -0, z: -0, w: 0.9945219} - m_LocalPosition: {x: 0, y: 25, z: -2} - m_LocalScale: {x: 2, y: 47.881874, z: 3.118137} - m_Children: [] - m_Father: {fileID: 1197116395} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 12, y: 0, z: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfbbd5b66a5e14449c7f913e88804d5, type: 3} + m_Name: + m_EditorClassIdentifier: + AnticyclonePrefab: {fileID: 816895618} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs new file mode 100644 index 0000000..8efc78e --- /dev/null +++ b/Assets/Scripts/GameManager.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameManager : MonoBehaviour { + + public GameObject AnticyclonePrefab; + + void Start () { + + } + + void Update () { + + } +} diff --git a/Assets/Scripts/GameManager.cs.meta b/Assets/Scripts/GameManager.cs.meta new file mode 100644 index 0000000..d6ca70e --- /dev/null +++ b/Assets/Scripts/GameManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 4bfbbd5b66a5e14449c7f913e88804d5 +timeCreated: 1503477046 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 8833d07..432f0b3 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -41,8 +41,13 @@ Vector3 GetCycloneForce() { var cyclones = GameObject.FindGameObjectsWithTag("WeatherSystem"); - // TODO ROLA - change this to sum for many when we have more than one - var single = cyclones[0].GetComponent(); - return single.GetForceFor(transform.position); + Vector3 sum = new Vector3(); + + foreach(var cyclone in cyclones) + { + sum += cyclone.GetComponent().GetForceFor(transform.position); + } + + return sum; } } \ No newline at end of file