Changes

5 年前 · bdc8378b
--- a/Assets/Data/PipelineAsset.asset
+++ b/Assets/Data/PipelineAsset.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
-  m_Name: LightweightAsset
+  m_Name: PipelineAsset
  m_EditorClassIdentifier: 
  k_AssetVersion: 4
  m_RendererType: 0
--- a/Assets/Materials/Splash.mat
+++ b/Assets/Materials/Splash.mat
    - _CameraNearFadeDistance: 1
    - _ColorMode: 0
    - _Cull: 0
-    - _Cutoff: 0.36
+    - _Cutoff: 0.25
-    - _DistortionStrengthScaled: 0
+    - _DistortionStrengthScaled: 0.1
    - _DstBlend: 1
    - _EmissionEnabled: 0
    - _FlipbookBlending: 0
--- a/Assets/Objects/Levels/Island/Dynamic
+++ b/Assets/Objects/Levels/Island/Dynamic
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3691299467085645504}
-  m_LocalRotation: {x: 0.04506648, y: 0.7262534, z: -0.047830928, w: 0.6842787}
+  m_LocalRotation: {x: 0.04506648, y: 0.72625333, z: -0.047830928, w: 0.68427867}
  m_LocalPosition: {x: 93.90462, y: 16.68996, z: 22.234848}
  m_LocalScale: {x: 1, y: 0.9999999, z: 1}
  m_Children:
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (8)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: -116.21794
      propertyPath: m_LocalScale.z
      value: 1.0000001
      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (8)
+      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
      propertyPath: m_Path
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (5)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: 70.377174
      propertyPath: m_LocalScale.z
      value: 0.9999998
      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (5)
+      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
      propertyPath: m_Path
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (3)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: 150.44687
      propertyPath: m_LocalScale.z
      value: 0.9999998
      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (3)
+      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
      propertyPath: m_Path
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (4)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: -70.368675
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalScale.z
      value: 1.0000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (4)
      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (9)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: 147.51144
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalScale.z
      value: 1.0000007
+      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (9)
      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (6)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: -82.03012
      propertyPath: m_LocalScale.z
      value: 1.0000002
      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (6)
+      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
      propertyPath: m_Path
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (7)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: 70.88732
      propertyPath: m_LocalScale.z
      value: 1.0000006
      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (7)
+      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
      propertyPath: m_Path
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (1)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: 89.761
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalScale.z
      value: 1.0000006
+      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (1)
      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
  m_Modification:
    m_TransformParent: {fileID: 3691299467046892349}
    m_Modifications:
-    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
-      propertyPath: m_Name
-      value: Windsurfer (2)
-      objectReference: {fileID: 0}
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalPosition.x
      value: -122.03492
    - target: {fileID: 4510310561805642, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
      propertyPath: m_LocalScale.z
      value: 0.9999998
+      objectReference: {fileID: 0}
+    - target: {fileID: 1840323375275930, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71, type: 3}
+      propertyPath: m_Name
+      value: Windsurfer (2)
      objectReference: {fileID: 0}
    - target: {fileID: 114111596105315798, guid: cb2fae9bfdf2e44f6a5973fccdc7cf71,
        type: 3}
--- a/Assets/Objects/boats/Interceptor.fbx
+++ b/Assets/Objects/boats/Interceptor.fbx
--- a/Assets/Objects/boats/Prefabs/_Boat.prefab
+++ b/Assets/Objects/boats/Prefabs/_Boat.prefab
        m_RotationOrder: 4
    startColor:
      serializedVersion: 2
-      minMaxState: 4
+      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        key1: {r: 1, g: 1, b: 1, a: 0.9013236}
-        key2: {r: 0, g: 0, b: 0, a: 0.2509804}
+        key2: {r: 0, g: 0, b: 0, a: 0}
        key3: {r: 0, g: 0, b: 0, a: 0}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 6501
-        atime2: 11269
+        atime1: 12214
+        atime2: 65535
        atime3: 65535
        atime4: 0
        atime5: 0
        m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 3
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        m_RotationOrder: 4
    startColor:
      serializedVersion: 2
-      minMaxState: 4
+      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        key1: {r: 1, g: 1, b: 1, a: 0.9013236}
-        key2: {r: 0, g: 0, b: 0, a: 0.2509804}
+        key2: {r: 0, g: 0, b: 0, a: 0}
        key3: {r: 0, g: 0, b: 0, a: 0}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 6501
-        atime2: 11269
+        atime1: 12214
+        atime2: 65535
        atime3: 65535
        atime4: 0
        atime5: 0
        m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 3
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
  - {fileID: 4603708908827592}
  - {fileID: 4693301302057358}
  - {fileID: 4416522625512240}
-  - {fileID: 4653116848354930}
  m_Father: {fileID: 4603238648617514}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1489463026464572}
-  m_LocalRotation: {x: -0, y: 0.86602545, z: 0.5, w: 0}
-  m_LocalPosition: {x: 0, y: 0.020999998, z: -3.8219993}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.002, z: -0.172}
-  m_Father: {fileID: 4226103850215974}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: -60, y: 180, z: 0}
+  m_Father: {fileID: 1857749394586354482}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &198499198857476844
 ParticleSystem:
  m_ObjectHideFlags: 0
  m_GameObject: {fileID: 1489463026464572}
  serializedVersion: 6
-  lengthInSec: 5
+  lengthInSec: 1
-  cullingMode: 3
+  cullingMode: 2
  ringBufferMode: 0
  ringBufferLoopRange: {x: 0, y: 1}
  looping: 1
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
-  moveWithTransform: 1
+  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
  randomSeed: 0
    startLifetime:
      serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
-      minScalar: 5
+      minScalar: 0.2
      maxCurve:
        serializedVersion: 2
        m_Curve:
    startSpeed:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 4
+      scalar: -2
      minScalar: 5
      maxCurve:
        serializedVersion: 2
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 1, b: 1, a: 0.3647059}
+      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        m_NumAlphaKeys: 2
    startSize:
      serializedVersion: 2
-      minMaxState: 0
-      scalar: 1
-      minScalar: 1
+      minMaxState: 3
+      scalar: 0.35
+      minScalar: 0.25
      maxCurve:
        serializedVersion: 2
        m_Curve:
        m_RotationOrder: 4
    startSizeY:
      serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
      scalar: 1
      minScalar: 1
      maxCurve:
        m_RotationOrder: 4
    startSizeZ:
      serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
      scalar: 1
      minScalar: 1
      maxCurve:
    gravityModifier:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 1
