Merge branch 'master' of https://github.com/conjureets/pillowfight

Conflicts:
	Assets/Prefabs/Child.prefab
	Assets/Scripts/Child.cs

Assets/Art/Materials/Pillow_Uv.mat

@@ -19,7 +19,7 @@ Material:
         first:
           name: _MainTex
         second:
-          m_Texture: {fileID: 0}
+          m_Texture: {fileID: 2800000, guid: 48ae88018d91f93498ab72c5e26bf101, type: 3}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:

Assets/Prefabs/Canvas.prefab

@@ -0,0 +1,519 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &120876
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22456076}
+  - 222: {fileID: 22298742}
+  - 114: {fileID: 11406010}
+  - 114: {fileID: 11469280}
+  m_Layer: 5
+  m_Name: Avatar 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &141632
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22484266}
+  - 222: {fileID: 22243016}
+  - 114: {fileID: 11406500}
+  - 114: {fileID: 11492118}
+  m_Layer: 5
+  m_Name: Avatar 3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &159978
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22441784}
+  - 222: {fileID: 22290148}
+  - 114: {fileID: 11404408}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &179446
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22413388}
+  - 223: {fileID: 22347678}
+  - 114: {fileID: 11461648}
+  - 114: {fileID: 11495014}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &180592
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22436868}
+  - 222: {fileID: 22259184}
+  - 114: {fileID: 11494372}
+  - 114: {fileID: 11470378}
+  m_Layer: 5
+  m_Name: Avatar 4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &183542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22443892}
+  - 114: {fileID: 11451246}
+  m_Layer: 5
+  m_Name: MomBehavior
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &188232
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22497504}
+  - 222: {fileID: 22291396}
+  - 114: {fileID: 11458950}
+  - 114: {fileID: 11429338}
+  m_Layer: 5
+  m_Name: Avatar 2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &11404408
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 159978}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Mom is coming!
+--- !u!114 &11406010
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120876}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &11406500
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 141632}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &11429338
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 188232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 278f19d622fc5894ba64fdd068822284, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &11451246
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 183542}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc7c5ec2b3918f14591f5f055ded72ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  WarningText: {fileID: 11404408}
+  MinTriggerTime: 30
+  MaxTriggerTime: 45
+  WarningHeadsupTime: 5
+  MotherStayTime: 5
+  RoomDoor: {fileID: 0}
+  Children:
+  - {fileID: 0}
+  - {fileID: 0}
+--- !u!114 &11458950
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 188232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &11461648
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 179446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!114 &11469280
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120876}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 278f19d622fc5894ba64fdd068822284, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &11470378
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 180592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 278f19d622fc5894ba64fdd068822284, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &11492118
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 141632}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 278f19d622fc5894ba64fdd068822284, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &11494372
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 180592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &11495014
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 179446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!222 &22243016
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 141632}
+--- !u!222 &22259184
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 180592}
+--- !u!222 &22290148
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 159978}
+--- !u!222 &22291396
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 188232}
+--- !u!222 &22298742
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120876}
+--- !u!223 &22347678
+Canvas:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 179446}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!224 &22413388
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 179446}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 22443892}
+  - {fileID: 22456076}
+  - {fileID: 22497504}
+  - {fileID: 22484266}
+  - {fileID: 22436868}
+  m_Father: {fileID: 0}
+  m_RootOrder: 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!224 &22436868
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 180592}
+  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: []
+  m_Father: {fileID: 22413388}
+  m_RootOrder: 4
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -84.5, y: 108}
+  m_SizeDelta: {x: 169, y: 216}
+  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22441784
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 159978}
+  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: []
+  m_Father: {fileID: 22443892}
+  m_RootOrder: 0
+  m_AnchorMin: {x: .25, y: .813253582}
+  m_AnchorMax: {x: .75, y: .961746514}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 7.62939453e-06}
+  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22443892
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 183542}
+  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: 22441784}
+  m_Father: {fileID: 22413388}
+  m_RootOrder: 0
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22456076
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120876}
+  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: []
+  m_Father: {fileID: 22413388}
+  m_RootOrder: 1
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 90, y: -113}
+  m_SizeDelta: {x: 169, y: 216}
+  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22484266
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 141632}
+  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: []
+  m_Father: {fileID: 22413388}
+  m_RootOrder: 3
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 84.5, y: 108}
+  m_SizeDelta: {x: 169, y: 216}
+  m_Pivot: {x: .5, y: .5}
+--- !u!224 &22497504
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 188232}
+  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: []
+  m_Father: {fileID: 22413388}
+  m_RootOrder: 2
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -84.5, y: -108}
+  m_SizeDelta: {x: 169, y: 216}
+  m_Pivot: {x: .5, y: .5}
+--- !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: 179446}
+  m_IsPrefabParent: 1

Assets/Prefabs/Canvas.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dec23153e975cb94db47e642092ad58e
+timeCreated: 1440346746
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Child.prefab

@@ -1069,7 +1069,10 @@ MonoBehaviour:
   GroundCheck: {fileID: 100272}
   pillow: {fileID: 0}
   Mom: {fileID: 0}
+  Avatar: {fileID: 0}
   Animator: {fileID: 9580008}
+  AnimationPillow: {fileID: 134552}
+  target: {fileID: 0}
 --- !u!114 &11446734
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1081,7 +1084,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e6ffb35a11ff1f545ac22f7ea752cffb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayerNumber: 0
+  PlayerNumber: 1
 --- !u!114 &11474836
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1093,7 +1096,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 567fe96dcacb08f4ab716a98ce99fc88, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  minAngleRange: 30
+  minAngleRange: 10
 --- !u!135 &13545904
 SphereCollider:
   m_ObjectHideFlags: 1
@@ -1116,7 +1119,7 @@ SphereCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: .75
+  m_Radius: .519999981
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &13685066
 CapsuleCollider:
@@ -1127,8 +1130,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: .5
+  m_Radius: .209999993
-  m_Height: 1
+  m_Height: 1.00999999
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!137 &13704276
@@ -1247,7 +1250,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 0}
       propertyPath: minAngleRange
-      value: 30
+      value: 10
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}

Assets/Prefabs/Kid_AnimControl.controller

@@ -14,7 +14,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
-  - m_Name: start_attack
+  - m_Name: StartAttack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
@@ -59,7 +59,7 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions:
   - m_ConditionMode: 1
-    m_ConditionEvent: start_attack
+    m_ConditionEvent: StartAttack
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 110284670}
@@ -434,7 +434,7 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions:
   - m_ConditionMode: 1
-    m_ConditionEvent: start_attack
+    m_ConditionEvent: StartAttack
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 110284670}

Assets/Scenes/Gameplay.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 878ea9e1b96f3d34285d8500e2f4d225
+timeCreated: 1440350160
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/LifeCanvasSimon.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3be4c537e70b60449a5a63731c7d6c9
+timeCreated: 1440338414
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/PatScene.unity

@@ -598,38 +598,6 @@ Prefab:
       propertyPath: Mom
       value: 
       objectReference: {fileID: 1257411050}
-    - target: {fileID: 11446734, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: PlayerNumber
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: hitPushBackForce
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 13685066, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: Speed
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480620, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_AngularDrag
-      value: .0500000007
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: yAngleVector
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480620, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_Mass
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: JumpForce
-      value: 200
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
   m_IsPrefabParent: 0
@@ -1046,6 +1014,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   PlayerCount: 4
+  mom: {fileID: 1257411050}
 --- !u!4 &945259370
 Transform:
   m_ObjectHideFlags: 0
@@ -1097,10 +1066,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 6472040, guid: 0839912c1546d474686e48f2f1ea76fe, type: 2}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 0839912c1546d474686e48f2f1ea76fe, type: 2}
   m_IsPrefabParent: 0
@@ -2554,6 +2519,14 @@ Prefab:
       propertyPath: Mom
       value: 
       objectReference: {fileID: 1257411050}
+    - target: {fileID: 11446734, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
+      propertyPath: PlayerNumber
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 134552, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
   m_IsPrefabParent: 0

Assets/Scripts/Child.cs

@@ -14,7 +14,9 @@ public class Child : MonoBehaviour
     public GameObject GroundCheck;
     public Pillow pillow;
     public MomBehavior Mom;
+	public PlayerAvatar Avatar;
     public Animator Animator;
+    public GameObject AnimationPillow;
 
     private Rigidbody _rb;
     private bool _isGrounded = false;
@@ -23,6 +25,7 @@ public class Child : MonoBehaviour
     private bool _isSleeping;
     private float _invulnerableTime;
     private Bed _currentBed;
+    private bool _isInLava;
 
     private int _index;
     private bool _isPushed = false;
@@ -31,6 +34,17 @@ public class Child : MonoBehaviour
 
     private float _stunTime;
 
+	private int _numZ = 0;
+	public int NumZ
+	{
+		get { return _numZ; }
+		set
+		{
+			_numZ = value;
+			Avatar.NumZ = _numZ;
+			if (_numZ == 3) Die();
+		}
+	}
     private AutoTarget _autoTarget;
 
     public int Index
@@ -48,9 +62,16 @@ public class Child : MonoBehaviour
     void Awake()
     {
         _rb = GetComponent<Rigidbody>();
+        AnimationPillow.SetActive(false);
+
         _autoTarget = GetComponent<AutoTarget>();
     }
 
+	void Start()
+	{
+		Avatar.PlayerNum = Index + 1;
+    }
+
     void Update()
     {
         Animator.SetBool("IsOnBed", GetBed());
@@ -184,6 +205,7 @@ public class Child : MonoBehaviour
     }
 
     public void Throw() {
+        if (_isInLava) return;
 
         if (pillow != null) {
 
@@ -207,6 +229,7 @@ public class Child : MonoBehaviour
             pillow = null;
 
             target = null;
+            Animator.SetTrigger("StartAttack");
         }
     }
 
@@ -219,11 +242,12 @@ public class Child : MonoBehaviour
             TakeLavaDamage();
             ActivateVibration(true);
             Animator.SetBool("IsOnLava", true);
+            _isInLava = true;
         }
         else
         {
             // Setup for the next time the player falls on the lava
-            _invulnerableTime = MaxInvulnerableTime;
+            //_invulnerableTime = MaxInvulnerableTime;
 
             if (collision.gameObject.tag == "Floor")
             {
@@ -238,6 +262,7 @@ public class Child : MonoBehaviour
         {
             ActivateVibration(false);
             Animator.SetBool("IsOnLava", false);
+            _isInLava = false;
         }
     }
 
@@ -292,13 +317,19 @@ public class Child : MonoBehaviour
         XInputDotNetPure.GamePad.SetVibration((XInputDotNetPure.PlayerIndex)_index, intensity, intensity);
     }
 
-    private void TakeLavaDamage()
+	private void TakeLavaDamage()
-    {
+	{
-        // TODO: Lose a life (probably) and become immune for ~ 2 or 3 seconds
+		NumZ += 1;
-        _invulnerableTime = 0f;
+		// TODO: Lose a life (probably) and become immune for ~ 2 or 3 seconds
-    }
+		_invulnerableTime = 0f;
+	}
 
-    void OnDestroy()
+	void Die()
+	{
+		Destroy(gameObject);
+	}
+
+	void OnDestroy()
     {
         ActivateVibration(false);
     }

Assets/Scripts/MomBehavior.cs

@@ -1,156 +1,157 @@
-using UnityEngine;
+using UnityEngine;
-using System.Collections;
+using System.Collections;
-using UnityEngine.UI;
+using UnityEngine.UI;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System;
+using System;
-using MenusHandler;
+using MenusHandler;
-using InputHandler;
+using InputHandler;
-
+
-public class MomBehavior : MonoBehaviour
+public class MomBehavior : MonoBehaviour
-{
+{
-    public Action OnEnterRoom;
+    public Action OnEnterRoom;
-    public Action OnLeaveRoom;
+    public Action OnLeaveRoom;
-
+
-    public Text WarningText;
+    public Text WarningText;
-    public float MinTriggerTime = 60f;
+    public float MinTriggerTime = 60f;
-    public float MaxTriggerTime = 90f;
+    public float MaxTriggerTime = 90f;
-    public float WarningHeadsupTime = 5f;
+    public float WarningHeadsupTime = 5f;
-    public float MotherStayTime = 2f;
+    public float MotherStayTime = 2f;
-    public Door RoomDoor;
+    public Door RoomDoor;
-
+
-    public Child[] Children;
+    public Child[] Children;
-
+
-    public enum State { Away, Warning, InRoom }
+    public enum State { Away, Warning, InRoom }
-
+
-    private State _currentState;
+    private State _currentState;
-
+
-    private float _elapsedTime = 0f;
+    private float _elapsedTime = 0f;
-
+
-    private float _nextTriggerTime;
+    private float _nextTriggerTime;
-
+
-    private bool _gameOver = false;
+    private bool _gameOver = false;
-
+
-    public bool IsInRoom
+    public bool IsInRoom
-    {
+    {
-        get { return _currentState == State.InRoom; }
+        get { return _currentState == State.InRoom; }
-    }
+    }
-
+
-    void Awake()
+    void Awake()
-    {
+    {
-        _nextTriggerTime = GetNextTriggerTime();
+        _nextTriggerTime = GetNextTriggerTime();
-    }
+    }
-
+
-    void Update()
+    void Update()
-    {
+    {
-        if (_gameOver) return;
+        if (_gameOver) return;
-
+
-        // When the mom hasn't been triggered for a while, it can appear anytime between 2 borders
+        // When the mom hasn't been triggered for a while, it can appear anytime between 2 borders
-
+
-        _elapsedTime += Time.deltaTime;
+        _elapsedTime += Time.deltaTime;
-
+
-        switch (_currentState)
+        switch (_currentState)
-        {
+        {
-            case State.Away:
+            case State.Away:
-                if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime)
+                if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime)
-                {
+                {
-                    SetState(State.Warning);
+                    SetState(State.Warning);
-                }
+                }
-                break;
+                break;
-            case State.Warning:
+            case State.Warning:
-                if (_elapsedTime >= _nextTriggerTime)
+                if (_elapsedTime >= _nextTriggerTime)
-                {
+                {
-                    SetState(State.InRoom);
+                    SetState(State.InRoom);
-                }
+                }
-                break;
+                break;
-            case State.InRoom:
+            case State.InRoom:
-                if (_elapsedTime >= MotherStayTime)
+                if (_elapsedTime >= MotherStayTime)
-                {
+                {
-                    SetState(State.Away);
+                    SetState(State.Away);
-                }
+                }
-
+
-                CheckIfSleeping();
+                CheckIfSleeping();
-                break;
+                break;
-        }
+        }
-    }
+    }
-
+
-    private void SetState(State newState)
+    private void SetState(State newState)
-    {
+    {
-        switch (newState)
+        switch (newState)
-        {
+        {
-            case State.Away:
+            case State.Away:
-                RoomDoor.Close(OnLeaveRoom);
+                RoomDoor.Close(OnLeaveRoom);
-                _elapsedTime = 0f;
+                _elapsedTime = 0f;
-                break;
+                break;
-            case State.Warning:
+            case State.Warning:
-                // Temporary
+                // Temporary
-                WarningText.gameObject.SetActive(true);
+                WarningText.gameObject.SetActive(true);
-
+
-                RoomDoor.Open();
+                RoomDoor.Open();
-                break;
+                break;
-            case State.InRoom:
+            case State.InRoom:
-                // Temporary
+                // Temporary
-                WarningText.gameObject.SetActive(false);
+                WarningText.gameObject.SetActive(false);
-                _nextTriggerTime = GetNextTriggerTime();
+                _nextTriggerTime = GetNextTriggerTime();
-
+
-                _elapsedTime = 0f;
+                _elapsedTime = 0f;
-
+
-                if (OnEnterRoom != null)
+                if (OnEnterRoom != null)
-                {
+                {
-                    OnEnterRoom();
+                    OnEnterRoom();
-                }
+                }
-                break;
+                break;
-        }
+        }
-
+
-        _currentState = newState;
+        _currentState = newState;
-    }
+    }
-
+
-    public State GetState(){
+    public State GetState(){
-        return _currentState;
+        return _currentState;
-    }
+    }
-
+
-    private void CheckIfSleeping()
+    private void CheckIfSleeping()
-    {
+    {
-        List<Child> safeChildren = new List<Child>();
+        List<Child> safeChildren = new List<Child>();
-
+
-        foreach (Child child in Children)
+        foreach (Child child in Children)
-        {
+        {
-            if (child == null) continue;
+            if (child == null) continue;
-
+
-            if (child.IsSleeping)
+            if (child.IsSleeping)
-            {
+            {
-                safeChildren.Add(child);
+                safeChildren.Add(child);
-            }
+            }
-            else
+            else
-            {
+            {
-                Debug.Log("Player " + child.Index + " has been spotted by mom.");
+                Debug.Log("Player " + child.Index + " has been spotted by mom.");
-
+
-                // TODO: Visual animation that the player lost (lasso?)
+                // TODO: Visual animation that the player lost (lasso?)
-
+
-                Destroy(child.gameObject);
+				child.NumZ = 4;
-            }
+                Destroy(child.gameObject);
-        }
+            }
-
+        }
-        if (safeChildren.Count == 0)
+
-        {
+        if (safeChildren.Count == 0)
-            Debug.Log("Mom wins!");
+        {
-
+            Debug.Log("Mom wins!");
-            MenusManager.Instance.ShowMenu("MomWinsMenu");
+
-
+            MenusManager.Instance.ShowMenu("MomWinsMenu");
-            _gameOver = true;
+
-        }
+            _gameOver = true;
-        else if (safeChildren.Count == 1)
+        }
-        {
+        else if (safeChildren.Count == 1)
-            Debug.Log("Player " + safeChildren[0].Index + " wins!");
+        {
-
+            Debug.Log("Player " + safeChildren[0].Index + " wins!");
-            PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu");
+
-            menu.SetPlayerIndex(safeChildren[0].Index);
+            PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu");
-
+            menu.SetPlayerIndex(safeChildren[0].Index);
-            _gameOver = true;
+
-        }
+            _gameOver = true;
-    }
+        }
-
+    }
-    private float GetNextTriggerTime()
+
-    {
+    private float GetNextTriggerTime()
-        return UnityEngine.Random.Range(MinTriggerTime, MaxTriggerTime);
+    {
-    }
+        return UnityEngine.Random.Range(MinTriggerTime, MaxTriggerTime);
-}
+    }
+}

