merged level2 and level1

2022-10-29 13:40:27 -04:00 · 2022-10-29 13:40:27 -04:00 · aac756a05f
commit aac756a05f
parent 1d1e411b9b d51cb23741
2 changed files with 5533 additions and 153 deletions
--- a/Assets/Prefabs/Level2.prefab
+++ b/Assets/Prefabs/Level2.prefab
--- a/Assets/Scenes/LevelDesign.unity
+++ b/Assets/Scenes/LevelDesign.unity
@ -14,10 +14,10 @@ OcclusionCullingSettings:
 RenderSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Fog: 1
+  m_FogColor: {r: 0.39607847, g: 0.7725491, b: 0.9960785, a: 1}
  m_FogMode: 3
-  m_FogDensity: 0.01
+  m_FogDensity: 0.002
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
@ -770,6 +770,90 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &707997995
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 886416571}
+    m_Modifications:
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 420.59756
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 246.95998
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 772.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 632
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -196
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 663
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.37108412
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.37108395
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.601911
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.6019107
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 243.30899
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158652756498202662, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_Name
+      value: Mountain_06
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f06e0b2bd426cc249b952a8f4e6711e5, type: 3}
 --- !u!1001 &714208351
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1271,6 +1355,85 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1772573267671239019}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1214572790
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 886416571}
+    m_Modifications:
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 299.99997
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 567.54004
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 581.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -66.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 282.399
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5327061
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.532706
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.46499926
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.46499923
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 82.235
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158652756498202662, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_Name
+      value: Mountain_02
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f06e0b2bd426cc249b952a8f4e6711e5, type: 3}
 --- !u!1 &1301531512
 GameObject:
  m_ObjectHideFlags: 0
@ -1821,6 +1984,174 @@ MonoBehaviour:
  m_CameraActivatedEvent:
    m_PersistentCalls:
      m_Calls: []
+--- !u!1001 &1588017742
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 886416571}
+    m_Modifications:
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 510.93
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 299.99997
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 938.15594
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 290
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -196
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 743
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.07072981
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.07072984
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.70356053
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7035604
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 168.519
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158652756498202662, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_Name
+      value: Mountain_05
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f06e0b2bd426cc249b952a8f4e6711e5, type: 3}
+--- !u!1001 &1608039563
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 886416571}
+    m_Modifications:
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 510.93
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 299.99997
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 607.26
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -196
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 639
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.35998487
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.3599849
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.60861397
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.6086139
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 118.793
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158652756498202662, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_Name
+      value: Mountain_04
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f06e0b2bd426cc249b952a8f4e6711e5, type: 3}
 --- !u!1001 &1650059524
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2242,6 +2573,85 @@ RectTransform:
  m_AnchoredPosition: {x: 24.04, y: 10.34}
  m_SizeDelta: {x: 1488, y: 697}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &2070750425
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 886416571}
+    m_Modifications:
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 300.00003
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 756.7201
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 885.30457
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -66.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 371
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70624095
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.70624095
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.034982234
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.03498224
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1943343868350772853, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 5.671
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158652756498202662, guid: f06e0b2bd426cc249b952a8f4e6711e5,
+        type: 3}
+      propertyPath: m_Name
+      value: Mountain_03
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f06e0b2bd426cc249b952a8f4e6711e5, type: 3}
 --- !u!1 &2129712287
 GameObject:
  m_ObjectHideFlags: 0
@ -2328,7 +2738,7 @@ PrefabInstance:
    - target: {fileID: 2443025573520650965, guid: 0e12bf23a882b9d47b6b9b68e4e7a062,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 280.7828
+      value: 279
      objectReference: {fileID: 0}
    - target: {fileID: 2443025573520650965, guid: 0e12bf23a882b9d47b6b9b68e4e7a062,
        type: 3}
@ -2338,7 +2748,7 @@ PrefabInstance:
    - target: {fileID: 2443025573520650965, guid: 0e12bf23a882b9d47b6b9b68e4e7a062,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 46.537727
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2443025573520650965, guid: 0e12bf23a882b9d47b6b9b68e4e7a062,
        type: 3}