+      scalar: 0
      minScalar: 0
      maxCurve:
        serializedVersion: 2
        m_RotationOrder: 4
  ShapeModule:
    serializedVersion: 6
-    enabled: 1
-    type: 4
+    enabled: 0
+    type: 10
    angle: 25
    length: 5
    boxThickness: {x: 0, y: 0, z: 0}
    sphericalDirectionAmount: 0
    randomPositionAmount: 0
    radius:
-      value: 0.13
+      value: 0.0001
      mode: 0
      spread: 0
      speed:
    rateOverTime:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 0
+      scalar: 50
      minScalar: 10
      maxCurve:
        serializedVersion: 2
    rateOverDistance:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 6
+      scalar: 0
      minScalar: 0
      maxCurve:
        serializedVersion: 2
    m_BurstCount: 0
    m_Bursts: []
  SizeModule:
-    enabled: 1
+    enabled: 0
    curve:
      serializedVersion: 2
      minMaxState: 1
        m_Curve:
        - serializedVersion: 3
          time: 0
-          value: 0
-          inSlope: 2.8477862
-          outSlope: 2.8477862
-          tangentMode: 0
-          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.11484548
-        - serializedVersion: 3
-          time: 0.4738695
-          value: 0.88812613
-          inSlope: -0.32061675
-          outSlope: -0.32061675
+          value: 1
+          inSlope: 0
+          outSlope: 0
-          inWeight: 0.33333334
-          outWeight: 0.23693888
+          inWeight: 0
+          outWeight: 0
        - serializedVersion: 3
          time: 1
          value: 0
          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
+          inWeight: 0
+          outWeight: 0
        m_PreInfinity: 2
        m_PostInfinity: 2
        m_RotationOrder: 4
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 0}
-        key1: {r: 1, g: 1, b: 1, a: 1}
+        key0: {r: 1, g: 1, b: 1, a: 1}
+        key1: {r: 1, g: 1, b: 1, a: 0.84664536}
        key2: {r: 0, g: 0, b: 0, a: 0}
        key3: {r: 0, g: 0, b: 0, a: 1}
        key4: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 9252
+        atime1: 39921
        atime2: 65535
        atime3: 65535
        atime4: 0
        m_RotationOrder: 4
    inWorldSpace: 0
  InheritVelocityModule:
-    enabled: 1
+    enabled: 0
    m_Mode: 0
    m_Curve:
      serializedVersion: 2
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_RenderMode: 0
-  m_SortMode: 0
+  m_SortMode: 2
  m_MinParticleSize: 0
  m_MaxParticleSize: 0.5
  m_CameraVelocityScale: 0
  - component: {fileID: 4534809148113994}
  - component: {fileID: 54710712322113256}
  - component: {fileID: 64258884862185400}
-  - component: {fileID: 114559526544640098}
  - component: {fileID: 114129291822198474}
  - component: {fileID: 114571606569623246}
  m_Layer: 11
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1553288845585282}
-  m_LocalRotation: {x: -0, y: -0.46607336, z: -0, w: 0.8847461}
-  m_LocalPosition: {x: -53.959473, y: 0.23000002, z: -56.539803}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4566539937980892}
  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: -55.559002, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &54710712322113256
 Rigidbody:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Mass: 3200
  m_Drag: 0.1
-  m_AngularDrag: 0.2
+  m_AngularDrag: 0.05
  m_UseGravity: 1
  m_IsKinematic: 0
  m_Interpolate: 1
  m_Convex: 1
  m_CookingOptions: 14
  m_Mesh: {fileID: 2899951614431091848, guid: a362db008c5274e03bf6f3d2387cf617, type: 3}
--- !u!114 &114559526544640098
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1553288845585282}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 01c46922a8ed04b0081de10e51b3762f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  vel: {x: 0, y: 0, z: 0}
-  engineSound: {fileID: 82633756123786494}
-  waterSound: {fileID: 82912682702107868}
-  torque: 5
-  horsePower: 18
-  enginePosition: {x: 0, y: 0.05, z: -3.31}
 --- !u!114 &114129291822198474
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_EditorClassIdentifier: 
  Human: 0
  RandomizeColors: 1
