Clean up spawn points, add mountain

2022-08-14 22:15:45 -07:00
parent 9e87605849
commit 3a5ea8fd64
54 changed files with 7041 additions and 1376 deletions
--- a/Assets/Scenes/BaseScene.unity
+++ b/Assets/Scenes/BaseScene.unity
@@ -532,71 +532,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &984933985
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -94.7
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2041
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.49229085
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.0082955705
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.87026846
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.014619638
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_Name
-      value: zscamp
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_TagString
-      value: Player
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: 25774ba084a08a647804a07356ecfc7c, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
 --- !u!1 &1146950388
 GameObject:
  m_ObjectHideFlags: 0
@@ -1693,6 +1628,63 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2074621602}
  m_CullTransparentMesh: 1
+--- !u!1001 &300188346709555978
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -94.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2041
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.49229085
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0082955705
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.87026846
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.014619638
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 261422945847229056, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 642627593172705338, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
+      propertyPath: m_Name
+      value: PlayerModel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d9858b6e1904d0b428dd41df1066f517, type: 3}
 --- !u!1 &2085758330445916748
 GameObject:
  m_ObjectHideFlags: 0
@@ -1828,152 +1820,3 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6689462114757999464 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c7976d863d1bbdf4fbf64f3438b7d40f, type: 3}
-  m_PrefabInstance: {fileID: 984933985}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &6689462114757999465
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6689462114757999464}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  grassStep: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3}
-  templeStep: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3}
-  sandStep: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3}
-  audioSource: {fileID: 0}
--- !u!114 &6689462114757999466
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6689462114757999464}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 492ccac425c363548b6f9be7835cbc6a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Speed: 30
-  RotateSpeed: 0.5
--- !u!82 &6689462114757999467
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6689462114757999464}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 0}
-  m_PlayOnAwake: 1
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 0
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
--- !u!143 &6689462114757999468
-CharacterController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6689462114757999464}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Height: 2.5
-  m_Radius: 0.5
-  m_SlopeLimit: 90
-  m_StepOffset: 0.3
-  m_SkinWidth: 0.08
-  m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: -0.5, z: 0}