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

Assets/Prefabs/Canvas.prefab

@@ -164,7 +164,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -185,7 +185,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -214,8 +214,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   WarningText: {fileID: 11404408}
-  MinTriggerTime: 30
+  MinTriggerTime: 20
-  MaxTriggerTime: 45
+  MaxTriggerTime: 30
   WarningHeadsupTime: 5
   MotherStayTime: 5
   RoomDoor: {fileID: 0}
@@ -237,7 +237,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -312,7 +312,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -415,10 +415,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 22413388}
   m_RootOrder: 4
-  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMin: {x: .810000002, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: .300000012}
-  m_AnchoredPosition: {x: -84.5, y: 108}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 169, y: 216}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
 --- !u!224 &22441784
 RectTransform:
@@ -467,10 +467,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 22413388}
   m_RootOrder: 1
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: .699999988}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: .189999998, y: 1}
-  m_AnchoredPosition: {x: 90, y: -113}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 169, y: 216}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
 --- !u!224 &22484266
 RectTransform:
@@ -485,9 +485,9 @@ RectTransform:
   m_Father: {fileID: 22413388}
   m_RootOrder: 3
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: .189999998, y: .300000012}
-  m_AnchoredPosition: {x: 84.5, y: 108}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 169, y: 216}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
 --- !u!224 &22497504
 RectTransform:
@@ -501,10 +501,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 22413388}
   m_RootOrder: 2
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: .810000002, y: .699999988}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -84.5, y: -108}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 169, y: 216}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
 --- !u!1001 &100100000
 Prefab:

Assets/Scenes/Gameplay.unity

@@ -608,6 +608,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 88e55981fb5053743beab34a961a19e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &638369586 stripped
+MonoBehaviour:
+  m_PrefabParentObject: {fileID: 11406004, guid: 7b2324b0ba2cbba47a32db098a5a4a3b,
+    type: 2}
+  m_PrefabInternal: {fileID: 488401107}
+  m_Script: {fileID: 11500000, guid: dd2c12784e85d194ca7216a12233e1fa, type: 3}
 --- !u!1001 &673576178
 Prefab:
   m_ObjectHideFlags: 0
@@ -645,7 +651,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2}
       propertyPath: m_AnchoredPosition.x
@@ -691,146 +697,14 @@ Prefab:
       propertyPath: RoomDoor
       value: 
       objectReference: {fileID: 544939640}
-    - target: {fileID: 120876, guid: dec23153e975cb94db47e642092ad58e, type: 2}
+    - target: {fileID: 11451246, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_IsActive
+      propertyPath: Children.Array.data[0]
-      value: 0
+      value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 981569108}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
+    - target: {fileID: 11451246, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMin.x
+      propertyPath: Children.Array.data[1]
-      value: 0
+      value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 638369586}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.x
-      value: .189999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMin.y
-      value: .699999988
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 11406010, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_PreserveAspect
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 188232, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMin.y
-      value: .699999988
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMin.x
-      value: .810000002
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 141632, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.x
-      value: .189999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.y
-      value: .300000012
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 11406500, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_PreserveAspect
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11458950, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_PreserveAspect
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 180592, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMin.x
-      value: .810000002
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchorMax.y
-      value: .300000012
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 11494372, guid: dec23153e975cb94db47e642092ad58e, type: 2}
-      propertyPath: m_PreserveAspect
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: dec23153e975cb94db47e642092ad58e, type: 2}
   m_IsPrefabParent: 0
@@ -1220,10 +1094,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
@@ -1273,6 +1143,12 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 9f2c38d0d3154bc4d8148a949b98af28, type: 2}
   m_IsPrefabParent: 0
+--- !u!114 &981569108 stripped
+MonoBehaviour:
+  m_PrefabParentObject: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09,
+    type: 2}
+  m_PrefabInternal: {fileID: 1928589739}
+  m_Script: {fileID: 11500000, guid: dd2c12784e85d194ca7216a12233e1fa, type: 3}
 --- !u!1001 &987851018
 Prefab:
   m_ObjectHideFlags: 0

Assets/Scripts/Child.cs

@@ -358,6 +358,9 @@ public class Child : MonoBehaviour
 
 	void Die()
 	{
+        PlayerWinsMenu menu = (PlayerWinsMenu)MenusHandler.MenusManager.Instance.ShowMenu("PlayerWinsMenu");
+        menu.SetPlayerIndex(this.Index);
+
 		Destroy(gameObject);
 	}
 

Assets/Scripts/MomBehavior.cs

@@ -116,6 +116,8 @@ public class MomBehavior : MonoBehaviour
         {
             if (child == null) continue;
 
+            Debug.Log(child.IsSleeping);
+
             if (child.IsSleeping)
             {
                 safeChildren.Add(child);

Assets/UI/Resources/UI_P2_0.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: e06a41f1643dbac4595002871a5e5d53
+guid: fbc5a3f21b953ea4ca66189910320d64
-timeCreated: 1440338588
+timeCreated: 1440352933
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Assets/UI/Resources/UI_P2_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 10404f9b22fe2a148ad883d271da76e0
+guid: bc957cb3031b7e849a0265eef1496b33
-timeCreated: 1440338587
+timeCreated: 1440352933
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Assets/UI/Resources/UI_P2_2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 6fb3add0bf5619c4b95933df09116277
+guid: 6c5853d409a55a040802a54246c34e0d
-timeCreated: 1440338588
+timeCreated: 1440352933
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Assets/UI/Resources/UI_P2_3.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 86c7586eab4e5954f8bafeb018fd1ed0
+guid: 0178734c2561b9a4eba97902b2338ce0
-timeCreated: 1440338588
+timeCreated: 1440352932
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Assets/UI/Resources/UI_P2_4.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 2ce2dd05085d5f346bf7978c08cf9c2a
+guid: 6178327a280efa2458c291a7962e815f
-timeCreated: 1440338588
+timeCreated: 1440352932
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Assets/UI/Resources/UI_P3_0.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: fbc5a3f21b953ea4ca66189910320d64
-timeCreated: 1440352933
-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_P3_1.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: bc957cb3031b7e849a0265eef1496b33
-timeCreated: 1440352933
-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_P3_2.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: 6c5853d409a55a040802a54246c34e0d
-timeCreated: 1440352933
-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_P3_3.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: 0178734c2561b9a4eba97902b2338ce0
-timeCreated: 1440352932
-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_P3_4.png.meta

@@ -1,55 +0,0 @@
-fileFormatVersion: 2
-guid: 6178327a280efa2458c291a7962e815f
-timeCreated: 1440352932
-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: 

ProjectSettings/ProjectVersion.txt

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