-  PrimaryColor: {r: 0.6066833, g: 0.080696166, b: 0.8069615, a: 1}
-  TrimColor: {r: 0.15882511, g: 0.06897104, b: 0.19303852, a: 1}
+  PrimaryColor: {r: 0.6359154, g: 0.60109407, b: 0.063591555, a: 1}
+  TrimColor: {r: 0.3640846, g: 0.34543964, b: 0.05763617, a: 1}
+  engine: {fileID: 1710334234404381546}
+  cam: {fileID: 2365855355768168390}
 --- !u!114 &114571606569623246
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  _buoyancyType: 3
-  density: 546.1682
-  volume: 5.8590007
-  voxelResolution: 0.3
-  centerOfMass: {x: 0, y: -0.25, z: -0.55}
+  density: 405.62808
+  volume: 7.889
+  voxelResolution: 0.5
+  centerOfMass: {x: 0, y: -0.35, z: -0.8}
-  - {x: -0.9000001, y: 0.12409994, z: -1.7381939}
-  - {x: -0.9000001, y: 0.12409994, z: -1.4381939}
-  - {x: -0.9000001, y: 0.12409994, z: -1.138194}
-  - {x: -0.9000001, y: 0.12409994, z: -0.8381939}
-  - {x: -0.9000001, y: 0.12409994, z: -0.53819394}
-  - {x: -0.9000001, y: 0.12409994, z: -0.2381939}
-  - {x: -0.6, y: 0.12409994, z: -2.9381936}
-  - {x: -0.6, y: 0.12409994, z: -2.6381936}
-  - {x: -0.6, y: 0.12409994, z: -2.3381937}
-  - {x: -0.6, y: 0.12409994, z: -2.0381937}
-  - {x: -0.6, y: 0.12409994, z: -1.7381939}
-  - {x: -0.6, y: 0.12409994, z: -1.4381939}
-  - {x: -0.6, y: 0.12409994, z: -1.138194}
-  - {x: -0.6, y: 0.12409994, z: -0.8381939}
-  - {x: -0.6, y: 0.12409994, z: -0.53819394}
-  - {x: -0.6, y: 0.12409994, z: -0.2381939}
-  - {x: -0.6, y: 0.12409994, z: 0.061806113}
-  - {x: -0.6, y: 0.12409994, z: 0.36180615}
-  - {x: -0.6, y: 0.12409994, z: 0.6618061}
-  - {x: -0.6, y: 0.12409994, z: 0.9618062}
-  - {x: -0.6, y: 0.12409994, z: 1.2618061}
-  - {x: -0.6, y: 0.42409995, z: -2.6381936}
-  - {x: -0.6, y: 0.42409995, z: -2.3381937}
-  - {x: -0.6, y: 0.42409995, z: -2.0381937}
-  - {x: -0.6, y: 0.42409995, z: -1.7381939}
-  - {x: -0.6, y: 0.42409995, z: -1.4381939}
-  - {x: -0.6, y: 0.42409995, z: -1.138194}
-  - {x: -0.6, y: 0.42409995, z: -0.8381939}
-  - {x: -0.6, y: 0.42409995, z: -0.53819394}
-  - {x: -0.6, y: 0.42409995, z: -0.2381939}
-  - {x: -0.6, y: 0.42409995, z: 0.061806113}
-  - {x: -0.6, y: 0.42409995, z: 0.36180615}
-  - {x: -0.6, y: 0.42409995, z: 0.6618061}
-  - {x: -0.6, y: 0.42409995, z: 0.9618062}
-  - {x: -0.30000004, y: -0.17590007, z: -1.4381939}
-  - {x: -0.30000004, y: -0.17590007, z: -1.138194}
-  - {x: -0.30000004, y: -0.17590007, z: -0.8381939}
-  - {x: -0.30000004, y: -0.17590007, z: -0.53819394}
-  - {x: -0.30000004, y: -0.17590007, z: -0.2381939}
-  - {x: -0.30000004, y: -0.17590007, z: 0.061806113}
-  - {x: -0.30000004, y: -0.17590007, z: 0.36180615}
-  - {x: -0.30000004, y: -0.17590007, z: 0.6618061}
-  - {x: -0.30000004, y: 0.12409994, z: -2.9381936}
-  - {x: -0.30000004, y: 0.12409994, z: -2.6381936}
-  - {x: -0.30000004, y: 0.12409994, z: -2.3381937}
-  - {x: -0.30000004, y: 0.12409994, z: -2.0381937}
-  - {x: -0.30000004, y: 0.12409994, z: -1.7381939}
-  - {x: -0.30000004, y: 0.12409994, z: -1.4381939}
-  - {x: -0.30000004, y: 0.12409994, z: -1.138194}
-  - {x: -0.30000004, y: 0.12409994, z: -0.8381939}
-  - {x: -0.30000004, y: 0.12409994, z: -0.53819394}
-  - {x: -0.30000004, y: 0.12409994, z: -0.2381939}
-  - {x: -0.30000004, y: 0.12409994, z: 0.061806113}
-  - {x: -0.30000004, y: 0.12409994, z: 0.36180615}
-  - {x: -0.30000004, y: 0.12409994, z: 0.6618061}
-  - {x: -0.30000004, y: 0.12409994, z: 0.9618062}
-  - {x: -0.30000004, y: 0.12409994, z: 1.2618061}
-  - {x: -0.30000004, y: 0.12409994, z: 1.5618061}
-  - {x: -0.30000004, y: 0.12409994, z: 1.8618062}
-  - {x: -0.30000004, y: 0.42409995, z: -2.9381936}
-  - {x: -0.30000004, y: 0.42409995, z: -2.6381936}
-  - {x: -0.30000004, y: 0.42409995, z: -2.3381937}
-  - {x: -0.30000004, y: 0.42409995, z: -2.0381937}
-  - {x: -0.30000004, y: 0.42409995, z: -1.7381939}
-  - {x: -0.30000004, y: 0.42409995, z: -1.4381939}
-  - {x: -0.30000004, y: 0.42409995, z: -1.138194}
-  - {x: -0.30000004, y: 0.42409995, z: -0.8381939}
-  - {x: -0.30000004, y: 0.42409995, z: -0.53819394}
-  - {x: -0.30000004, y: 0.42409995, z: -0.2381939}
-  - {x: -0.30000004, y: 0.42409995, z: 0.061806113}
-  - {x: -0.30000004, y: 0.42409995, z: 0.36180615}
-  - {x: -0.30000004, y: 0.42409995, z: 0.6618061}
-  - {x: -0.30000004, y: 0.42409995, z: 0.9618062}
-  - {x: -0.30000004, y: 0.42409995, z: 1.2618061}
-  - {x: -0.30000004, y: 0.42409995, z: 1.5618061}
-  - {x: -0.30000004, y: 0.42409995, z: 1.8618062}
-  - {x: -0.30000004, y: 0.7241, z: -1.138194}
-  - {x: -0.30000004, y: 0.7241, z: -0.8381939}
-  - {x: -0.30000004, y: 0.7241, z: -0.53819394}
-  - {x: -0.30000004, y: 0.7241, z: -0.2381939}
-  - {x: -0.000000029802322, y: -0.17590007, z: -2.6381936}
-  - {x: -0.000000029802322, y: -0.17590007, z: -2.3381937}
-  - {x: -0.000000029802322, y: -0.17590007, z: -2.0381937}
-  - {x: -0.000000029802322, y: -0.17590007, z: -1.7381939}
-  - {x: -0.000000029802322, y: -0.17590007, z: -1.4381939}
-  - {x: -0.000000029802322, y: -0.17590007, z: -1.138194}
-  - {x: -0.000000029802322, y: -0.17590007, z: -0.8381939}
-  - {x: -0.000000029802322, y: -0.17590007, z: -0.53819394}
-  - {x: -0.000000029802322, y: -0.17590007, z: -0.2381939}
-  - {x: -0.000000029802322, y: -0.17590007, z: 0.061806113}
-  - {x: -0.000000029802322, y: -0.17590007, z: 0.36180615}
-  - {x: -0.000000029802322, y: -0.17590007, z: 0.6618061}
-  - {x: -0.000000029802322, y: -0.17590007, z: 0.9618062}
-  - {x: -0.000000029802322, y: 0.12409994, z: -2.9381936}
-  - {x: -0.000000029802322, y: 0.12409994, z: -2.6381936}
-  - {x: -0.000000029802322, y: 0.12409994, z: -2.3381937}
-  - {x: -0.000000029802322, y: 0.12409994, z: -2.0381937}
-  - {x: -0.000000029802322, y: 0.12409994, z: -1.7381939}
-  - {x: -0.000000029802322, y: 0.12409994, z: -1.4381939}
-  - {x: -0.000000029802322, y: 0.12409994, z: -1.138194}
-  - {x: -0.000000029802322, y: 0.12409994, z: -0.8381939}
-  - {x: -0.000000029802322, y: 0.12409994, z: -0.53819394}
-  - {x: -0.000000029802322, y: 0.12409994, z: -0.2381939}
-  - {x: -0.000000029802322, y: 0.12409994, z: 0.061806113}
-  - {x: -0.000000029802322, y: 0.12409994, z: 0.36180615}
-  - {x: -0.000000029802322, y: 0.12409994, z: 0.6618061}
-  - {x: -0.000000029802322, y: 0.12409994, z: 0.9618062}
-  - {x: -0.000000029802322, y: 0.12409994, z: 1.2618061}
-  - {x: -0.000000029802322, y: 0.12409994, z: 1.5618061}
-  - {x: -0.000000029802322, y: 0.12409994, z: 1.8618062}
-  - {x: -0.000000029802322, y: 0.12409994, z: 2.161806}
-  - {x: -0.000000029802322, y: 0.42409995, z: -2.9381936}
-  - {x: -0.000000029802322, y: 0.42409995, z: -2.6381936}
-  - {x: -0.000000029802322, y: 0.42409995, z: -2.3381937}
-  - {x: -0.000000029802322, y: 0.42409995, z: -2.0381937}
-  - {x: -0.000000029802322, y: 0.42409995, z: -1.7381939}
-  - {x: -0.000000029802322, y: 0.42409995, z: -1.4381939}
-  - {x: -0.000000029802322, y: 0.42409995, z: -1.138194}
-  - {x: -0.000000029802322, y: 0.42409995, z: -0.8381939}
-  - {x: -0.000000029802322, y: 0.42409995, z: -0.53819394}
-  - {x: -0.000000029802322, y: 0.42409995, z: -0.2381939}
-  - {x: -0.000000029802322, y: 0.42409995, z: 0.061806113}
-  - {x: -0.000000029802322, y: 0.42409995, z: 0.36180615}
-  - {x: -0.000000029802322, y: 0.42409995, z: 0.6618061}
-  - {x: -0.000000029802322, y: 0.42409995, z: 0.9618062}
-  - {x: -0.000000029802322, y: 0.42409995, z: 1.2618061}
-  - {x: -0.000000029802322, y: 0.42409995, z: 1.5618061}
-  - {x: -0.000000029802322, y: 0.42409995, z: 1.8618062}
-  - {x: -0.000000029802322, y: 0.42409995, z: 2.161806}
-  - {x: -0.000000029802322, y: 0.42409995, z: 2.461806}
-  - {x: -0.000000029802322, y: 0.7241, z: -1.4381939}
-  - {x: -0.000000029802322, y: 0.7241, z: -1.138194}
-  - {x: -0.000000029802322, y: 0.7241, z: -0.8381939}
-  - {x: -0.000000029802322, y: 0.7241, z: -0.53819394}
-  - {x: -0.000000029802322, y: 0.7241, z: -0.2381939}
-  - {x: -0.000000029802322, y: 0.7241, z: 0.061806113}
-  - {x: -0.000000029802322, y: 0.7241, z: 0.36180615}
-  - {x: 0.29999998, y: -0.17590007, z: -1.4381939}
-  - {x: 0.29999998, y: -0.17590007, z: -1.138194}
-  - {x: 0.29999998, y: -0.17590007, z: -0.8381939}
-  - {x: 0.29999998, y: -0.17590007, z: -0.53819394}
-  - {x: 0.29999998, y: -0.17590007, z: -0.2381939}
-  - {x: 0.29999998, y: -0.17590007, z: 0.061806113}
-  - {x: 0.29999998, y: -0.17590007, z: 0.36180615}
-  - {x: 0.29999998, y: -0.17590007, z: 0.6618061}
-  - {x: 0.29999998, y: 0.12409994, z: -2.9381936}
-  - {x: 0.29999998, y: 0.12409994, z: -2.6381936}
-  - {x: 0.29999998, y: 0.12409994, z: -2.3381937}
-  - {x: 0.29999998, y: 0.12409994, z: -2.0381937}
-  - {x: 0.29999998, y: 0.12409994, z: -1.7381939}
-  - {x: 0.29999998, y: 0.12409994, z: -1.4381939}
-  - {x: 0.29999998, y: 0.12409994, z: -1.138194}
-  - {x: 0.29999998, y: 0.12409994, z: -0.8381939}
-  - {x: 0.29999998, y: 0.12409994, z: -0.53819394}
-  - {x: 0.29999998, y: 0.12409994, z: -0.2381939}
-  - {x: 0.29999998, y: 0.12409994, z: 0.061806113}
-  - {x: 0.29999998, y: 0.12409994, z: 0.36180615}
-  - {x: 0.29999998, y: 0.12409994, z: 0.6618061}
-  - {x: 0.29999998, y: 0.12409994, z: 0.9618062}
-  - {x: 0.29999998, y: 0.12409994, z: 1.2618061}
-  - {x: 0.29999998, y: 0.12409994, z: 1.5618061}
-  - {x: 0.29999998, y: 0.12409994, z: 1.8618062}
-  - {x: 0.29999998, y: 0.42409995, z: -2.9381936}
-  - {x: 0.29999998, y: 0.42409995, z: -2.6381936}
-  - {x: 0.29999998, y: 0.42409995, z: -2.3381937}
-  - {x: 0.29999998, y: 0.42409995, z: -2.0381937}
-  - {x: 0.29999998, y: 0.42409995, z: -1.7381939}
-  - {x: 0.29999998, y: 0.42409995, z: -1.4381939}
-  - {x: 0.29999998, y: 0.42409995, z: -1.138194}
-  - {x: 0.29999998, y: 0.42409995, z: -0.8381939}
-  - {x: 0.29999998, y: 0.42409995, z: -0.53819394}
-  - {x: 0.29999998, y: 0.42409995, z: -0.2381939}
-  - {x: 0.29999998, y: 0.42409995, z: 0.061806113}
-  - {x: 0.29999998, y: 0.42409995, z: 0.36180615}
-  - {x: 0.29999998, y: 0.42409995, z: 0.6618061}
-  - {x: 0.29999998, y: 0.42409995, z: 0.9618062}
-  - {x: 0.29999998, y: 0.42409995, z: 1.2618061}
-  - {x: 0.29999998, y: 0.42409995, z: 1.5618061}
-  - {x: 0.29999998, y: 0.42409995, z: 1.8618062}
-  - {x: 0.29999998, y: 0.7241, z: -1.138194}
-  - {x: 0.29999998, y: 0.7241, z: -0.8381939}
-  - {x: 0.29999998, y: 0.7241, z: -0.53819394}
-  - {x: 0.29999998, y: 0.7241, z: -0.2381939}
-  - {x: 0.6, y: 0.12409994, z: -2.9381936}
-  - {x: 0.6, y: 0.12409994, z: -2.6381936}
-  - {x: 0.6, y: 0.12409994, z: -2.3381937}
-  - {x: 0.6, y: 0.12409994, z: -2.0381937}
-  - {x: 0.6, y: 0.12409994, z: -1.7381939}
-  - {x: 0.6, y: 0.12409994, z: -1.4381939}
-  - {x: 0.6, y: 0.12409994, z: -1.138194}
-  - {x: 0.6, y: 0.12409994, z: -0.8381939}
-  - {x: 0.6, y: 0.12409994, z: -0.53819394}
-  - {x: 0.6, y: 0.12409994, z: -0.2381939}
-  - {x: 0.6, y: 0.12409994, z: 0.061806113}
-  - {x: 0.6, y: 0.12409994, z: 0.36180615}
-  - {x: 0.6, y: 0.12409994, z: 0.6618061}
-  - {x: 0.6, y: 0.12409994, z: 0.9618062}
-  - {x: 0.6, y: 0.12409994, z: 1.2618061}
-  - {x: 0.6, y: 0.42409995, z: -2.6381936}
-  - {x: 0.6, y: 0.42409995, z: -2.3381937}
-  - {x: 0.6, y: 0.42409995, z: -2.0381937}
-  - {x: 0.6, y: 0.42409995, z: -1.7381939}
-  - {x: 0.6, y: 0.42409995, z: -1.4381939}
-  - {x: 0.6, y: 0.42409995, z: -1.138194}
-  - {x: 0.6, y: 0.42409995, z: -0.8381939}
-  - {x: 0.6, y: 0.42409995, z: -0.53819394}
-  - {x: 0.6, y: 0.42409995, z: -0.2381939}
-  - {x: 0.6, y: 0.42409995, z: 0.061806113}
-  - {x: 0.6, y: 0.42409995, z: 0.36180615}
-  - {x: 0.6, y: 0.42409995, z: 0.6618061}
-  - {x: 0.6, y: 0.42409995, z: 0.9618062}
-  - {x: 0.9, y: 0.12409994, z: -1.7381939}
-  - {x: 0.9, y: 0.12409994, z: -1.4381939}
-  - {x: 0.9, y: 0.12409994, z: -1.138194}
-  - {x: 0.9, y: 0.12409994, z: -0.8381939}
-  - {x: 0.9, y: 0.12409994, z: -0.53819394}
-  - {x: 0.9, y: 0.12409994, z: -0.2381939}
+  - {x: -0.6999999, y: -0.019224256, z: -2.3381913}
+  - {x: -0.6999999, y: -0.019224256, z: -1.6381911}
+  - {x: -0.6999999, y: -0.019224256, z: -0.93819106}
+  - {x: -0.6999999, y: -0.019224256, z: -0.2381911}
+  - {x: -0.6999999, y: -0.019224256, z: 0.46180892}
+  - {x: 0.000000029802322, y: -0.019224256, z: -3.0381913}
+  - {x: 0.000000029802322, y: -0.019224256, z: -2.3381913}
+  - {x: 0.000000029802322, y: -0.019224256, z: -1.6381911}
+  - {x: 0.000000029802322, y: -0.019224256, z: -0.93819106}
+  - {x: 0.000000029802322, y: -0.019224256, z: -0.2381911}
+  - {x: 0.000000029802322, y: -0.019224256, z: 0.46180892}
+  - {x: 0.000000029802322, y: -0.019224256, z: 1.1618088}
+  - {x: 0.000000029802322, y: -0.019224256, z: 1.8618088}
+  - {x: 0.000000029802322, y: 0.68077576, z: -2.3381913}
+  - {x: 0.000000029802322, y: 0.68077576, z: -1.6381911}
+  - {x: 0.000000029802322, y: 0.68077576, z: -0.93819106}
+  - {x: 0.000000029802322, y: 0.68077576, z: -0.2381911}
+  - {x: 0.000000029802322, y: 0.68077576, z: 0.46180892}
+  - {x: 0.70000005, y: -0.019224256, z: -2.3381913}
+  - {x: 0.70000005, y: -0.019224256, z: -1.6381911}
+  - {x: 0.70000005, y: -0.019224256, z: -0.93819106}
+  - {x: 0.70000005, y: -0.019224256, z: -0.2381911}
+  - {x: 0.70000005, y: -0.019224256, z: 0.46180892}
  colliders:
  - {fileID: 64258884862185400}
  percentSubmerged: 0
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        key1: {r: 1, g: 1, b: 1, a: 0.9013236}
-        key2: {r: 0, g: 0, b: 0, a: 0.2509804}
+        key2: {r: 0, g: 0, b: 0, a: 0}
        key3: {r: 0, g: 0, b: 0, a: 0}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 6501
