diff --git a/Assets/Prefabs/Pillow.prefab b/Assets/Prefabs/Pillow.prefab index 8509ca1..2c25f8f 100644 Binary files a/Assets/Prefabs/Pillow.prefab and b/Assets/Prefabs/Pillow.prefab differ diff --git a/Assets/Scenes/Menu.meta b/Assets/Scenes/Menu.meta new file mode 100644 index 0000000..49037e3 --- /dev/null +++ b/Assets/Scenes/Menu.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d404e62e3567a964e83a214780788af1 +folderAsset: yes +timeCreated: 1440311992 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Menu/SplashScreen.unity b/Assets/Scenes/Menu/SplashScreen.unity new file mode 100644 index 0000000..da3806b Binary files /dev/null and b/Assets/Scenes/Menu/SplashScreen.unity differ diff --git a/Assets/Scenes/Menu/SplashScreen.unity.meta b/Assets/Scenes/Menu/SplashScreen.unity.meta new file mode 100644 index 0000000..1aab3b5 --- /dev/null +++ b/Assets/Scenes/Menu/SplashScreen.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b2eb616249d9754989b2f45347725c8 +timeCreated: 1440314046 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Child.cs b/Assets/Scripts/Child.cs index 6cbad46..cbb1b8f 100644 --- a/Assets/Scripts/Child.cs +++ b/Assets/Scripts/Child.cs @@ -59,7 +59,7 @@ public class Child : MonoBehaviour Pillow incomingPillow = other.GetComponent(); // picking up a pillow - if (this.pillow == null && !incomingPillow.IsThrown) { + if (this.pillow == null && incomingPillow.IsPickable) { pillow = incomingPillow; diff --git a/Assets/Scripts/Floor.cs b/Assets/Scripts/Floor.cs index a058e06..9ffde24 100644 --- a/Assets/Scripts/Floor.cs +++ b/Assets/Scripts/Floor.cs @@ -7,12 +7,16 @@ public class Floor : MonoBehaviour public GameObject NormalFloor; public GameObject LavaFloor; + public float PillowWaitTime = 2f; public MeshRenderer Renderer; + private GameObject lostPillows; + void Awake() { Mom.OnEnterRoom += ChangeToNormalFloor; Mom.OnLeaveRoom += ChangeToLavaFloor; + lostPillows = transform.GetChild(0).gameObject; } private void ChangeToNormalFloor() @@ -20,6 +24,7 @@ public class Floor : MonoBehaviour NormalFloor.SetActive(true); LavaFloor.SetActive(false); gameObject.tag = "Floor"; // Might not be necessary since the player is most likely "dead" if he touches a non-lava floor + lostPillows.SetActive(true); } private void ChangeToLavaFloor() @@ -27,6 +32,7 @@ public class Floor : MonoBehaviour NormalFloor.SetActive(false); LavaFloor.SetActive(true); gameObject.tag = "Lava"; // Might not be necessary since the player is most likely "dead" if he touches a non-lava floor + lostPillows.SetActive(false); } void OnDestroy() @@ -34,4 +40,17 @@ public class Floor : MonoBehaviour Mom.OnEnterRoom -= ChangeToNormalFloor; Mom.OnLeaveRoom -= ChangeToLavaFloor; } + + void OnCollisionEnter(Collision other) { + if (other.gameObject.tag == "Pillow") { + other.gameObject.GetComponent().IsPickable = false; + other.gameObject.GetComponent().IsLost = true; + StartCoroutine( MakePillowDisappear(other.transform) ); + } + } + + IEnumerator MakePillowDisappear( Transform pillow ) { + yield return new WaitForSeconds(PillowWaitTime); + pillow.transform.parent = lostPillows.transform; + } } diff --git a/Assets/Scripts/Menus/SimpleMenu.cs b/Assets/Scripts/Menus/SimpleMenu.cs new file mode 100644 index 0000000..69e1f87 --- /dev/null +++ b/Assets/Scripts/Menus/SimpleMenu.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; + +public class SimpleMenu : MonoBehaviour +{ + // Use this for initialization + void Start () { + //TODO Use XInput to + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Scripts/Menus/SimpleMenu.cs.meta b/Assets/Scripts/Menus/SimpleMenu.cs.meta new file mode 100644 index 0000000..e4e193a --- /dev/null +++ b/Assets/Scripts/Menus/SimpleMenu.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 769d2d55a9b6b104baa54b6081fbe205 +timeCreated: 1440313599 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Pillow.cs b/Assets/Scripts/Pillow.cs index 202de66..6c9cf1b 100644 --- a/Assets/Scripts/Pillow.cs +++ b/Assets/Scripts/Pillow.cs @@ -7,8 +7,9 @@ public class Pillow : MonoBehaviour { public float LerpDuration = 2f; public bool IsThrown = false; - - private bool IsPickable = true; + + public bool IsPickable = true; + public bool IsLost = false; private Collider _col; private Rigidbody _rb; @@ -70,7 +71,7 @@ public class Pillow : MonoBehaviour { } void OnCollisionEnter(Collision other) { - if (!IsPickable) { + if (!IsPickable && !IsLost) { // on first collision, revert the pillow as pickable MakePickable(); } @@ -81,8 +82,9 @@ public class Pillow : MonoBehaviour { IsThrown = true; IsPickable = false; transform.parent = null; // detach the pillow from the child object + _rb.isKinematic = false; - _col.enabled = true; + _rb.AddForce(force, ForceMode.Impulse); _renderer.material.color = _defaultColor; } @@ -91,7 +93,6 @@ public class Pillow : MonoBehaviour { IsThrown = false; IsPickable = true; - _col.enabled = true; _rb.isKinematic = false; } diff --git a/Assets/UI.meta b/Assets/UI.meta new file mode 100644 index 0000000..5c7011f --- /dev/null +++ b/Assets/UI.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4ed0512c82b24294eae9b226a7d9201d +folderAsset: yes +timeCreated: 1440311906 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/Luna.ttf b/Assets/UI/Luna.ttf new file mode 100644 index 0000000..327ce75 Binary files /dev/null and b/Assets/UI/Luna.ttf differ diff --git a/Assets/UI/Luna.ttf.meta b/Assets/UI/Luna.ttf.meta new file mode 100644 index 0000000..95d187a --- /dev/null +++ b/Assets/UI/Luna.ttf.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 2748d21ac3bd9624aa11828f49d252b0 +timeCreated: 1440311912 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/UI_1.png b/Assets/UI/UI_1.png new file mode 100644 index 0000000..bfd8ccb Binary files /dev/null and b/Assets/UI/UI_1.png differ diff --git a/Assets/UI/UI_1.png.meta b/Assets/UI/UI_1.png.meta new file mode 100644 index 0000000..80b7a4d --- /dev/null +++ b/Assets/UI/UI_1.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 7d820b9be48433a4ab83f8969c30e357 +timeCreated: 1440311906 +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: diff --git a/Assets/UI/UI_2.png b/Assets/UI/UI_2.png new file mode 100644 index 0000000..91912f7 Binary files /dev/null and b/Assets/UI/UI_2.png differ diff --git a/Assets/UI/UI_2.png.meta b/Assets/UI/UI_2.png.meta new file mode 100644 index 0000000..f6946e2 --- /dev/null +++ b/Assets/UI/UI_2.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: f3d3ef37900bd8948809c5fccef7a879 +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: diff --git a/Assets/UI/UI_3.png b/Assets/UI/UI_3.png new file mode 100644 index 0000000..3cea317 Binary files /dev/null and b/Assets/UI/UI_3.png differ diff --git a/Assets/UI/UI_3.png.meta b/Assets/UI/UI_3.png.meta new file mode 100644 index 0000000..2365648 --- /dev/null +++ b/Assets/UI/UI_3.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: e66457bd0b3e14c44a8aaed768d2ca9a +timeCreated: 1440311910 +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: diff --git a/Assets/UI/UI_BtnQuitter_Normal.png b/Assets/UI/UI_BtnQuitter_Normal.png new file mode 100644 index 0000000..b68fd0d Binary files /dev/null and b/Assets/UI/UI_BtnQuitter_Normal.png differ diff --git a/Assets/UI/UI_BtnQuitter_Normal.png.meta b/Assets/UI/UI_BtnQuitter_Normal.png.meta new file mode 100644 index 0000000..97a5853 --- /dev/null +++ b/Assets/UI/UI_BtnQuitter_Normal.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: b6b0571cbe840334baa1c33fae34ebc0 +timeCreated: 1440312752 +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: diff --git a/Assets/UI/UI_BtnQuitter_Pressed.png b/Assets/UI/UI_BtnQuitter_Pressed.png new file mode 100644 index 0000000..9b2dce3 Binary files /dev/null and b/Assets/UI/UI_BtnQuitter_Pressed.png differ diff --git a/Assets/UI/UI_BtnQuitter_Pressed.png.meta b/Assets/UI/UI_BtnQuitter_Pressed.png.meta new file mode 100644 index 0000000..10cffee --- /dev/null +++ b/Assets/UI/UI_BtnQuitter_Pressed.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 8a81df26fcebad0489e83bac3cb14680 +timeCreated: 1440312751 +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: diff --git a/Assets/UI/UI_BtnQuitter_Selected.png b/Assets/UI/UI_BtnQuitter_Selected.png new file mode 100644 index 0000000..6c82961 Binary files /dev/null and b/Assets/UI/UI_BtnQuitter_Selected.png differ diff --git a/Assets/UI/UI_BtnQuitter_Selected.png.meta b/Assets/UI/UI_BtnQuitter_Selected.png.meta new file mode 100644 index 0000000..3aa6ee2 --- /dev/null +++ b/Assets/UI/UI_BtnQuitter_Selected.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: f390ee7ed7a374e4ca7d73002e212f7c +timeCreated: 1440312752 +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: diff --git a/Assets/UI/UI_BtnRecommencer_Normal.png b/Assets/UI/UI_BtnRecommencer_Normal.png new file mode 100644 index 0000000..8420e0e Binary files /dev/null and b/Assets/UI/UI_BtnRecommencer_Normal.png differ diff --git a/Assets/UI/UI_BtnRecommencer_Normal.png.meta b/Assets/UI/UI_BtnRecommencer_Normal.png.meta new file mode 100644 index 0000000..577e2e0 --- /dev/null +++ b/Assets/UI/UI_BtnRecommencer_Normal.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: da67bafc9ecaff14c89aea192878caa6 +timeCreated: 1440312752 +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: diff --git a/Assets/UI/UI_BtnRecommencer_Pressed.png b/Assets/UI/UI_BtnRecommencer_Pressed.png new file mode 100644 index 0000000..dfd5e9c Binary files /dev/null and b/Assets/UI/UI_BtnRecommencer_Pressed.png differ diff --git a/Assets/UI/UI_BtnRecommencer_Pressed.png.meta b/Assets/UI/UI_BtnRecommencer_Pressed.png.meta new file mode 100644 index 0000000..5a63573 --- /dev/null +++ b/Assets/UI/UI_BtnRecommencer_Pressed.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 950c62ddbcae4c949b4ba01e98742337 +timeCreated: 1440312752 +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: diff --git a/Assets/UI/UI_BtnRecommencer_Selected.png b/Assets/UI/UI_BtnRecommencer_Selected.png new file mode 100644 index 0000000..88f21f0 Binary files /dev/null and b/Assets/UI/UI_BtnRecommencer_Selected.png differ diff --git a/Assets/UI/UI_BtnRecommencer_Selected.png.meta b/Assets/UI/UI_BtnRecommencer_Selected.png.meta new file mode 100644 index 0000000..5e1d6a2 --- /dev/null +++ b/Assets/UI/UI_BtnRecommencer_Selected.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 74ef67a6056561c498acf27f64ce405d +timeCreated: 1440312751 +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: diff --git a/Assets/UI/UI_GO.png b/Assets/UI/UI_GO.png new file mode 100644 index 0000000..30ec3f3 Binary files /dev/null and b/Assets/UI/UI_GO.png differ diff --git a/Assets/UI/UI_GO.png.meta b/Assets/UI/UI_GO.png.meta new file mode 100644 index 0000000..dbcf738 --- /dev/null +++ b/Assets/UI/UI_GO.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: df8e868e3a7b86342bb1300017fbc97b +timeCreated: 1440311910 +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: diff --git a/Assets/UI/UI_GameOver.png b/Assets/UI/UI_GameOver.png new file mode 100644 index 0000000..e671a17 Binary files /dev/null and b/Assets/UI/UI_GameOver.png differ diff --git a/Assets/UI/UI_GameOver.png.meta b/Assets/UI/UI_GameOver.png.meta new file mode 100644 index 0000000..0d8bf82 --- /dev/null +++ b/Assets/UI/UI_GameOver.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: f60bbdbf79104404184283b0df320c4f +timeCreated: 1440311912 +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: diff --git a/Assets/UI/UI_Instructions.png b/Assets/UI/UI_Instructions.png new file mode 100644 index 0000000..894b3fd Binary files /dev/null and b/Assets/UI/UI_Instructions.png differ diff --git a/Assets/UI/UI_Instructions.png.meta b/Assets/UI/UI_Instructions.png.meta new file mode 100644 index 0000000..7243c22 --- /dev/null +++ b/Assets/UI/UI_Instructions.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a8b6bc5ad9c741b4c8ae124bfc0763cd +timeCreated: 1440311908 +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: diff --git a/Assets/UI/UI_P2_1Z.png b/Assets/UI/UI_P2_1Z.png new file mode 100644 index 0000000..32f3874 Binary files /dev/null and b/Assets/UI/UI_P2_1Z.png differ diff --git a/Assets/UI/UI_P2_1Z.png.meta b/Assets/UI/UI_P2_1Z.png.meta new file mode 100644 index 0000000..8d5f417 --- /dev/null +++ b/Assets/UI/UI_P2_1Z.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: be26e8d14bec3b84d98ed4529b184923 +timeCreated: 1440311909 +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: diff --git a/Assets/UI/UI_P2_2Z.png b/Assets/UI/UI_P2_2Z.png new file mode 100644 index 0000000..4ff465c Binary files /dev/null and b/Assets/UI/UI_P2_2Z.png differ diff --git a/Assets/UI/UI_P2_2Z.png.meta b/Assets/UI/UI_P2_2Z.png.meta new file mode 100644 index 0000000..166f3d5 --- /dev/null +++ b/Assets/UI/UI_P2_2Z.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: fc00908bd49720045a634752e2064338 +timeCreated: 1440311912 +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: diff --git a/Assets/UI/UI_P2_3Z.png b/Assets/UI/UI_P2_3Z.png new file mode 100644 index 0000000..dc55d77 Binary files /dev/null and b/Assets/UI/UI_P2_3Z.png differ diff --git a/Assets/UI/UI_P2_3Z.png.meta b/Assets/UI/UI_P2_3Z.png.meta new file mode 100644 index 0000000..b2a2146 --- /dev/null +++ b/Assets/UI/UI_P2_3Z.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 9cb56e1b9e0bf974b93d6132c10ac17e +timeCreated: 1440311906 +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: diff --git a/Assets/UI/UI_P2_Dead.png b/Assets/UI/UI_P2_Dead.png new file mode 100644 index 0000000..b81a058 Binary files /dev/null and b/Assets/UI/UI_P2_Dead.png differ diff --git a/Assets/UI/UI_P2_Dead.png.meta b/Assets/UI/UI_P2_Dead.png.meta new file mode 100644 index 0000000..00a4035 --- /dev/null +++ b/Assets/UI/UI_P2_Dead.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: d09536caab3bd214cae76208257fecff +timeCreated: 1440311910 +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: diff --git a/Assets/UI/UI_P2_noZ.png b/Assets/UI/UI_P2_noZ.png new file mode 100644 index 0000000..965442d Binary files /dev/null and b/Assets/UI/UI_P2_noZ.png differ diff --git a/Assets/UI/UI_P2_noZ.png.meta b/Assets/UI/UI_P2_noZ.png.meta new file mode 100644 index 0000000..34a801c --- /dev/null +++ b/Assets/UI/UI_P2_noZ.png.meta @@ -0,0 +1,55 @@ +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: diff --git a/Assets/UI/UI_Splashscreen.png b/Assets/UI/UI_Splashscreen.png new file mode 100644 index 0000000..c0e2579 Binary files /dev/null and b/Assets/UI/UI_Splashscreen.png differ diff --git a/Assets/UI/UI_Splashscreen.png.meta b/Assets/UI/UI_Splashscreen.png.meta new file mode 100644 index 0000000..be0b24f --- /dev/null +++ b/Assets/UI/UI_Splashscreen.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: bd58c6c3662154d42a94f76e67bd1410 +timeCreated: 1440311909 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 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: diff --git a/Assets/UI/UI_VictoireP2.png b/Assets/UI/UI_VictoireP2.png new file mode 100644 index 0000000..84fad54 Binary files /dev/null and b/Assets/UI/UI_VictoireP2.png differ diff --git a/Assets/UI/UI_VictoireP2.png.meta b/Assets/UI/UI_VictoireP2.png.meta new file mode 100644 index 0000000..7945792 --- /dev/null +++ b/Assets/UI/UI_VictoireP2.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: ea4bbcbf92cf47e40b367a7c7b457230 +timeCreated: 1440311910 +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: 200 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/desktop.ini b/Assets/UI/desktop.ini new file mode 100644 index 0000000..4f4ada6 --- /dev/null +++ b/Assets/UI/desktop.ini @@ -0,0 +1,5 @@ +[.ShellClassInfo] +InfoTip=This folder is shared online. +IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe +IconIndex=12 + \ No newline at end of file diff --git a/Assets/UI/desktop.ini.meta b/Assets/UI/desktop.ini.meta new file mode 100644 index 0000000..0459182 --- /dev/null +++ b/Assets/UI/desktop.ini.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cb1e9f801c09494f89c69888a729fd0 +timeCreated: 1440311906 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: