Merge remote-tracking branch 'Absinthe_XR/master'

# Conflicts:
#	Assets/Scenes/Absinte_Escape.unity
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
LAPTOP-0GFGHPSP\FloLe committed 2022-03-29 15:43:32 +02:00
commit a3924c153e
6 files changed
+105 -104

No files matched your search

+98 -1
View File
@@ -38,7 +38,11 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
<<<<<<< HEAD
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
=======
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
>>>>>>> Absinthe_XR/master
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -132,7 +136,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9dd34bbbf1689034c9ddb7d9897399c6, type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9dd34bbbf1689034c9ddb7d9897399c6, type: 3}
propertyPath: m_LocalPosition.x
@@ -479,6 +483,7 @@ LineRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<< HEAD
m_GameObject: {fileID: 668370360}
m_Enabled: 1
m_CastShadows: 0
@@ -845,6 +850,18 @@ MonoBehaviour:
m_Reference: {fileID: 0}
m_ButtonPressPoint: 0.5
--- !u!1 &929587067
=======
m_GameObject: {fileID: 1158284025}
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: 383304789}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1238811441
>>>>>>> Absinthe_XR/master
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -875,6 +892,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
<<<<<<< HEAD
m_Father: {fileID: 2020037963}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1351,6 +1369,80 @@ MonoBehaviour:
m_Flags: 0
m_Reference: {fileID: 0}
m_ButtonPressPoint: 0.5
=======
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1285433189
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalScale.y
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalScale.z
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalPosition.x
value: -2.01
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalPosition.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalPosition.z
value: 2.45
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalRotation.w
value: 0.76995665
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6380963
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 79.3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
propertyPath: m_Name
value: tank_v2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4b2168e005a09483084665b3b9323e27, type: 3}
>>>>>>> Absinthe_XR/master
--- !u!1 &1292424518
GameObject:
m_ObjectHideFlags: 0
@@ -1392,6 +1484,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
<<<<<<< HEAD
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1997656749
@@ -1533,3 +1626,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f83a7123c03ce4415bfa63a8dbab19dd, type: 3}
=======
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
>>>>>>> Absinthe_XR/master