-        atime2: 11269
+        atime1: 12214
+        atime2: 65535
        atime3: 65535
        atime4: 0
        atime5: 0
        m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 3
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        m_RotationOrder: 4
    startColor:
      serializedVersion: 2
-      minMaxState: 4
+      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
      maxColor: {r: 1, g: 1, b: 1, a: 1}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
        key1: {r: 1, g: 1, b: 1, a: 0.9013236}
-        key2: {r: 0, g: 0, b: 0, a: 0.2509804}
+        key2: {r: 0, g: 0, b: 0, a: 0}
        key3: {r: 0, g: 0, b: 0, a: 0}
        key4: {r: 0, g: 0, b: 0, a: 0}
        key5: {r: 0, g: 0, b: 0, a: 0}
        ctime6: 0
        ctime7: 0
        atime0: 0
-        atime1: 6501
-        atime2: 11269
+        atime1: 12214
+        atime2: 65535
        atime3: 65535
        atime4: 0
        atime5: 0
        m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 3
      minGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 1857749394586354482}
  m_Father: {fileID: 4534809148113994}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3138619813684846845}
-  m_LocalRotation: {x: 0.0307072, y: -0.0036797822, z: 0.00011331029, w: 0.9995217}
-  m_LocalPosition: {x: 0.059861183, y: 2, z: -4.6296153}
+  m_LocalRotation: {x: 0.098537624, y: -0.000000021875596, z: 0.00000026372865, w: 0.99513334}
+  m_LocalPosition: {x: 0, y: 2, z: -5}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2704390242086546817}
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 50
  m_StandbyUpdate: 0
  m_LookAt: {fileID: 4534809148113994}
  m_Follow: {fileID: 4534809148113994}
        Culture=neutral, PublicKeyToken=null
  m_LegacyBlendHint: 0
  m_ComponentOwner: {fileID: 2704390242086546817}
