Commit b0665e8f authored by Andrew R Van Buren's avatar Andrew R Van Buren

Merge branch 'slowHazard' into 'master'

new file:   Assets/Prefabs/Tiles/Hazards/SlowHazard.prefab

See merge request !62
parents a76b053a 6c8e09a2
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1342508516649342}
m_IsPrefabParent: 1
--- !u!1 &1342508516649342
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4858048823201592}
- component: {fileID: 212565399641507256}
- component: {fileID: 61962673765767924}
- component: {fileID: 114034619622831846}
m_Layer: 0
m_Name: SlowHazard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4858048823201592
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1342508516649342}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.841839, y: 3.0148718, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &61962673765767924
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1342508516649342}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: 1, y: 1}
--- !u!114 &114034619622831846
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1342508516649342}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44c3e6c59af00de45b780a24a2fee2f3, type: 3}
m_Name:
m_EditorClassIdentifier:
inputButtons:
disableScripts: []
--- !u!212 &212565399641507256
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1342508516649342}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ecc50e2d91b605e489b575ade855bbbc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
fileFormatVersion: 2
guid: 756433204c6fec04c9b72414f64cc8cb
timeCreated: 1492733469
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -128,7 +128,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4045396142737594, guid: db5e8a1e71fe955478cf51c1f332836a, type: 2}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 114188013725194092, guid: db5e8a1e71fe955478cf51c1f332836a,
type: 2}
......@@ -374,7 +374,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &141586926 stripped
MonoBehaviour:
......@@ -714,7 +714,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4340557329068104, guid: 294123b456fc7644cb0e5b11c0d5a750, type: 2}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1139495411747536, guid: 294123b456fc7644cb0e5b11c0d5a750, type: 2}
propertyPath: m_Name
......@@ -962,7 +962,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &599106627 stripped
Transform:
......@@ -1308,7 +1308,7 @@ ParticleSystem:
m_GameObject: {fileID: 920148520}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 1
prewarm: 0
playOnAwake: 1
......@@ -3974,7 +3974,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4766587421979404, guid: dfa71b7b6162c694ab929717dd70b38d, type: 2}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4893306079521950, guid: dfa71b7b6162c694ab929717dd70b38d, type: 2}
propertyPath: m_LocalScale.z
......@@ -4347,7 +4347,6 @@ GameObject:
- component: {fileID: 1118525861}
- component: {fileID: 1118525860}
- component: {fileID: 1118525859}
- component: {fileID: 1118525863}
m_Layer: 5
m_Name: UI
m_TagString: Untagged
......@@ -4423,26 +4422,13 @@ RectTransform:
m_Children:
- {fileID: 1670713437}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1118525863
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1118525858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44c3e6c59af00de45b780a24a2fee2f3, type: 3}
m_Name:
m_EditorClassIdentifier:
inputButtons:
disableScripts: []
--- !u!1 &1149247900
GameObject:
m_ObjectHideFlags: 1
......@@ -4492,7 +4478,7 @@ Transform:
- {fileID: 2100709142}
- {fileID: 920148521}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1165012031 stripped
Transform:
......@@ -4525,7 +4511,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1183635617 stripped
Transform:
......@@ -4611,7 +4597,7 @@ Transform:
- {fileID: 242534398}
- {fileID: 762486095}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1212815706 stripped
Transform:
......@@ -5162,6 +5148,48 @@ Transform:
m_PrefabParentObject: {fileID: 4119761789307654, guid: 62ae6ed35b2b21e44addf1fac24fab7f,
type: 2}
m_PrefabInternal: {fileID: 1587378847}
--- !u!1001 &1474434506
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalPosition.x
value: 1.841839
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalPosition.y
value: 3.0148718
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4858048823201592, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 756433204c6fec04c9b72414f64cc8cb, type: 2}
m_IsPrefabParent: 0
--- !u!4 &1487508433 stripped
Transform:
m_PrefabParentObject: {fileID: 4854154196249452, guid: ba720387896779247b89aad1c0b34f7a,
......@@ -6005,7 +6033,7 @@ ParticleSystem:
m_GameObject: {fileID: 2100709141}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 0
prewarm: 0
playOnAwake: 1
......
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