Assets/Scripts/PlayerAvatar.cs

@@ -0,0 +1,71 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+
+[RequireComponent(typeof(Image))]
+public class PlayerAvatar : MonoBehaviour {
+
+	private const int NumSprites = 5;
+
+	private Sprite[] _sprites;
+	private int _playerNum;
+	private Image _image;
+	private int _numZ;
+	public int NumZ
+	{
+		get
+		{
+			return _numZ;
+		}
+		set
+		{
+			_numZ = value;
+			_image.sprite = _sprites[_numZ];
+			if(_numZ == 3)
+				StartCoroutine(Die());
+		}
+	}
+
+	public int PlayerNum
+	{
+		set
+		{
+			_playerNum = value; //child.Index + 1;
+
+			//0 - 3 - Number of Z
+			//    4 - Dead
+			_sprites = new Sprite[NumSprites];
+
+			for (int i = 0; i < NumSprites; i++)
+			{
+				_sprites[i] = Resources.Load<Sprite>("UI_P" + _playerNum + "_" + i);
+			}
+
+			gameObject.SetActive(true);
+
+			NumZ = _numZ;
+		}
+	}
+
+	private int curr;
+	private float time = 1f;
+
+	// Use this for initialization
+	void Awake () 
+	{
+		_image = GetComponent<Image>();
+		_numZ = 0;
+	}
+
+	// Update is called once per frame
+	void Update () 
+	{
+	}
+
+	IEnumerator Die()
+	{
+		yield return new WaitForSeconds(1.2f);
+		NumZ = 4;
+	}
+
+}