+--- !u!1 &5982248302829913771
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1857749394586354482}
+  - component: {fileID: 1036935742331195195}
+  - component: {fileID: 3607957023957793550}
+  - component: {fileID: 1710334234404381546}
+  m_Layer: 0
+  m_Name: Engine
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1857749394586354482
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5982248302829913771}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.064, z: -3.3079998}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4653116848354930}
+  m_Father: {fileID: 4566539937980892}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1036935742331195195
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5982248302829913771}
+  m_Mesh: {fileID: 6235005220218627844, guid: a362db008c5274e03bf6f3d2387cf617, type: 3}
+--- !u!23 &3607957023957793550
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5982248302829913771}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 99e41bed0266b42c2be534cc7d27de5a, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!114 &1710334234404381546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5982248302829913771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01c46922a8ed04b0081de10e51b3762f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RB: {fileID: 54710712322113256}
+  vel: 0
+  engineSound: {fileID: 82633756123786494}
+  waterSound: {fileID: 82912682702107868}
+  horsePower: 10
+  turnAngle: 45
+  enginePosition: {x: 0, y: 0, z: -0.12}
 --- !u!1 &8128372730392016786
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Objects/props/props/Prefabs/Arrow.prefab
+++ b/Assets/Objects/props/props/Prefabs/Arrow.prefab
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 1
  m_IsActive: 1
 --- !u!4 &5357552133296375944
 Transform:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 3
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 4294967295
  m_RendererPriority: 0
  m_Materials:
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
+  m_ReceiveGI: 2
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  - component: {fileID: 1726916457053442438}
  - component: {fileID: 1268918928981577381}
  - component: {fileID: 6054106052659713031}
