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,