Commit 26daf705 authored by Tommé Nöll's avatar Tommé Nöll
Browse files

Merge branch 'tomme'

parents d9b5cdff e9b49d21
......@@ -671,7 +671,7 @@ Transform:
m_LocalScale: {x: -1.3037286, y: 1.3037285, z: 1.3037285}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &12611045
GameObject:
......@@ -8066,7 +8066,7 @@ PrefabInstance:
type: 3}
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 453277137}
objectReference: {fileID: 339937315}
- target: {fileID: 8811539149977030266, guid: 388a7af523fdebaafad4a5d1ae1a896b,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -321642,7 +321642,7 @@ PrefabInstance:
- target: {fileID: 4299515142723178169, guid: f14a31cd0973c5d4ba4409f4f15fafc6,
type: 3}
propertyPath: m_RootOrder
value: 16
value: 15
objectReference: {fileID: 0}
- target: {fileID: 4299515142723178169, guid: f14a31cd0973c5d4ba4409f4f15fafc6,
type: 3}
......@@ -324275,7 +324275,7 @@ Light:
serializedVersion: 9
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Intensity: 0.36
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.802082
......@@ -325317,6 +325317,40 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!84 &339937315
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1324
m_Height: 533
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &340149670
GameObject:
m_ObjectHideFlags: 0
......@@ -326429,7 +326463,7 @@ PrefabInstance:
- target: {fileID: 329613192511979808, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 329613192511979808, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
......@@ -326515,7 +326549,7 @@ PrefabInstance:
type: 3}
propertyPath: fadeToBlack.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1318299004}
objectReference: {fileID: 1798298060}
- target: {fileID: 5884834992861905281, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
propertyPath: fadeToGame.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
......@@ -326530,7 +326564,7 @@ PrefabInstance:
type: 3}
propertyPath: fadeToGame.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1318299004}
objectReference: {fileID: 1798298060}
- target: {fileID: 5884834992861905281, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
propertyPath: fadeToBlack.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -331817,40 +331851,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!84 &453277137
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1324
m_Height: 533
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &455893536
GameObject:
m_ObjectHideFlags: 0
......@@ -336040,18 +336040,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 06fbf7db35d55695abcead7a289ebba3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &537876554 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4235653480082144191, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
m_PrefabInstance: {fileID: 537876551}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5f394753a60eb649a49d4bc92ff65e3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &538896620
GameObject:
m_ObjectHideFlags: 0
......@@ -341950,7 +341938,7 @@ Transform:
- {fileID: 332592162}
- {fileID: 1364032590}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &579087468
GameObject:
......@@ -356289,7 +356277,7 @@ Transform:
- {fileID: 240343365}
- {fileID: 1496264311}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &864413006
GameObject:
......@@ -360098,7 +360086,7 @@ Transform:
m_Children:
- {fileID: 808111434}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &932789770
GameObject:
......@@ -363982,21 +363970,21 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6445881420722720513, guid: a293ce69590914146af432dce7fd09b8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
- target: {fileID: 6445881420722720513, guid: a293ce69590914146af432dce7fd09b8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ReloadScene
objectReference: {fileID: 0}
- target: {fileID: 6445881421846777213, guid: a293ce69590914146af432dce7fd09b8,
- target: {fileID: 6445881420722720513, guid: a293ce69590914146af432dce7fd09b8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
- target: {fileID: 6445881421846777213, guid: a293ce69590914146af432dce7fd09b8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 6445881421846777213, guid: a293ce69590914146af432dce7fd09b8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -377324,7 +377312,7 @@ Transform:
m_LocalScale: {x: -1.2586467, y: 1.2586467, z: 1.2586467}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1269056912 stripped
Transform:
......@@ -380483,18 +380471,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1318299004 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1139858347525294794, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
m_PrefabInstance: {fileID: 2043075725}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cf64f76be732ab4491d7683694500d1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1321722729
GameObject:
m_ObjectHideFlags: 0
......@@ -445850,7 +445826,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 513901384930671261, guid: c40aeaa0bb0a42c48a09a6d3cb5bfbad,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -447610,7 +447586,7 @@ PrefabInstance:
- target: {fileID: 6098262288883245936, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 6098262288883245936, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
......@@ -447631,12 +447607,12 @@ PrefabInstance:
type: 3}
propertyPath: scene
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 9062855885143663086, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: health
value:
objectReference: {fileID: 537876554}
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
--- !u!1 &1632856609
......@@ -452147,7 +452123,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 5793228996247555833, guid: 850f8a4a61e474549807b0db4aa70b32,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -452157,7 +452133,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 5793228996366111379, guid: 850f8a4a61e474549807b0db4aa70b32,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -452167,7 +452143,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 5793228997577829763, guid: 850f8a4a61e474549807b0db4aa70b32,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -452192,7 +452168,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 537876553}
objectReference: {fileID: 0}
- target: {fileID: 5793228997190902991, guid: 850f8a4a61e474549807b0db4aa70b32,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......@@ -454306,7 +454282,7 @@ PrefabInstance:
- target: {fileID: 4614416940103635218, guid: daa075972b0adc948b66475bdcd98aa3,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 8
objectReference: {fileID: 0}
- target: {fileID: 4614416940103635218, guid: daa075972b0adc948b66475bdcd98aa3,
type: 3}
......@@ -454568,7 +454544,7 @@ PrefabInstance:
- target: {fileID: 4391194054061318390, guid: 705ec54aa607bc34a84ab1b394757040,
type: 3}
propertyPath: m_RootOrder
value: 15
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4391194054061318390, guid: 705ec54aa607bc34a84ab1b394757040,
type: 3}
......@@ -455467,6 +455443,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1798298060 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1139858347525294794, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
m_PrefabInstance: {fileID: 537876551}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cf64f76be732ab4491d7683694500d1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1803771713
GameObject:
m_ObjectHideFlags: 0
......@@ -455839,7 +455827,7 @@ PrefabInstance:
- target: {fileID: 1160522745889886255, guid: 72dd1f6442b45de46a88d6cac27cec02,
type: 3}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: 1160522745889886255, guid: 72dd1f6442b45de46a88d6cac27cec02,
type: 3}
......@@ -464938,7 +464926,7 @@ Transform:
- {fileID: 491629615}
- {fileID: 288841294}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2010472642
GameObject:
......@@ -466046,138 +466034,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &2043075725
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4235653480055822323, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_Name
value: Hud Canvas
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480082144191, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: playerObject
value:
objectReference: {fileID: 1876958555}
- target: {fileID: 865960382, guid: 22f087369170b3c4cbbd6bd02b1c3a5a, type: 3}
propertyPath: m_SizeDelta.x
value: 200
objectReference: {fileID: 0}
- target: {fileID: 865960382, guid: 22f087369170b3c4cbbd6bd02b1c3a5a, type: 3}
propertyPath: m_SizeDelta.y
value: 50
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 22f087369170b3c4cbbd6bd02b1c3a5a, type: 3}
--- !u!1 &2044772630
GameObject:
m_ObjectHideFlags: 0
......@@ -468636,7 +468492,7 @@ PrefabInstance:
- target: {fileID: 4794031997108304393, guid: 703645f56b4c18a5182c6e3565329cf8,
type: 3}
propertyPath: m_RootOrder
value: 17
value: 16
objectReference: {fileID: 0}
- target: {fileID: 4794031997108304393, guid: 703645f56b4c18a5182c6e3565329cf8,
type: 3}
......@@ -470305,7 +470161,7 @@ Transform:
m_Children:
- {fileID: 1520054293}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!19719996 &2108704680
TilemapCollider2D:
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