Assets/Scripts/PlayerAvatar.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 278f19d622fc5894ba64fdd068822284
+timeCreated: 1440338837
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7b0e8f99ac896364c8e096b14fac788b
+folderAsset: yes
+timeCreated: 1440338566
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P1_0.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: be26e8d14bec3b84d98ed4529b184923
+guid: 32ef2fd25049b984cab324df2bdf0832
-timeCreated: 1440311909
+timeCreated: 1440339593
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
@@ -30,22 +30,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
+    wrapMode: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
-  textureType: -1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

Assets/UI/Resources/UI_P1_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: fc00908bd49720045a634752e2064338
+guid: ba14b0d50e47f3941b43e1782b075d2d
-timeCreated: 1440311912
+timeCreated: 1440339594
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
@@ -30,22 +30,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
+    wrapMode: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
-  textureType: -1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

Assets/UI/Resources/UI_P1_2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 9cb56e1b9e0bf974b93d6132c10ac17e
+guid: ecc2a9e7b56c53b44a888710237b8ac3
-timeCreated: 1440311906
+timeCreated: 1440339594
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
@@ -30,22 +30,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
+    wrapMode: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
-  textureType: -1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

Assets/UI/Resources/UI_P1_3.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d09536caab3bd214cae76208257fecff
+guid: 7dd28e3b5e915cc4b9b2e7091d5296d0
-timeCreated: 1440311910
+timeCreated: 1440339594
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
@@ -30,22 +30,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
+    wrapMode: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
-  textureType: -1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

Assets/UI/Resources/UI_P1_4.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 49a7f4622090bdb45a4fbc886fdfb916
+timeCreated: 1440339593
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P2_0.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: e06a41f1643dbac4595002871a5e5d53
+timeCreated: 1440338588
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P2_1.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 10404f9b22fe2a148ad883d271da76e0
+timeCreated: 1440338587
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P2_2.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 6fb3add0bf5619c4b95933df09116277
+timeCreated: 1440338588
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P2_3.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 86c7586eab4e5954f8bafeb018fd1ed0
+timeCreated: 1440338588
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Resources/UI_P2_4.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 2ce2dd05085d5f346bf7978c08cf9c2a
+timeCreated: 1440338588
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/UI_P2_noZ.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: f11bad74d0dac4046a4957fd043e5a6a
-timeCreated: 1440311911
-licenseType: Free
-TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 2
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    linearTexture: 0
-    correctGamma: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: .25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 0
-  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
-  seamlessCubemap: 0
-  textureFormat: -1
-  maxTextureSize: 2048
-  textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: .5, y: .5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
-  buildTargetSettings: []
-  spriteSheet:
-    sprites: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.2f1
+m_EditorVersion: 5.0.2f1
 m_StandardAssetsVersion: 0