Prefab tweaks

3 年前 · 2f001d27
--- a/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big.mat
+++ b/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big.mat
    - _Glossiness: 0
    - _GlossyReflections: 0
    - _LightProbeContribution: 2.79
-    - _MainTint_VariationIntensity: 1
+    - _MainTint_VariationIntensity: 0.5
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineDepthSensitivity: 0
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
-    - _MainTint: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
+    - _MainTint: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1}
    - _Offset: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _SpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- a/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big2.mat
+++ b/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big2.mat
    - _GlossyReflections: 0
    - _LightProbeContribution: 2.79
    - _LightProbeMultiplier: 1
-    - _MainTint_VariationIntensity: 1
+    - _MainTint_VariationIntensity: 0.5
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineDepthSensitivity: 0
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
-    - _MainTint: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
+    - _MainTint: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1}
    - _Offset: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _SpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- a/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big3.mat
+++ b/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big3.mat
    - _GlossyReflections: 0
    - _LightProbeContribution: 2.79
    - _LightProbeMultiplier: 1
-    - _MainTint_VariationIntensity: 1
+    - _MainTint_VariationIntensity: 0.5
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineDepthSensitivity: 0
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
-    - _MainTint: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
+    - _MainTint: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1}
    - _Offset: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _SpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- a/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big4.mat
+++ b/UOP1_Project/Assets/Art/Nature/Rocks_Big/Rock_Big4.mat
    - _GlossyReflections: 0
    - _LightProbeContribution: 2.79
    - _LightProbeMultiplier: 1
-    - _MainTint_VariationIntensity: 1
+    - _MainTint_VariationIntensity: 0.5
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineDepthSensitivity: 0
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
-    - _MainTint: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
+    - _MainTint: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1}
    - _Offset: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _SpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- a/UOP1_Project/Assets/Materials/Prototype_Sand.mat
+++ b/UOP1_Project/Assets/Materials/Prototype_Sand.mat
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MainColor: {r: 0.745283, g: 0.6916874, b: 0.34100214, a: 1}
+    - _MainColor: {r: 0.8679245, g: 0.8250768, b: 0.55268776, a: 1}
    - _Offset: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _SpecularColor: {r: 1, g: 1, b: 1, a: 0}
--- a/UOP1_Project/Assets/Prefabs/GameplayEssentials/Entrance.prefab
+++ b/UOP1_Project/Assets/Prefabs/GameplayEssentials/Entrance.prefab
  m_Component:
  - component: {fileID: 5540501665159811850}
  - component: {fileID: 5540501665159811851}
+  - component: {fileID: 1771713970578625073}
  m_Layer: 0
  m_Name: Entrance
  m_TagString: SpawnLocation
  m_Name: 
  m_EditorClassIdentifier: 
  _entrancePath: {fileID: 0}
+--- !u!114 &1771713970578625073
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5540501665159811849}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 14441bd075da9464e9c254e66e1849e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _verticalOffset: 0.1
--- a/UOP1_Project/Assets/Prefabs/Nature/Rocks/BigRock3.prefab
+++ b/UOP1_Project/Assets/Prefabs/Nature/Rocks/BigRock3.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!64 &632581867661386057
-MeshCollider:
+--- !u!65 &1193096255879097304
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4469293702342312310}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.49710035, y: 2.0251226, z: 0.68698883}
+  m_Center: {x: -0.4620216, y: 1.0029938, z: 0.023425058}
+--- !u!65 &2896812853105062244
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4469293702342312310}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.3130908, y: 1.9085524, z: 1.0533519}
+  m_Center: {x: -0.054026365, y: 0.7948328, z: 0.07338351}
+--- !u!65 &8434174307187276027
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -7012793779351497013, guid: 3fdd92505d7ca4634b00be350b9649af, type: 3}
+  serializedVersion: 2
+  m_Size: {x: 1.5545576, y: 1.109215, z: 0.51213336}
+  m_Center: {x: 0.066707015, y: 0.5117341, z: -0.563589}
+--- !u!65 &6022971692709577811
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4469293702342312310}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.55397844, y: 1.6004746, z: 0.8058281}
+  m_Center: {x: 0.5239575, y: 0.39100087, z: 0.07338333}
 --- !u!1001 &3659024203749538855
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
        type: 3}
      propertyPath: m_LocalPosition.x
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0.000000021855694
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3fdd92505d7ca4634b00be350b9649af,
-        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 3fdd92505d7ca4634b00be350b9649af,
        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 1
+      propertyPath: m_Layer
+      value: 11
-      propertyPath: m_Layer
-      value: 11
+      propertyPath: m_StaticEditorFlags
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3fdd92505d7ca4634b00be350b9649af, type: 3}
--- a/UOP1_Project/Assets/Prefabs/Props/Boat.prefab
+++ b/UOP1_Project/Assets/Prefabs/Props/Boat.prefab
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
-        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
      propertyPath: m_Layer
      value: 10
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 5087b787ea9ae2342a5a4ba09a0b254e,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5087b787ea9ae2342a5a4ba09a0b254e, type: 3}
 --- !u!1001 &5758670364394196137
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ca59427d5deb3374287c9c7a2279f768,
-        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8110273575699171614, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
-    - target: {fileID: -6763744868875059711, guid: ca59427d5deb3374287c9c7a2279f768,
+    - target: {fileID: -7173258062490077891, guid: ca59427d5deb3374287c9c7a2279f768,
-      propertyPath: m_LocalRotation.x
-      value: 0.000000021855694
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
+    - target: {fileID: -6763744868875059711, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000021855694
      objectReference: {fileID: 0}
    - target: {fileID: -3263056921989953152, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
      propertyPath: m_Name
      value: Boat
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
    - target: {fileID: 3243729920546415981, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
      propertyPath: m_Materials.Array.data[0]
      propertyPath: m_Materials.Array.data[0]
      value: 
      objectReference: {fileID: 2100000, guid: fd5a3a6ab87b35247a36016573eb6a71, type: 2}
+    - target: {fileID: 7021877312288206304, guid: ca59427d5deb3374287c9c7a2279f768,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
    - target: {fileID: 8527266879734532673, guid: ca59427d5deb3374287c9c7a2279f768,
        type: 3}
      propertyPath: m_Materials.Array.data[0]