Commit 8b262132 authored by Pinguin's avatar Pinguin
Browse files

Merge branch 'master' of https://git.hemio.de/purpleSloth/ld47

parents 57260c50 16108f9e
fileFormatVersion: 2
guid: b75df566d9ec72f4a9673042da1b8111
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: ac3e15aa18cf57542b6f21b00959a9f9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -1988,7 +1988,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.29898682, y: -0, z: -0, w: 0.95425725}
m_LocalPosition: {x: 24, y: 13, z: -13}
m_LocalPosition: {x: 25.22, y: 13.78, z: -13}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -2918,6 +2918,63 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5b1d3df634cb9bf43b570448a202ce77, type: 3}
m_PrefabInstance: {fileID: 1379746573}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1392714389
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312108, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8162048471110312111, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
propertyPath: m_Name
value: For cutscene
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ac3e15aa18cf57542b6f21b00959a9f9, type: 3}
--- !u!1001 &1400766003
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -3522,6 +3579,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 793937259462774155, guid: 46bc911e70a7b3c4298b69eaa1e2e776, type: 3}
propertyPath: m_SizeDelta.y
value: 58.64592
objectReference: {fileID: 0}
- target: {fileID: 793937259892021082, guid: 46bc911e70a7b3c4298b69eaa1e2e776, type: 3}
propertyPath: m_LocalPosition.x
value: 0
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment