Merge commit '8ea5bc896eaca40f1d6ce17c94ce112f15c88fd9'
This commit is contained in:
KOSMOGOR
@@ -406,124 +406,6 @@ Transform:
|
||||
- {fileID: 1690414898}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &700479631
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 14.779945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0000076293945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 99.28143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.7071067
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Lava_Area_Light
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3}
|
||||
--- !u!1001 &792221756
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 14.779945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0000076293945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 99.28143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Ceiling_Area_Light_1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4935003872567433204, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4b5486799c646a640a580e1c6831d332, type: 3}
|
||||
--- !u!4 &814580603 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3}
|
||||
@@ -940,107 +822,6 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1903976060}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1555151540
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7853120362946791194, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -6367444929722157375, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4976235030035833125, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -3143558483194166149, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -662909361366826300, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Level1_0.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2818826380887570562, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5733911823876726600, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5856117470861584492, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8345129058921690494, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8613709593378099745, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
propertyPath: m_Lightmapping
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b7eb279b00f6fbf4bb09461381196875, type: 3}
|
||||
--- !u!1 &1560783767
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1224,63 +1005,6 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 795996269680244239, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3}
|
||||
m_PrefabInstance: {fileID: 823861237}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1733140263
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 14.779945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0000076293945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 99.28143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.061628412
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.0616285
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.704416
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.7044161
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Spot_Light_1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 8b691628bb5135f44ae31e89e436113a, type: 3}
|
||||
--- !u!1001 &1777178255
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1580,7 +1304,7 @@ PrefabInstance:
|
||||
m_TransformParent: {fileID: 690075884}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3284696129798561372, guid: cb78e85aa373c3a4498d453f91e6f5e0, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 9c0109e364aec314e90b4d1b28b893fa, type: 2}
|
||||
- target: {fileID: 3933166166638460809, guid: cb78e85aa373c3a4498d453f91e6f5e0, type: 3}
|
||||
@@ -1807,8 +1531,7 @@ PrefabInstance:
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 2420552906730569295, guid: c919829cf5c2674429d0cd37945d2b13, type: 3}
|
||||
m_RemovedGameObjects: [{fileID: 2420552906730569295, guid: c919829cf5c2674429d0cd37945d2b13, type: 3}]
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c919829cf5c2674429d0cd37945d2b13, type: 3}
|
||||
@@ -1874,11 +1597,7 @@ SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 1560783769}
|
||||
- {fileID: 1555151540}
|
||||
- {fileID: 840308438}
|
||||
- {fileID: 1733140263}
|
||||
- {fileID: 700479631}
|
||||
- {fileID: 792221756}
|
||||
- {fileID: 690075884}
|
||||
- {fileID: 219120118920238392}
|
||||
- {fileID: 834035366}
|
||||
|
||||
Reference in New Issue
Block a user