-  - component: {fileID: 929435786039042483}
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 1
  m_IsActive: 1
 --- !u!4 &1726916457053442438
 Transform:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 3
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 4294967295
  m_RendererPriority: 0
  m_Materials:
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
+  m_ReceiveGI: 2
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!64 &929435786039042483
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075304680604880651}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 4300014, guid: 92a669df93f0d4f99bd8fa27767e8c9e, type: 3}
--- a/Assets/Scripts/Boat/AIcontroller.cs
+++ b/Assets/Scripts/Boat/AIcontroller.cs
        public NavMeshPath navPath;//navigation path;
        private Vector3[] pathPoint = null;
        public Vector3 curWPPos;
-        public float curWPsize;
        public int curPoint = 0;
        public int curWP = 0;
        public bool foundPath;
        // Use this for initialization
        void Start ()
        {
-            engine = GetComponent<Engine> ();// find the engine for the boat
-    
-            //CalculatePath (targetPos);//calculate path to target
-    
+
-            
        }

        // Update is called once per frame
    
        void AssignWP(WaypointGroup.Waypoint wp)
        {
-            curWPsize = wp.WPwidth;
-            Vector3 offset = Random.insideUnitSphere * curWPsize;
-            offset.y = 0f;
-            curWPPos = wp.point + offset;
+            var offset = (Random.value * 2f - 1f) * wp.WPwidth * Vector3.left;
+            curWPPos = wp.point + wp.rotation * offset;
            curWP++;
            if (curWP >= WaypointGroup.Instance.WPs.Count)
                curWP = 0;
--- a/Assets/Scripts/Boat/BoatController.cs
+++ b/Assets/Scripts/Boat/BoatController.cs
 using System;
 using UnityEngine;
 using System.Collections;
+using Cinemachine;
 using Object = UnityEngine.Object;
 using Random = UnityEngine.Random;

        public Color PrimaryColor; // Boat primary colour
        public Color TrimColor; // Boat secondary colour
        public Renderer boatRenderer; // The renderer for the boat mesh
-
+        
+        public Engine engine;
+        public CinemachineVirtualCamera cam;
+        
-            Random.InitState(this.gameObject.GetInstanceID() + DateTime.Now.Millisecond + DateTime.UtcNow.Second);
-            Randomize();
            Colourize(); // Update the colour material property block
        }

            Colourize();
