Merge remote-tracking branch 'origin/hdrp' into hdrp

2023-10-26 11:04:32 +03:00 · 2023-10-26 11:04:32 +03:00 · 97d6cbbaac
parent 2f7d591279 744fc6bdc9
commit 97d6cbbaac
2 changed files with 118 additions and 108 deletions
--- a/Assets/Prefabs/PlayerShip.prefab
+++ b/Assets/Prefabs/PlayerShip.prefab
@ -15003,6 +15003,16 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3662652456581259006, guid: d12e2e84004c76641bf0f4e40bb9d15e,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.559
+      objectReference: {fileID: 0}
+    - target: {fileID: 3662652456581259006, guid: d12e2e84004c76641bf0f4e40bb9d15e,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.191
+      objectReference: {fileID: 0}
    - target: {fileID: 4726394564757784130, guid: d12e2e84004c76641bf0f4e40bb9d15e,
        type: 3}
      propertyPath: m_LocalPosition.z
--- a/Assets/Scenes/StartScene.unity
+++ b/Assets/Scenes/StartScene.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 11720.625, g: 10010.672, b: 7734.9688, a: 1}
+  m_IndirectSpecularColor: {r: 11364.906, g: 9648.883, b: 7313.711, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -4383,7 +4383,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: aa47fc596fffc244e919a51b624871f9,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.061584473
+      value: -0.045959473
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: aa47fc596fffc244e919a51b624871f9,
        type: 3}
@ -10048,7 +10048,100 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 979092249}
  m_PrefabAsset: {fileID: 0}
--- !u!43 &1039252888
+--- !u!1001 &1048748161
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1193713285198572271}
+    m_Modifications:
+    - target: {fileID: 1572691484623211287, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_Name
+      value: Board
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 300.63596
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -6.7141113
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 6247.8223
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9948626
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.002438806
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.08827761
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.049493056
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 21143129e49687543a860c67c350a565, type: 3}
+--- !u!4 &1048748162 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
+    type: 3}
+  m_PrefabInstance: {fileID: 1048748161}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1059041981 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7600147938676090907, guid: 369a633d9884c714b97a9a470c5bd289,
+    type: 3}
+  m_PrefabInstance: {fileID: 979092249}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1065240770 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1191663718250422831, guid: 46ddd91456b701e4c944a8dfe945f027,
+    type: 3}
+  m_PrefabInstance: {fileID: 1756911207}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e396294e1a3da4045b6e6d09b47a1751, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!43 &1090221113
 Mesh:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -10232,99 +10325,6 @@ Mesh:
    offset: 0
    size: 0
    path: 
--- !u!1001 &1048748161
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1193713285198572271}
-    m_Modifications:
-    - target: {fileID: 1572691484623211287, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_Name
-      value: Board
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 26
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 300.63596
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -6.7141113
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 6247.8223
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.9948626
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.002438806
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.08827761
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.049493056
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 21143129e49687543a860c67c350a565, type: 3}
--- !u!4 &1048748162 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2204655221346390445, guid: 21143129e49687543a860c67c350a565,
-    type: 3}
-  m_PrefabInstance: {fileID: 1048748161}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &1059041981 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7600147938676090907, guid: 369a633d9884c714b97a9a470c5bd289,
-    type: 3}
-  m_PrefabInstance: {fileID: 979092249}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &1065240770 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1191663718250422831, guid: 46ddd91456b701e4c944a8dfe945f027,
-    type: 3}
-  m_PrefabInstance: {fileID: 1756911207}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e396294e1a3da4045b6e6d09b47a1751, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1100891749
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -10679,7 +10679,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 973f5f005a7c15343afeef919174503a,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.005821228
+      value: -0.09606171
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 973f5f005a7c15343afeef919174503a,
        type: 3}
@ -12581,7 +12581,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: fd2df6b83d80eeb4cab41a19165564a4,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.06838989
+      value: -0.121276855
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: fd2df6b83d80eeb4cab41a19165564a4,
        type: 3}
@ -13209,7 +13209,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 3bcebbd226804324f8de5cacbb581086,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.06838989
+      value: -0.121276855
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 3bcebbd226804324f8de5cacbb581086,
        type: 3}
@ -14006,7 +14006,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 5dfa2a63a1f9ab54d8673afb724b71a7,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.11807251
+      value: -0.052764893
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 5dfa2a63a1f9ab54d8673afb724b71a7,
        type: 3}
@ -14115,7 +14115,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 0be33407ba01d2a40a77b1f6c813fc81,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.006210327
+      value: -0.08831024
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 0be33407ba01d2a40a77b1f6c813fc81,
        type: 3}
@ -14237,7 +14237,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 04f8285ca865c2d4b809d56f28f082ac,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.06838989
+      value: -0.121276855
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 04f8285ca865c2d4b809d56f28f082ac,
        type: 3}
@ -15817,7 +15817,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 1abb3c7e9c62e9645846ccddbb0c2dcb,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.061584473
+      value: -0.045959473
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 1abb3c7e9c62e9645846ccddbb0c2dcb,
        type: 3}
@ -16298,7 +16298,7 @@ PrefabInstance:
    - target: {fileID: 2540297679441525250, guid: 46ddd91456b701e4c944a8dfe945f027,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0.12463379
+      value: 0.05987549
      objectReference: {fileID: 0}
    - target: {fileID: 2554774858903827330, guid: 46ddd91456b701e4c944a8dfe945f027,
        type: 3}
@ -16548,7 +16548,7 @@ PrefabInstance:
    - target: {fileID: 7756528557166595481, guid: 46ddd91456b701e4c944a8dfe945f027,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0.12463379
+      value: 0.05987549
      objectReference: {fileID: 0}
    - target: {fileID: 7895390880020813714, guid: 46ddd91456b701e4c944a8dfe945f027,
        type: 3}
@ -17813,7 +17813,7 @@ PrefabInstance:
    - target: {fileID: 4048023379632390612, guid: 512b008e155bf9f4eaedb9c9cd1063a7,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.061584473
+      value: -0.045959473
      objectReference: {fileID: 0}
    - target: {fileID: 4048023381640988693, guid: 512b008e155bf9f4eaedb9c9cd1063a7,
        type: 3}
@ -18392,7 +18392,7 @@ PrefabInstance:
    - target: {fileID: 36968549049045054, guid: 7681b4e9d065c854fb1bccf7edd605e1,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.061584473
+      value: -0.045959473
      objectReference: {fileID: 0}
    - target: {fileID: 36968550521821695, guid: 7681b4e9d065c854fb1bccf7edd605e1,
        type: 3}
@ -33393,7 +33393,7 @@ MeshFilter:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1193713286195741831}
-  m_Mesh: {fileID: 1039252888}
+  m_Mesh: {fileID: 1090221113}
 --- !u!4 &1193713286195741851
 Transform:
  m_ObjectHideFlags: 0