From dd12a80c172c39769267163a0d6ced188f1e958e Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Mon, 11 Apr 2022 18:59:40 +0100 Subject: [PATCH 1/6] Fish moves - no rotation yet --- .../Fish - PolyPack/Prefabs/FishV1.prefab | 2 + Assets/Scenes/SampleScene.unity | 373 +++++++++++++++++- Assets/Scripts.meta | 8 + Assets/Scripts/FishController.cs | 52 +++ Assets/Scripts/FishController.cs.meta | 11 + Packages/manifest.json | 1 + Packages/packages-lock.json | 26 ++ 7 files changed, 456 insertions(+), 17 deletions(-) create mode 100644 Assets/Scripts.meta create mode 100644 Assets/Scripts/FishController.cs create mode 100644 Assets/Scripts/FishController.cs.meta diff --git a/Assets/Alstra Infinite/Fish - PolyPack/Prefabs/FishV1.prefab b/Assets/Alstra Infinite/Fish - PolyPack/Prefabs/FishV1.prefab index f7e9f3b..0e670bb 100644 --- a/Assets/Alstra Infinite/Fish - PolyPack/Prefabs/FishV1.prefab +++ b/Assets/Alstra Infinite/Fish - PolyPack/Prefabs/FishV1.prefab @@ -56,6 +56,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -80,6 +81,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &7317411005216613472 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 09f521b..fa87970 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.35872743, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,6 +123,25 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &50129750 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &50129752 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50129750} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &158817790 PrefabInstance: m_ObjectHideFlags: 0 @@ -136,7 +155,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} propertyPath: m_RootOrder - value: 5 + value: 9 objectReference: {fileID: 0} - target: {fileID: 400002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} propertyPath: m_LocalScale.x @@ -205,7 +224,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} propertyPath: m_RootOrder - value: 2 + value: 6 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} propertyPath: m_LocalScale.x @@ -261,6 +280,89 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} +--- !u!1 &311524101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311524104} + - component: {fileID: 311524103} + - component: {fileID: 311524102} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &311524102 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 +--- !u!20 &311524103 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + 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: 0 + 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_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &311524104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_LocalRotation: {x: 0.1227878, y: -0.6963643, z: 0.1227878, w: 0.6963643} + m_LocalPosition: {x: 1.09, y: 0.8, z: 0.05} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1244011693} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} --- !u!1001 &466409623 PrefabInstance: m_ObjectHideFlags: 0 @@ -274,7 +376,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} propertyPath: m_RootOrder - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} propertyPath: m_LocalScale.x @@ -330,6 +432,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} +--- !u!1 &644774474 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} + m_PrefabInstance: {fileID: 183934410} + m_PrefabAsset: {fileID: 0} +--- !u!64 &644774478 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644774474} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: db2ded63075b6cd41aaa7d8a85da232d, type: 3} --- !u!1 &657859099 GameObject: m_ObjectHideFlags: 0 @@ -360,7 +481,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 0 + m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &657859101 @@ -426,6 +547,25 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &660909674 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: da54b27642860c745b145c776f596680, type: 3} + m_PrefabInstance: {fileID: 1494505764} + m_PrefabAsset: {fileID: 0} +--- !u!64 &660909678 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660909674} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: c790654032b636346b57fc885244fd9c, type: 3} --- !u!1001 &714934316 PrefabInstance: m_ObjectHideFlags: 0 @@ -439,7 +579,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 400002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} propertyPath: m_LocalScale.x @@ -495,6 +635,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} +--- !u!1 &787294202 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} + m_PrefabInstance: {fileID: 466409623} + m_PrefabAsset: {fileID: 0} +--- !u!64 &787294206 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 787294202} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} --- !u!1001 &921036908 PrefabInstance: m_ObjectHideFlags: 0 @@ -508,7 +667,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} propertyPath: m_RootOrder - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} propertyPath: m_LocalScale.x @@ -564,6 +723,44 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} +--- !u!1 &983367103 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} + m_PrefabInstance: {fileID: 1683353984} + m_PrefabAsset: {fileID: 0} +--- !u!64 &983367107 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983367103} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} +--- !u!1 &1011048368 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1011048370 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011048368} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &1244011686 PrefabInstance: m_ObjectHideFlags: 0 @@ -577,7 +774,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.x @@ -585,7 +782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.y - value: 6.84 + value: 7.32 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.z @@ -593,7 +790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.x @@ -601,11 +798,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -613,14 +810,80 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} +--- !u!1 &1244011687 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 104517609856167801, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} + m_PrefabInstance: {fileID: 1244011686} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1244011688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244011687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 184b34bca7785c52e81be409a778c622, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 4 + gravity: -9.81 + velocity: {x: 0, y: 0, z: 0} + drag: {x: 0.1, y: 0.1, z: 0.1} +--- !u!143 &1244011689 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244011687} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 0.2647459 + m_Radius: 0.390984 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.26 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &1244011693 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} + m_PrefabInstance: {fileID: 1244011686} + m_PrefabAsset: {fileID: 0} +--- !u!1818360609 &1244011694 +RotationConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244011687} + m_Enabled: 1 + m_Weight: 1 + m_RotationAtRest: {x: 0, y: 0, z: 0} + m_RotationOffset: {x: 0, y: 0, z: 0} + m_AffectRotationX: 1 + m_AffectRotationY: 1 + m_AffectRotationZ: 1 + m_IsContraintActive: 1 + m_IsLocked: 1 + m_Sources: [] --- !u!1001 &1367772466 PrefabInstance: m_ObjectHideFlags: 0 @@ -634,7 +897,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} propertyPath: m_LocalScale.x @@ -690,6 +953,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c528509df862ef449544165d18b2dbf, type: 3} +--- !u!1 &1381846585 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} + m_PrefabInstance: {fileID: 1367772466} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1381846587 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381846585} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &1494505764 PrefabInstance: m_ObjectHideFlags: 0 @@ -759,6 +1041,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da54b27642860c745b145c776f596680, type: 3} +--- !u!1 &1566209036 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} + m_PrefabInstance: {fileID: 714934316} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1566209038 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566209036} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &1612247743 PrefabInstance: m_ObjectHideFlags: 0 @@ -772,7 +1073,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} propertyPath: m_RootOrder - value: 2 + value: 5 objectReference: {fileID: 0} - target: {fileID: 400010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} propertyPath: m_LocalScale.x @@ -828,6 +1129,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} +--- !u!1 &1636214929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1636214931 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636214929} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &1683353984 PrefabInstance: m_ObjectHideFlags: 0 @@ -910,7 +1230,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} propertyPath: m_RootOrder - value: 4 + value: 8 objectReference: {fileID: 0} - target: {fileID: 400016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} propertyPath: m_LocalScale.x @@ -966,3 +1286,22 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} +--- !u!1 &1904484677 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} + m_PrefabInstance: {fileID: 921036908} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1904484679 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1904484677} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..b97880e --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3553de772d72ad45aa887aaccfe43ac6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FishController.cs b/Assets/Scripts/FishController.cs new file mode 100644 index 0000000..f86f824 --- /dev/null +++ b/Assets/Scripts/FishController.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FishController : MonoBehaviour +{ + public float speed = 4f; + public float gravity = -9.81f; + public Vector3 velocity; + public Vector3 drag; + + CharacterController controller; + Transform t; + + void Start() + { + t = transform; + controller = GetComponent(); + } + + void Update() + { + float moveX = Input.GetAxisRaw("Horizontal"); + float moveZ = Input.GetAxisRaw("Vertical"); + float moveGravity = gravity * Time.deltaTime; + + if (controller.isGrounded && velocity.y < 0) + { + velocity.y = 0; + } + + if (Input.GetButtonDown("Jump") && controller.isGrounded) + { + velocity.y += 8; + } + + velocity.x = moveX * speed; + velocity.z = moveZ * speed; + velocity.y += moveGravity; + + Vector3 moveVelocity = velocity * Time.deltaTime; + + if (moveVelocity.y < 0 && Math.Abs(moveVelocity.y) < controller.minMoveDistance) + { + Debug.Log(String.Format("Abs velocity: {0}, controller.minMoveDistance: {1}", Math.Abs(moveVelocity.y), controller.minMoveDistance)); + moveVelocity.y = (gravity * 0.1f) * Time.deltaTime; + } + + controller.Move(moveVelocity); + } +} diff --git a/Assets/Scripts/FishController.cs.meta b/Assets/Scripts/FishController.cs.meta new file mode 100644 index 0000000..0dd034c --- /dev/null +++ b/Assets/Scripts/FishController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 184b34bca7785c52e81be409a778c622 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index ca8f76d..5d6e1e7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", + "com.unity.toolchain.linux-x86_64": "2.0.0", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 43727f8..0f04b9e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -50,6 +50,22 @@ }, "url": "https://packages.unity.com" }, + "com.unity.sysroot": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, @@ -82,6 +98,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.0", + "com.unity.sysroot.linux-x86_64": "2.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, From 917119d319d4a02b07d8848a205bae60748c84fa Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Mon, 11 Apr 2022 19:02:46 +0100 Subject: [PATCH 2/6] Make jump speed a public variable --- Assets/Scenes/SampleScene.unity | 2 +- Assets/Scripts/FishController.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index fa87970..664f0cc 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -840,7 +840,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 184b34bca7785c52e81be409a778c622, type: 3} m_Name: m_EditorClassIdentifier: - speed: 4 + speed: 5 gravity: -9.81 velocity: {x: 0, y: 0, z: 0} drag: {x: 0.1, y: 0.1, z: 0.1} diff --git a/Assets/Scripts/FishController.cs b/Assets/Scripts/FishController.cs index f86f824..451bc8d 100644 --- a/Assets/Scripts/FishController.cs +++ b/Assets/Scripts/FishController.cs @@ -7,6 +7,7 @@ public class FishController : MonoBehaviour { public float speed = 4f; public float gravity = -9.81f; + public float jumpSpeed = 8; public Vector3 velocity; public Vector3 drag; @@ -32,7 +33,7 @@ public class FishController : MonoBehaviour if (Input.GetButtonDown("Jump") && controller.isGrounded) { - velocity.y += 8; + velocity.y += jumpSpeed; } velocity.x = moveX * speed; @@ -43,7 +44,6 @@ public class FishController : MonoBehaviour if (moveVelocity.y < 0 && Math.Abs(moveVelocity.y) < controller.minMoveDistance) { - Debug.Log(String.Format("Abs velocity: {0}, controller.minMoveDistance: {1}", Math.Abs(moveVelocity.y), controller.minMoveDistance)); moveVelocity.y = (gravity * 0.1f) * Time.deltaTime; } From 340171cd06092ee8121126ab0df19de4b4a218a1 Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Mon, 11 Apr 2022 19:14:57 +0100 Subject: [PATCH 3/6] Add rotation --- Assets/Scenes/SampleScene.unity | 28 ++++++---------------------- Assets/Scripts/FishController.cs | 10 ++++++---- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 664f0cc..e3ee5f6 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -331,7 +331,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 + field of view: 48.4 orthographic: 0 orthographic size: 5 m_Depth: 0 @@ -356,13 +356,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 311524101} - m_LocalRotation: {x: 0.1227878, y: -0.6963643, z: 0.1227878, w: 0.6963643} - m_LocalPosition: {x: 1.09, y: 0.8, z: 0.05} + m_LocalRotation: {x: 0.11670625, y: -0.6974093, z: 0.11670625, w: 0.6974093} + m_LocalPosition: {x: 1.318, y: 0.836, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1244011693} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 19, y: -90, z: 0} --- !u!1001 &466409623 PrefabInstance: m_ObjectHideFlags: 0 @@ -842,6 +842,7 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 5 gravity: -9.81 + jumpSpeed: 8 velocity: {x: 0, y: 0, z: 0} drag: {x: 0.1, y: 0.1, z: 0.1} --- !u!143 &1244011689 @@ -859,7 +860,7 @@ CharacterController: m_Radius: 0.390984 m_SlopeLimit: 45 m_StepOffset: 0.3 - m_SkinWidth: 0.26 + m_SkinWidth: 0.06 m_MinMoveDistance: 0.001 m_Center: {x: 0, y: 0, z: 0} --- !u!4 &1244011693 stripped @@ -867,23 +868,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} m_PrefabInstance: {fileID: 1244011686} m_PrefabAsset: {fileID: 0} ---- !u!1818360609 &1244011694 -RotationConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1244011687} - m_Enabled: 1 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_AffectRotationX: 1 - m_AffectRotationY: 1 - m_AffectRotationZ: 1 - m_IsContraintActive: 1 - m_IsLocked: 1 - m_Sources: [] --- !u!1001 &1367772466 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FishController.cs b/Assets/Scripts/FishController.cs index 451bc8d..0c1d5f7 100644 --- a/Assets/Scripts/FishController.cs +++ b/Assets/Scripts/FishController.cs @@ -22,8 +22,8 @@ public class FishController : MonoBehaviour void Update() { - float moveX = Input.GetAxisRaw("Horizontal"); - float moveZ = Input.GetAxisRaw("Vertical"); + float moveX = 0 - Input.GetAxisRaw("Vertical"); + float moveZ = Input.GetAxisRaw("Horizontal"); float moveGravity = gravity * Time.deltaTime; if (controller.isGrounded && velocity.y < 0) @@ -37,9 +37,11 @@ public class FishController : MonoBehaviour } velocity.x = moveX * speed; - velocity.z = moveZ * speed; + // velocity.z = moveZ * speed; velocity.y += moveGravity; + transform.Rotate(0, moveZ, 0); + Vector3 moveVelocity = velocity * Time.deltaTime; if (moveVelocity.y < 0 && Math.Abs(moveVelocity.y) < controller.minMoveDistance) @@ -47,6 +49,6 @@ public class FishController : MonoBehaviour moveVelocity.y = (gravity * 0.1f) * Time.deltaTime; } - controller.Move(moveVelocity); + controller.Move(transform.rotation * moveVelocity); } } From 02fbba897c7fab08863ee65e7660088ee97a6ddc Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Mon, 11 Apr 2022 21:08:43 +0100 Subject: [PATCH 4/6] Better camera --- Assets/Scenes/SampleScene.unity | 214 +++++++++++++++++++++- Packages/manifest.json | 1 + Packages/packages-lock.json | 7 + ProjectSettings/EditorBuildSettings.asset | 5 +- 4 files changed, 217 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index e3ee5f6..3026ce6 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -291,6 +291,7 @@ GameObject: - component: {fileID: 311524104} - component: {fileID: 311524103} - component: {fileID: 311524102} + - component: {fileID: 311524105} m_Layer: 0 m_Name: Camera m_TagString: Untagged @@ -356,13 +357,47 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 311524101} - m_LocalRotation: {x: 0.11670625, y: -0.6974093, z: 0.11670625, w: 0.6974093} - m_LocalPosition: {x: 1.318, y: 0.836, z: 0} + m_LocalRotation: {x: 0.024976576, y: -0.0000000010750635, z: 2.6859787e-11, w: 0.999688} + m_LocalPosition: {x: -36.182, y: 7.7200003, z: 13.28} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1244011693} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 19, y: -90, z: 0} + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 32.315, z: 0} +--- !u!114 &311524105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &466409623 PrefabInstance: m_ObjectHideFlags: 0 @@ -742,6 +777,73 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} +--- !u!1 &997841853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 997841855} + - component: {fileID: 997841854} + m_Layer: 0 + m_Name: CM vcam1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &997841854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997841853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1244011693} + m_Follow: {fileID: 1244011693} + m_Lens: + FieldOfView: 48.4 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + LensShift: {x: 0, y: 0} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1638516161} +--- !u!4 &997841855 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997841853} + m_LocalRotation: {x: 0.024976576, y: -0.0000000010750635, z: 2.6859787e-11, w: 0.999688} + m_LocalPosition: {x: -36.182, y: 7.7200003, z: 13.28} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1638516161} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1011048368 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} @@ -760,7 +862,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_Mesh: {fileID: 4300000, guid: 7eb169ca98be6744db6423d236b0e90b, type: 3} --- !u!1001 &1244011686 PrefabInstance: m_ObjectHideFlags: 0 @@ -778,7 +880,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.x - value: -36.18 + value: -36.182 objectReference: {fileID: 0} - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.y @@ -1131,7 +1233,101 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_Mesh: {fileID: 4300000, guid: ac59d41bde6224c4089a0cfbf902d645, type: 3} +--- !u!1 &1638516160 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1638516161} + - component: {fileID: 1638516164} + - component: {fileID: 1638516162} + - component: {fileID: 1638516163} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1638516161 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638516160} + m_LocalRotation: {x: -0.254807, y: -0.2683065, z: 0.07382298, w: 0.92608595} + m_LocalPosition: {x: 38.787888, y: -3.1599126, z: 21.85574} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 997841855} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1638516162 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638516160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 2, y: 0.4, z: 0} + m_XDamping: 1 + m_YDamping: 0.2 + m_ZDamping: 0.2 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!114 &1638516163 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638516160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0.3, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1638516164 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638516160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1683353984 PrefabInstance: m_ObjectHideFlags: 0 @@ -1288,4 +1484,4 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_Mesh: {fileID: 4300000, guid: 6def73f8311645b47a2d3ae4d6afb91f, type: 3} diff --git a/Packages/manifest.json b/Packages/manifest.json index 5d6e1e7..95cb756 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.cinemachine": "2.6.11", "com.unity.collab-proxy": "1.15.15", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.14", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0f04b9e..09f8b8c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.unity.cinemachine": { + "version": "2.6.11", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "1.15.15", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..40917b0 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/SampleScene.unity + guid: 9fc0d4010bbf28b4594072e72b8655ab m_configObjects: {} From 2abf9c062c5a1b0bc200f7308b4de2636075fe19 Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Tue, 12 Apr 2022 14:43:28 +0100 Subject: [PATCH 5/6] Add meshes to things --- Assets/Scenes/FirstLevel.unity | 1361 ++++++++++++++++++++++---------- 1 file changed, 951 insertions(+), 410 deletions(-) diff --git a/Assets/Scenes/FirstLevel.unity b/Assets/Scenes/FirstLevel.unity index 0da909a..8b1a0f3 100644 --- a/Assets/Scenes/FirstLevel.unity +++ b/Assets/Scenes/FirstLevel.unity @@ -192,6 +192,44 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} +--- !u!1 &19396953 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100012, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &19396957 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19396953} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: 0cd7a7c221fea2f449a3fe6027a20675, type: 3} +--- !u!1 &50129750 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &50129752 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50129750} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1 &60553594 GameObject: m_ObjectHideFlags: 0 @@ -287,6 +325,44 @@ Transform: m_Father: {fileID: 918403605} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: -270.026, z: 0} +--- !u!1 &114852061 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100014, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &114852065 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114852061} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} +--- !u!1 &118034012 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100008, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &118034016 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118034012} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300014, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} --- !u!1 &133609018 GameObject: m_ObjectHideFlags: 0 @@ -382,26 +458,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133609018} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &50129750 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100010, guid: dce57d1e50d1fef489ee2d0fe5716701, - type: 3} - m_PrefabInstance: {fileID: 1612247743} - m_PrefabAsset: {fileID: 0} ---- !u!64 &50129752 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 50129750} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} --- !u!1001 &158817790 PrefabInstance: m_ObjectHideFlags: 0 @@ -417,10 +473,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 13 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 400002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} propertyPath: m_LocalScale.x value: 5 @@ -475,6 +527,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} +--- !u!1 &178646049 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100006, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &178646053 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 178646049} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: 0cd7a7c221fea2f449a3fe6027a20675, type: 3} --- !u!1001 &183934410 PrefabInstance: m_ObjectHideFlags: 0 @@ -490,10 +561,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} propertyPath: m_LocalScale.x value: 0.2032 @@ -578,8 +645,164 @@ Transform: - {fileID: 467465262} - {fileID: 657859103} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &311524101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311524104} + - component: {fileID: 311524103} + - component: {fileID: 311524102} + - component: {fileID: 311524105} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &311524102 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 +--- !u!20 &311524103 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 48.4 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + 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_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &311524104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -32.31, y: 7.82, z: 8.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 32.315, z: 0} +--- !u!114 &311524105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311524101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &315847850 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 114664, guid: 65b6f096056a3644389b3bda6c9e8a80, type: 3} + m_PrefabInstance: {fileID: 1037917862} + m_PrefabAsset: {fileID: 0} +--- !u!64 &315847854 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 315847850} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 93b7804c0d2944540afe34ed14ff76d7, type: 3} +--- !u!1 &326017970 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100014, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &326017974 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 326017970} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} --- !u!1001 &329487747 PrefabInstance: m_ObjectHideFlags: 0 @@ -593,7 +816,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalScale.x @@ -621,19 +844,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -645,7 +868,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400022, guid: 47af50246352ed14da4ade618d736175, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 180 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47af50246352ed14da4ade618d736175, type: 3} @@ -744,124 +967,6 @@ Transform: m_Father: {fileID: 918403605} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: -270.026, z: 0} ---- !u!1 &311524101 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 311524104} - - component: {fileID: 311524103} - - component: {fileID: 311524102} - - component: {fileID: 311524105} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &311524102 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311524101} - m_Enabled: 1 ---- !u!20 &311524103 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311524101} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 48.4 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - 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_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &311524104 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311524101} - m_LocalRotation: {x: 0.024976576, y: -0.0000000010750635, z: 2.6859787e-11, w: 0.999688} - m_LocalPosition: {x: -36.182, y: 7.7200003, z: 13.28} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 32.315, z: 0} ---- !u!114 &311524105 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311524101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] --- !u!1001 &466409623 PrefabInstance: m_ObjectHideFlags: 0 @@ -877,10 +982,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 14 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} propertyPath: m_LocalScale.x value: 0.2032 @@ -1031,6 +1132,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467465261} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &520910946 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100014, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &520910950 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520910946} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: 2053965ddb261d94391546f869ad45c6, type: 3} +--- !u!1 &644774474 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 969e14f1112395b4b816c3c2606022bf, type: 3} + m_PrefabInstance: {fileID: 183934410} + m_PrefabAsset: {fileID: 0} +--- !u!64 &644774478 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644774474} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: db2ded63075b6cd41aaa7d8a85da232d, type: 3} --- !u!1 &646499102 GameObject: m_ObjectHideFlags: 0 @@ -1126,26 +1265,6 @@ Transform: m_Father: {fileID: 918403605} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: -270.026, z: 0} ---- !u!1 &644774474 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 969e14f1112395b4b816c3c2606022bf, - type: 3} - m_PrefabInstance: {fileID: 183934410} - m_PrefabAsset: {fileID: 0} ---- !u!64 &644774478 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644774474} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: db2ded63075b6cd41aaa7d8a85da232d, type: 3} --- !u!1 &657859099 GameObject: m_ObjectHideFlags: 0 @@ -1244,8 +1363,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &660909674 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: da54b27642860c745b145c776f596680, - type: 3} + m_CorrespondingSourceObject: {fileID: 100000, guid: da54b27642860c745b145c776f596680, type: 3} m_PrefabInstance: {fileID: 1494505764} m_PrefabAsset: {fileID: 0} --- !u!64 &660909678 @@ -1275,11 +1393,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} - propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 400002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} propertyPath: m_LocalScale.x @@ -1335,6 +1449,120 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} +--- !u!1 &787294202 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} + m_PrefabInstance: {fileID: 466409623} + m_PrefabAsset: {fileID: 0} +--- !u!64 &787294206 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 787294202} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} +--- !u!1 &788578372 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100006, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &788578376 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788578372} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} +--- !u!1 &826153179 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100006, guid: f47c3332cc1e27e429e62f14a27f814d, type: 3} + m_PrefabInstance: {fileID: 1186497108} + m_PrefabAsset: {fileID: 0} +--- !u!64 &826153183 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826153179} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 55b6504ee3e22e44f81ec10519df607d, type: 3} +--- !u!1 &831278019 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} + m_PrefabInstance: {fileID: 921036908} + m_PrefabAsset: {fileID: 0} +--- !u!64 &831278023 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831278019} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 7cd4ce41d004a7c4f9fda3a3ae2e9bf3, type: 3} +--- !u!1 &835379305 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100026, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &835379309 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835379305} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300018, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} +--- !u!1 &913353220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100010, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &913353224 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913353220} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300006, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} --- !u!1 &918403604 GameObject: m_ObjectHideFlags: 0 @@ -1376,28 +1604,27 @@ Transform: - {fileID: 2138405806} - {fileID: 60553598} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &787294202 stripped +--- !u!1 &919152125 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, - type: 3} - m_PrefabInstance: {fileID: 466409623} + m_CorrespondingSourceObject: {fileID: 100006, guid: ae4a04ebba3b51f4bb3a2c49687f5621, type: 3} + m_PrefabInstance: {fileID: 2078976655} m_PrefabAsset: {fileID: 0} ---- !u!64 &787294206 +--- !u!64 &919152129 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 787294202} + m_GameObject: {fileID: 919152125} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} + m_Mesh: {fileID: 4300002, guid: f6d2bef1bd916964595eabb8b09a0e98, type: 3} --- !u!1001 &921036908 PrefabInstance: m_ObjectHideFlags: 0 @@ -1413,10 +1640,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 11 objectReference: {fileID: 0} - - target: {fileID: 400004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 400004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} propertyPath: m_LocalScale.x value: 11 @@ -1471,6 +1694,168 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} +--- !u!1 &925856235 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100024, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &925856239 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 925856235} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300016, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} +--- !u!1 &983367103 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} + m_PrefabInstance: {fileID: 1683353984} + m_PrefabAsset: {fileID: 0} +--- !u!64 &983367107 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983367103} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} +--- !u!1 &993965662 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, type: 3} + m_PrefabInstance: {fileID: 7271338} + m_PrefabAsset: {fileID: 0} +--- !u!64 &993965666 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993965662} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} +--- !u!1 &997841853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 997841855} + - component: {fileID: 997841854} + m_Layer: 0 + m_Name: CM vcam1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &997841854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997841853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1244011693} + m_Follow: {fileID: 1244011693} + m_Lens: + FieldOfView: 48.4 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + LensShift: {x: 0, y: 0} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1638516161} +--- !u!4 &997841855 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997841853} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -32.31, y: 7.82, z: 8.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1638516161} + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1011048368 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1011048370 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011048368} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 7eb169ca98be6744db6423d236b0e90b, type: 3} +--- !u!1 &1021168634 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} + m_PrefabInstance: {fileID: 1389905653} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1021168638 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021168634} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: a23adc725dbf4564c9a748e2d6719d65, type: 3} --- !u!1 &1021470533 GameObject: m_ObjectHideFlags: 0 @@ -1566,6 +1951,25 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021470533} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1036516408 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100008, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1036516412 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036516408} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: 2053965ddb261d94391546f869ad45c6, type: 3} --- !u!1001 &1037917862 PrefabInstance: m_ObjectHideFlags: 0 @@ -1579,7 +1983,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 445870, guid: 65b6f096056a3644389b3bda6c9e8a80, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 445870, guid: 65b6f096056a3644389b3bda6c9e8a80, type: 3} propertyPath: m_LocalPosition.x @@ -1623,6 +2027,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65b6f096056a3644389b3bda6c9e8a80, type: 3} +--- !u!1 &1067256517 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100012, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1067256521 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067256517} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} --- !u!1001 &1186497108 PrefabInstance: m_ObjectHideFlags: 0 @@ -1636,7 +2059,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400010, guid: f47c3332cc1e27e429e62f14a27f814d, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 400010, guid: f47c3332cc1e27e429e62f14a27f814d, type: 3} propertyPath: m_LocalScale.x @@ -1692,113 +2115,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f47c3332cc1e27e429e62f14a27f814d, type: 3} ---- !u!1 &983367103 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 51df288df6d8c864aae27c801a5fd8a5, - type: 3} - m_PrefabInstance: {fileID: 1683353984} - m_PrefabAsset: {fileID: 0} ---- !u!64 &983367107 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983367103} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 821da9cb1c989dd489ae524930f6bb0f, type: 3} ---- !u!1 &997841853 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 997841855} - - component: {fileID: 997841854} - m_Layer: 0 - m_Name: CM vcam1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &997841854 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997841853} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 1244011693} - m_Follow: {fileID: 1244011693} - m_Lens: - FieldOfView: 48.4 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1638516161} ---- !u!4 &997841855 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997841853} - m_LocalRotation: {x: 0.024976576, y: -0.0000000010750635, z: 2.6859787e-11, w: 0.999688} - m_LocalPosition: {x: -36.182, y: 7.7200003, z: 13.28} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1638516161} - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1011048368 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100002, guid: d534d0198c237a043a8e671f0bf2859e, - type: 3} - m_PrefabInstance: {fileID: 158817790} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1011048370 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011048368} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 7eb169ca98be6744db6423d236b0e90b, type: 3} --- !u!1001 &1244011686 PrefabInstance: m_ObjectHideFlags: 0 @@ -1806,88 +2122,64 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 104517609856167801, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 104517609856167801, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_Name value: FishV1 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.x - value: -31.930002 + value: -32.31 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} - propertyPath: m_LocalPosition.x - value: -36.182 - objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.y value: 7.32 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalPosition.z - value: 10.469999 + value: 10.47 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.y value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 90 objectReference: {fileID: 0} - - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + - target: {fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} propertyPath: m_Convex value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [{fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3}] + m_RemovedComponents: + - {fileID: 7317411005216613472, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} --- !u!1 &1244011687 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 104517609856167801, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + m_CorrespondingSourceObject: {fileID: 104517609856167801, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} m_PrefabInstance: {fileID: 1244011686} m_PrefabAsset: {fileID: 0} --- !u!114 &1244011688 @@ -1927,10 +2219,66 @@ CharacterController: m_Center: {x: 0, y: 0, z: 0} --- !u!4 &1244011693 stripped Transform: - m_CorrespondingSourceObject: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, - type: 3} + m_CorrespondingSourceObject: {fileID: 736482141215372739, guid: 94c015d94f6e5364e9b36b960bbe1b77, type: 3} m_PrefabInstance: {fileID: 1244011686} m_PrefabAsset: {fileID: 0} +--- !u!1 &1250613220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1250613224 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250613220} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 0cd7a7c221fea2f449a3fe6027a20675, type: 3} +--- !u!1 &1284285492 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1284285496 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284285492} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300004, guid: 2053965ddb261d94391546f869ad45c6, type: 3} +--- !u!1 &1345171582 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1345171586 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345171582} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: 2053965ddb261d94391546f869ad45c6, type: 3} --- !u!1001 &1367772466 PrefabInstance: m_ObjectHideFlags: 0 @@ -1942,10 +2290,6 @@ PrefabInstance: propertyPath: m_Name value: toilet objectReference: {fileID: 0} - - target: {fileID: 400004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 400004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} propertyPath: m_RootOrder value: 2 @@ -2004,6 +2348,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c528509df862ef449544165d18b2dbf, type: 3} +--- !u!1 &1381846585 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 2c528509df862ef449544165d18b2dbf, type: 3} + m_PrefabInstance: {fileID: 1367772466} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1381846587 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381846585} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1001 &1389905653 PrefabInstance: m_ObjectHideFlags: 0 @@ -2073,6 +2436,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} +--- !u!1 &1411772844 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1411772848 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411772844} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} --- !u!1 &1456137550 GameObject: m_ObjectHideFlags: 0 @@ -2168,26 +2550,6 @@ Transform: m_Father: {fileID: 918403605} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: -360, z: 0} ---- !u!1 &1381846585 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100004, guid: 2c528509df862ef449544165d18b2dbf, - type: 3} - m_PrefabInstance: {fileID: 1367772466} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1381846587 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1381846585} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} --- !u!1001 &1494505764 PrefabInstance: m_ObjectHideFlags: 0 @@ -2201,7 +2563,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: da54b27642860c745b145c776f596680, type: 3} propertyPath: m_RootOrder - value: 5 + value: 8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: da54b27642860c745b145c776f596680, type: 3} propertyPath: m_LocalScale.x @@ -2257,10 +2619,47 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da54b27642860c745b145c776f596680, type: 3} +--- !u!1 &1495241811 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100008, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1495241815 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495241811} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 0cd7a7c221fea2f449a3fe6027a20675, type: 3} +--- !u!1 &1524372881 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, type: 3} + m_PrefabInstance: {fileID: 921036908} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1524372885 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524372881} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 7cd4ce41d004a7c4f9fda3a3ae2e9bf3, type: 3} --- !u!1 &1566209036 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100002, guid: b7768e1703027114b8fb81cb29192dc8, - type: 3} + m_CorrespondingSourceObject: {fileID: 100002, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} m_PrefabInstance: {fileID: 714934316} m_PrefabAsset: {fileID: 0} --- !u!64 &1566209038 @@ -2290,11 +2689,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 400010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} - propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 400010, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} propertyPath: m_LocalScale.x @@ -2352,8 +2747,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} --- !u!1 &1636214929 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100016, guid: 76f69c2044293fc40a066ff85ecb70df, - type: 3} + m_CorrespondingSourceObject: {fileID: 100016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} m_PrefabInstance: {fileID: 1686929020} m_PrefabAsset: {fileID: 0} --- !u!64 &1636214931 @@ -2416,7 +2810,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 2, y: 0.4, z: 0} + m_FollowOffset: {x: 2, y: 0.5, z: 0} m_XDamping: 1 m_YDamping: 0.2 m_ZDamping: 0.2 @@ -2437,7 +2831,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0.3, z: 0} + m_TrackedObjectOffset: {x: 0, y: 0.5, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 @@ -2548,10 +2942,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 12 objectReference: {fileID: 0} - - target: {fileID: 400016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 400016, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} propertyPath: m_LocalScale.x value: 5 @@ -2606,6 +2996,101 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} +--- !u!1 &1699274045 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1699274049 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699274045} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} +--- !u!1 &1703299255 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: ae4a04ebba3b51f4bb3a2c49687f5621, type: 3} + m_PrefabInstance: {fileID: 2078976655} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1703299259 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703299255} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300004, guid: f6d2bef1bd916964595eabb8b09a0e98, type: 3} +--- !u!1 &1744188603 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 2c528509df862ef449544165d18b2dbf, type: 3} + m_PrefabInstance: {fileID: 1367772466} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1744188607 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744188603} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: ea90797f5a8073e4cbc72f859e3782b8, type: 3} +--- !u!1 &1776735976 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100018, guid: 47af50246352ed14da4ade618d736175, type: 3} + m_PrefabInstance: {fileID: 329487747} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1776735980 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776735976} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300004, guid: 2a7850605a17f504bbfdfaa591d5b419, type: 3} +--- !u!1 &1782110942 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100010, guid: d534d0198c237a043a8e671f0bf2859e, type: 3} + m_PrefabInstance: {fileID: 158817790} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1782110946 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782110942} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300004, guid: 0cd7a7c221fea2f449a3fe6027a20675, type: 3} --- !u!1 &1784820472 GameObject: m_ObjectHideFlags: 0 @@ -2701,6 +3186,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784820472} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1843139731 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100006, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1843139735 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843139731} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} +--- !u!1 &1847578470 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100012, guid: dce57d1e50d1fef489ee2d0fe5716701, type: 3} + m_PrefabInstance: {fileID: 1612247743} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1847578474 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1847578470} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 2053965ddb261d94391546f869ad45c6, type: 3} +--- !u!1 &1855729602 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: b7768e1703027114b8fb81cb29192dc8, type: 3} + m_PrefabInstance: {fileID: 714934316} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1855729606 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855729602} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: a23adc725dbf4564c9a748e2d6719d65, type: 3} +--- !u!1 &1859148031 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100012, guid: 76f69c2044293fc40a066ff85ecb70df, type: 3} + m_PrefabInstance: {fileID: 1686929020} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1859148035 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1859148031} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300004, guid: 4be90c5d9ce40a648bb37474c93d9c02, type: 3} --- !u!1 &1874818902 GameObject: m_ObjectHideFlags: 0 @@ -3340,23 +3901,3 @@ Transform: m_Father: {fileID: 918403605} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: -270.026, z: 0} ---- !u!1 &1904484677 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100004, guid: 6aefd9b8d8cb28f4f87b54d78bf0fca3, - type: 3} - m_PrefabInstance: {fileID: 921036908} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1904484679 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1904484677} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 6def73f8311645b47a2d3ae4d6afb91f, type: 3} From e82ed0b65e574f983c2942cb1689d3eb519cb928 Mon Sep 17 00:00:00 2001 From: James Hodgson Date: Tue, 12 Apr 2022 14:49:07 +0100 Subject: [PATCH 6/6] Remove unused code --- Assets/Scripts/FishController.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Assets/Scripts/FishController.cs b/Assets/Scripts/FishController.cs index 0c1d5f7..e866661 100644 --- a/Assets/Scripts/FishController.cs +++ b/Assets/Scripts/FishController.cs @@ -12,11 +12,9 @@ public class FishController : MonoBehaviour public Vector3 drag; CharacterController controller; - Transform t; void Start() { - t = transform; controller = GetComponent(); } @@ -37,7 +35,6 @@ public class FishController : MonoBehaviour } velocity.x = moveX * speed; - // velocity.z = moveZ * speed; velocity.y += moveGravity; transform.Rotate(0, moveZ, 0);