-            if (Human == true)
-                gameObject.AddComponent<HumanController>(); // Adds a human controller if human
+            if (Human)
+            {
+                gameObject.AddComponent<HumanController>().engine = engine; // Adds a human controller if human
+            }
-                gameObject.AddComponent<AIcontroller>(); // Adds an AI controller if AI
+            {
+                gameObject.AddComponent<AIcontroller>().engine = engine; // Adds an AI controller if AI
+            }
        }

        /// <summary>
        {
+            if (RandomizeColors)
+                Randomize();
            if (boatRenderer)
            {
                if (Application.isEditor)

        void Randomize()
        {
-            if (RandomizeColors)
-            {
-                var H = Random.Range(0f, 1f);
-                var S = 0f;
-                var V = 0.9f;
-                
-                var rand = Random.insideUnitCircle;
+            Random.InitState(this.gameObject.GetInstanceID() + DateTime.Now.Millisecond + DateTime.UtcNow.Second);
+
+            var H = Random.Range(0f, 1f);
+            var S = 0f;
+            var V = 0.9f;
+            
+            var rand = Random.insideUnitCircle;
-                if (rand.x > 0.5f)
-                    S = 0f;
-                else
-                    S = 0.9f;
-                
-                if (rand.y > 0.8f)
-                    V = 0f;
-                else
-                    V = Random.Range(0.5f, 0.9f);
+            if (rand.x > 0.5f)
+                S = 0f;
+            else
+                S = 0.9f;
+            
+            if (rand.y > 0.8f)
+                V = 0f;
+            else
+                V = Random.Range(0.5f, 0.9f);
-                var h2 = Mathf.Repeat(H + (rand.x + rand.y > 0 ? 0.5f : 0f), 1f);
-                var s2 = S <= 0.1f ? 0.9f : Random.Range(0.5f, 0.9f);
-                
-                PrimaryColor = Color.HSVToRGB(H, S, V);
-                TrimColor = Color.HSVToRGB(h2, s2, 1f - V);
-            }
+            var h2 = Mathf.Repeat(H + (rand.x + rand.y > 0 ? 0.5f : 0f), 1f);
+            var s2 = S <= 0.1f ? 0.9f : Random.Range(0.5f, 0.9f);
+            
+            PrimaryColor = Color.HSVToRGB(H, S, V);
+            TrimColor = Color.HSVToRGB(h2, s2, 1f - V);
        }
    }

--- a/Assets/Scripts/Boat/Engine.cs
+++ b/Assets/Scripts/Boat/Engine.cs
 {
    public class Engine : MonoBehaviour
    {
-        private Rigidbody RB; // The rigid body attatched to the boat
-        public Vector3 vel; // Boats velocity
+        public Rigidbody RB; // The rigid body attatched to the boat
+        public float vel; // Boats velocity
+
+        private float turnVel = 0f;
-        public float torque = 5f;
+        public float turnAngle = 45f;
        private float3[] point = new float3[1]; // engine submerged check
        private float3[] heights = new float3[1]; // engine submerged check
        private int _guid;

        void Awake()
        {
-            RB = gameObject.GetComponent<Rigidbody>(); // get the RB
            engineSound.time = UnityEngine.Random.Range(0f, engineSound.clip.length); // randomly start the engine sound
            waterSound.time = UnityEngine.Random.Range(0f, waterSound.clip.length); // randomly start the water sound

        void FixedUpdate()
        {
-            vel = RB.velocity; // store the velocity
-            float velMag = vel.sqrMagnitude; // get the sqr mag
-            engineSound.pitch = Mathf.Max(velMag * 0.01f, 0.3f); // use some magice numbers to control the pitch of the engine sound
+            vel = RB.velocity.sqrMagnitude; // get the sqr mag
+            engineSound.pitch = Mathf.Max(vel * 0.01f, 0.3f); // use some magice numbers to control the pitch of the engine sound

            // Get the water level from the engines position and store it
            point[0] = transform.TransformPoint(enginePosition);
        /// <param name="modifier">Acceleration modifier, adds force in the 0-1 range</param>
        public void Accel(float modifier)
        {
-            if (yHeight > -0.1f) // if the engine is deeper than 0.1
+            if (yHeight > -0.2f) // if the engine is deeper than 0.1
-                modifier = Mathf.Clamp(modifier, 0f, 1f); // clamp for reasonable values
-                Vector3 forward = transform.forward;
-                forward.y = 0f;
-                forward.Normalize();
-                RB.AddForce(forward * modifier * horsePower, ForceMode.Acceleration); // add force forward based on input and horsepower
+                Vector3 forward = Vector3.Slerp(RB.transform.forward, transform.forward, 0.2f);
+                //forward.y = 0f;
+                //forward.Normalize();
+                RB.AddForceAtPosition(forward * modifier * horsePower, point[0], ForceMode.Acceleration); // add force forward based on input and horsepower
                RB.AddRelativeTorque(-Vector3.right * modifier, ForceMode.Acceleration);
            }
        }
        /// <param name="modifier">Steering modifier, positive for right, negative for negative</param>
        public void Turn(float modifier)
        {
-            if (yHeight > -0.1f) // if the engine is deeper than 0.1
-            {
-                modifier = Mathf.Clamp(modifier, -1f, 1f); // clamp for reasonable values
-                RB.AddRelativeTorque(new Vector3(0f, torque, -torque * 0.5f) * modifier, ForceMode.Acceleration); // add torque based on input and torque amount
-            }
+            var curAngle = transform.localEulerAngles.y;
+
+            var angle = Mathf.SmoothDampAngle(curAngle, -modifier * turnAngle, ref turnVel, 0.2f);
+            
+            transform.localEulerAngles = new Vector3(0f, angle, 0f);
+            
+            //RB.AddRelativeTorque(vel * -0.001f * new Vector3(0f, angle > 180 ? angle - 360 : angle, 0f), ForceMode.Acceleration); // add torque based on input and torque amount
        }

        // Draw some helper gizmos
--- a/Assets/Scripts/Boat/HumanController.cs
+++ b/Assets/Scripts/Boat/HumanController.cs
            
            controls.BoatControls.Steering.performed += context => steering = context.ReadValue<float>();
            controls.BoatControls.Steering.canceled += context => steering = 0f;
-            
-            engine = GetComponent<Engine>(); // get the engine script
        }

        private void OnEnable()
--- a/Assets/Scripts/GameSystem/RaceManager.cs
+++ b/Assets/Scripts/GameSystem/RaceManager.cs
        private void OnEnable()
        {
            WaypointGroup.Instance.reverse = raceData.reversed;
+            WaypointGroup.Instance.Setup();
            CreateBoats();
        }

                var matrix = WaypointGroup.Instance.startingPositons[i];

                GameObject boatObject = Instantiate(boat.boatPrefab, matrix.GetColumn(3), Quaternion.LookRotation(matrix.GetColumn(2))) as GameObject;
-
+                boatObject.name = boat.boatName;
+                BoatController boatController = boatObject.GetComponent<BoatController>();
+                boatController.Human = boat.Human;
+                boatController.cam.gameObject.layer = LayerMask.NameToLayer("Player" + (i + 1));
                i++;
            }
        }
--- a/Assets/Scripts/GameSystem/WaypointGroup.cs
+++ b/Assets/Scripts/GameSystem/WaypointGroup.cs

 		public float raceDelay = 4f;
 		public bool raceStarted = false;
+		
+		[NonSerialized]
+		[NonSerialized]
 		public Matrix4x4[] startingPositons = new Matrix4x4[4];

 		[SerializeField] public List<Waypoint> WPs = new List<Waypoint>();
 		void Awake()
 		{
 			Instance = this;
-			if (reverse)
-				WPs.Reverse();
-			Invoke("StartRace", raceDelay);
-			GetStartPositions();
-		public void StartRace()
+		public void Setup()
-			raceStarted = true;
+			if (reverse)
+			{
+				WPs.Reverse();
+				WPs.Insert(0, WPs[WPs.Count - 1]);
+				WPs.RemoveAt(WPs.Count - 1);
+			}
+
+			GetStartPositions();
 		}

 		[Serializable]
 		{
 			var position = WPs[0].point;
 			var rotation = WPs[0].rotation;
+			if(reverse)
+				rotation *= Quaternion.AngleAxis(180f, Vector3.up);
+			
-				var pos = new Vector3(i % 2 == 0 ? 3f : -3f, 0f, (i * 6f) + 4f);
-
-				pos.z = reverse ? pos.z : -pos.z;
+				var pos = new Vector3(i % 2 == 0 ? 3f : -3f, 0f, i * 6f + 4f);
+				pos.z = -pos.z;
 				
 				startingPositons[i].SetTRS(position, rotation, Vector3.one);
 				startingPositons[i] *= Matrix4x4.Translate(pos);
--- a/Assets/Shaders/Blocker.shader
+++ b/Assets/Shaders/Blocker.shader
    }
    SubShader
    {
-        Tags{"RenderType" = "Opaque" "RenderPipeline" = "LightweightPipeline" "IgnoreProjector" = "True"}
+        Tags{"RenderType" = "Opaque" "RenderPipeline" = "Universal" "IgnoreProjector" = "True"}
        LOD 100
        
        Cull front
            #pragma vertex vert
            #pragma fragment frag
            
-            #include "Packages/com.unity.render-pipelines.lightweight/ShaderLibrary/Core.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"

            float4 vert (float4 vertex : POSITION) : SV_POSITION
            {
--- a/Assets/Shaders/Graphs/CliffShader.ShaderGraph
+++ b/Assets/Shaders/Graphs/CliffShader.ShaderGraph
--- a/Assets/scenes/Island.unity
+++ b/Assets/scenes/Island.unity
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 208737145}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ce2d6128fa5c04c7e84e7978ef8b37a4, type: 3}
  m_Name: 
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 208737145}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 12170cf0581b249279bf9ba0eda0b212, type: 3}
  m_Name: 
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 56.25
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
      propertyPath: m_LocalPosition.y
      propertyPath: m_LocalPosition.z
-      value: 75
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
      propertyPath: m_LocalRotation.x
    m_Bits: 1
  m_VolumeTrigger: {fileID: 0}
  m_RenderPostProcessing: 1
-  m_Antialiasing: 0
+  m_Antialiasing: 1
  m_AntialiasingQuality: 2
  m_StopNaN: 0
  m_Dithering: 0
      propertyPath: m_Enabled
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6589000190618102542, guid: e70416e3bc35d4004a9981d0ac102ba5,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7262534
-      objectReference: {fileID: 0}
-    - target: {fileID: 6589000190618102542, guid: e70416e3bc35d4004a9981d0ac102ba5,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.6842787
-      objectReference: {fileID: 0}
    - target: {fileID: 1753825905008727153, guid: e70416e3bc35d4004a9981d0ac102ba5,
        type: 3}
      propertyPath: WPs.Array.data[15].WPwidth
      propertyPath: startingPositons.Array.data[3].e33
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6464224579486120898, guid: e70416e3bc35d4004a9981d0ac102ba5,
-        type: 3}
-      propertyPath: m_NormalDirection
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 1753825905308988432, guid: e70416e3bc35d4004a9981d0ac102ba5, type: 3}
+    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e70416e3bc35d4004a9981d0ac102ba5, type: 3}
--- a/Packages/com.verasl.water-system/Scripts/BuoyantObject.cs
+++ b/Packages/com.verasl.water-system/Scripts/BuoyantObject.cs
 // Further tweaks by Andre McGrail
 //
 //
+
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using Unity.Mathematics;

            if (wp.y - voxelResolution < waterLevel)
            {
-                float k = (waterLevel - (wp.y - voxelResolution)) / (voxelResolution * 2f);
-                if (k > 1)
-                {
-                    k = 1f;
-                }
-                else if (k < 0)
-                {
-                    k = 0f;
-                }
+                float k = Mathf.Clamp01(waterLevel - (wp.y - voxelResolution)) / (voxelResolution * 2f);
+
-                var localDampingForce = -velocity * DAMPFER * RB.mass;
+                var localDampingForce = DAMPFER * RB.mass * -velocity;
                var force = localDampingForce + Mathf.Sqrt(k) * localArchimedesForce;//\
                RB.AddForceAtPosition(force, wp);


        private void SliceIntoVoxels()
        {
-			UnityEngine.Quaternion rot = transform.rotation;
+			Quaternion rot = transform.rotation;
-            transform.SetPositionAndRotation(Vector3.zero, UnityEngine.Quaternion.identity);
+            transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity);
            transform.localScale = Vector3.one;

            voxels = null;
--- a/Packages/com.verasl.water-system/Scripts/Rendering/PlanarReflections.cs
+++ b/Packages/com.verasl.water-system/Scripts/Rendering/PlanarReflections.cs

            GL.invertCulling = false;
            RenderSettings.fog = true;
-            QualitySettings.maximumLODLevel = 0;
-            QualitySettings.lodBias = 8;
+            QualitySettings.maximumLODLevel = max;
+            QualitySettings.lodBias = bias;
            Shader.SetGlobalTexture(planarReflectionTextureID, m_ReflectionTexture);
        }
    }
--- a/Packages/com.verasl.water-system/Scripts/Water.cs
+++ b/Packages/com.verasl.water-system/Scripts/Water.cs
            waterTime = Time.time;
            Shader.SetGlobalFloat("_GlobalTime", waterTime);
        }
-
-        private void LateUpdate() {
-            if(Application.isPlaying)
-                GerstnerWavesJobs.UpdateHeights();
-        }
-
+        
        public void FragWaveNormals(bool toggle)
        {
            Material mat = GetComponent<Renderer>().sharedMaterial;
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
 --- !u!55 &1
 PhysicsManager:
  m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 13
  m_Gravity: {x: 0, y: -9.81, z: 0}
  m_DefaultMaterial: {fileID: 0}
  m_BounceThreshold: 2
  m_ClothInterCollisionDistance: 0
  m_ClothInterCollisionStiffness: 0
  m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: cdfcff7fccf4ff7fcffcff7fffffffffc8f0ff7fc8f0ff7fffffffffffffffffc8f0ff7fc8f0ff7fcffcff7fcdfcff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8f0ff7f
+  m_LayerCollisionMatrix: cd0cff7fc800ff7fcd0cff7fffffffffc800ff7fc800ff7fffffffffffffffffc8f0ff7fc800ff7fcd0cff7fcd0cff7fc801ff7fc801ff7fc801ff7fc801ff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc800ff7f
+  m_ReuseCollisionCallbacks: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
  m_ContactPairsMode: 0
  m_BroadphaseType: 0
  m_WorldBounds:
  m_FrictionType: 0
  m_EnableEnhancedDeterminism: 0
  m_EnableUnifiedHeightmaps: 1
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 7
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
    antiAliasing: 0
    softParticles: 1
    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
-    lodBias: 8
+    lodBias: 3
-    streamingMipmapsActive: 0
+    streamingMipmapsActive: 1
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsRenderersPerFrame: 64
+    streamingMipmapsMaxLevelReduction: 4
-    particleRaycastBudget: 4096
+    particleRaycastBudget: 1024
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
    asyncUploadPersistentBuffer: 1
--- a/Assets/Shaders/PackedPBR.meta
+++ b/Assets/Shaders/PackedPBR.meta
-fileFormatVersion: 2
-guid: 169ccfffe27834dd89f43a5f0edc67ec
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a//Assets/Data/LightweightAsset.asset.meta
+++ b//Assets/Data/LightweightAsset.asset.meta
--- a//Assets/Data/LightweightAsset.asset
+++ b//Assets/Data/LightweightAsset.asset