diff --git a/Assets/Art/Materials/T_Sol_D.mat b/Assets/Art/Materials/T_Sol_D.mat new file mode 100644 index 0000000..53687db Binary files /dev/null and b/Assets/Art/Materials/T_Sol_D.mat differ diff --git a/Assets/Art/Materials/T_Sol_D.mat.meta b/Assets/Art/Materials/T_Sol_D.mat.meta new file mode 100644 index 0000000..9597ac4 --- /dev/null +++ b/Assets/Art/Materials/T_Sol_D.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d4b1c409597959428bf32694eae2f5b +timeCreated: 1440311586 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Materials/T_tabouret_1_D.mat b/Assets/Art/Materials/T_tabouret_1_D.mat index 2c1c8d1..8084d7f 100644 Binary files a/Assets/Art/Materials/T_tabouret_1_D.mat and b/Assets/Art/Materials/T_tabouret_1_D.mat differ diff --git a/Assets/Art/SM_Sol.FBX b/Assets/Art/SM_Sol.FBX new file mode 100644 index 0000000..09fbf74 Binary files /dev/null and b/Assets/Art/SM_Sol.FBX differ diff --git a/Assets/Art/SM_Sol.FBX.meta b/Assets/Art/SM_Sol.FBX.meta new file mode 100644 index 0000000..9fba681 --- /dev/null +++ b/Assets/Art/SM_Sol.FBX.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: a52f33b80c0394f4d819fcf4d339242f +timeCreated: 1440311586 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Object001 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Sol.fbm.meta b/Assets/Art/SM_Sol.fbm.meta new file mode 100644 index 0000000..c2b7f0a --- /dev/null +++ b/Assets/Art/SM_Sol.fbm.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 25a91ea54981fda439e86c33ed716868 +folderAsset: yes +timeCreated: 1440311583 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Sol.fbm/T_Sol_D.tga b/Assets/Art/SM_Sol.fbm/T_Sol_D.tga new file mode 100644 index 0000000..6598a32 Binary files /dev/null and b/Assets/Art/SM_Sol.fbm/T_Sol_D.tga differ diff --git a/Assets/Art/SM_Sol.fbm/T_Sol_D.tga.meta b/Assets/Art/SM_Sol.fbm/T_Sol_D.tga.meta new file mode 100644 index 0000000..05f3911 --- /dev/null +++ b/Assets/Art/SM_Sol.fbm/T_Sol_D.tga.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 690eeaab4d5368a40ae6ed11e8e8a28b +timeCreated: 1440311585 +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/Art/Sprites/mother.png b/Assets/Art/Sprites/mother.png new file mode 100644 index 0000000..ab11f03 Binary files /dev/null and b/Assets/Art/Sprites/mother.png differ diff --git a/Assets/Art/Sprites/mother.png.meta b/Assets/Art/Sprites/mother.png.meta new file mode 100644 index 0000000..8dd6f6c --- /dev/null +++ b/Assets/Art/Sprites/mother.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 8f8d1cdd4706a4d49aebb5a959fea4dc +timeCreated: 1440310206 +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: 1 + 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/Materials/SpriteMom.mat b/Assets/Materials/SpriteMom.mat index 22338e9..8cc1fc0 100644 Binary files a/Assets/Materials/SpriteMom.mat and b/Assets/Materials/SpriteMom.mat differ diff --git a/Assets/Prefabs/Bed.prefab b/Assets/Prefabs/Bed.prefab index 840c6a1..4a8f17d 100644 Binary files a/Assets/Prefabs/Bed.prefab and b/Assets/Prefabs/Bed.prefab differ diff --git a/Assets/Prefabs/BunkBed.prefab b/Assets/Prefabs/BunkBed.prefab index be87f47..65fd1aa 100644 Binary files a/Assets/Prefabs/BunkBed.prefab and b/Assets/Prefabs/BunkBed.prefab differ diff --git a/Assets/Prefabs/Child.prefab b/Assets/Prefabs/Child.prefab index a844223..1093d25 100644 Binary files a/Assets/Prefabs/Child.prefab and b/Assets/Prefabs/Child.prefab differ diff --git a/Assets/Prefabs/Floor.prefab b/Assets/Prefabs/Floor.prefab index 8819686..52a2ed4 100644 Binary files a/Assets/Prefabs/Floor.prefab and b/Assets/Prefabs/Floor.prefab differ diff --git a/Assets/Scenes/CameraSimon.unity b/Assets/Scenes/CameraSimon.unity new file mode 100644 index 0000000..fdf50a2 Binary files /dev/null and b/Assets/Scenes/CameraSimon.unity differ diff --git a/Assets/Scenes/CameraSimon.unity.meta b/Assets/Scenes/CameraSimon.unity.meta new file mode 100644 index 0000000..3a63c3a --- /dev/null +++ b/Assets/Scenes/CameraSimon.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 335c19c80d0e1cd4abcff9c519259b11 +timeCreated: 1440294415 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: 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/Scenes/PatScene.unity b/Assets/Scenes/PatScene.unity index b4ec123..7c7501c 100644 Binary files a/Assets/Scenes/PatScene.unity and b/Assets/Scenes/PatScene.unity differ diff --git a/Assets/Scripts/Bed.cs b/Assets/Scripts/Bed.cs index a5598fd..fb4e896 100644 --- a/Assets/Scripts/Bed.cs +++ b/Assets/Scripts/Bed.cs @@ -3,13 +3,87 @@ using System.Collections; public class Bed : MonoBehaviour { + // Values to balance out in playtesting + public float MinSpawnDelay = 7f; + public float MaxSpawnDelay = 15f; + + public Pillow PillowObject; + public Vector3 RelativePosition = new Vector3(1.6f, 0.5f, 0f); + private bool _isTaken; + private Pillow _currentPillow; + private float _elapsedTime; + + private float _nextSpawnDelay; public bool IsTaken { get { return _isTaken; } } + void Awake() + { + SpawnPillow(); + + _nextSpawnDelay = GetNextSpawnDelay(); + } + + void Update() + { + if (_currentPillow == null) + { + _elapsedTime += Time.deltaTime; + + if (_elapsedTime >= _nextSpawnDelay) + { + _elapsedTime = 0f; + SpawnPillow(); + _nextSpawnDelay = GetNextSpawnDelay(); + } + } + else if (_currentPillow.IsOwned) + { + _currentPillow = null; + _elapsedTime = 0f; + } + } + + private void SpawnPillow() + { + _currentPillow = Instantiate(PillowObject, transform.position, PillowObject.transform.rotation) as Pillow; + + Vector3 rot = _currentPillow.transform.eulerAngles; + rot.y = transform.eulerAngles.y - 90f; + + _currentPillow.transform.eulerAngles = rot; + + Vector3 pos = new Vector3(); + + if (Mathf.Approximately(transform.eulerAngles.y, 0f)) + { + pos = RelativePosition; + } + else if (Mathf.Approximately(transform.eulerAngles.y, 90f)) + { + pos = new Vector3(-RelativePosition.z, RelativePosition.y, -RelativePosition.x); + } + else if (Mathf.Approximately(transform.eulerAngles.y, 180f)) + { + pos = new Vector3(-RelativePosition.x, RelativePosition.y, -RelativePosition.z); + } + else if (Mathf.Approximately(transform.eulerAngles.y, 270f)) + { + pos = new Vector3(RelativePosition.z, RelativePosition.y, RelativePosition.x); + } + + _currentPillow.transform.position += pos; + } + + private float GetNextSpawnDelay() + { + return UnityEngine.Random.Range(MinSpawnDelay, MaxSpawnDelay); + } + public void Take() { _isTaken = true; @@ -19,4 +93,31 @@ public class Bed : MonoBehaviour { _isTaken = false; } + + /* + void OnCollisionEnter(Collision col) + { + // TODO: Check if the pillow is owned (otherwise it means the collision is only a player walking by) + if (col.gameObject.tag == "Pillow" && _currentPillow == null) + { + _currentPillow = col.gameObject.GetComponent(); + } + } + + void OnCollisionExit(Collision col) + { + if (_currentPillow != null && col.gameObject == _currentPillow.gameObject) + { + _currentPillow = null; + } + }*/ + + /* + void OnCollisionStay(Collision col) + { + if (col.gameObject.tag == "Player") + { + + } + }*/ } diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs new file mode 100644 index 0000000..bb57ce4 --- /dev/null +++ b/Assets/Scripts/CameraController.cs @@ -0,0 +1,182 @@ +using UnityEngine; +using System.Collections.Generic; + +[RequireComponent(typeof(Camera))] +public class CameraController : MonoBehaviour +{ + private List players; + private Camera cam; + private float nextUpdate = 0f; + private const float UpdateTime = 0.1f; + private bool movingLeft = false; + private bool movingRight = false; + private bool movingUp = false; + private bool movingDown = false; + private bool zoomingIn = false; + private bool zoomingOut = false; + + private bool debug = false; + + private float XOffset = 0.25f; + private float YOffset = 0.15f; + + private Vector3 upMove; + + // Use this for initialization + void Start () + { + cam = GetComponent(); + players = new List(); + + GameObject[] gos = GameObject.FindGameObjectsWithTag("Player"); + foreach (GameObject go in gos) + { + if (!go.Equals(gameObject)) + { + players.Add(go.transform); + } + } + + upMove = new Vector3(transform.forward.x, 0, transform.forward.z).normalized; + } + + // Update is called once per frame + void Update () + { + nextUpdate -= Time.deltaTime; + if (nextUpdate < 0) + { + CalculateCameraMovement(); + nextUpdate += UpdateTime; + } + + if (Input.GetKeyDown(KeyCode.Z)) + debug = true; + + if (movingUp) + transform.Translate(upMove * -Time.deltaTime, Space.World); + + if (movingDown) + transform.Translate(upMove * Time.deltaTime, Space.World); + + if (movingLeft) + transform.Translate(-Time.deltaTime, 0, 0, Space.Self); + + if (movingRight) + transform.Translate(Time.deltaTime, 0, 0, Space.Self); + + int mod = 0; + if (zoomingIn) + mod = -10; + if (zoomingOut) + mod = 10; + + //cam.fieldOfView = Mathf.Clamp(cam.fieldOfView + mod * Time.deltaTime, 30, 60); + } + + void CalculateCameraMovement() + { + List screenPos = GetScreenPositions(); + + float minX = 2, maxX = -2, minY = 2, maxY = -2; + foreach (Vector3 pos in screenPos) + { + if (pos.x > maxX) + maxX = pos.x; + if (pos.x < minX) + minX = pos.x; + + if (pos.y > maxY) + maxY = pos.y; + if (pos.y < minY) + minY = pos.y; + } + + float distX = maxX - minX; + float distY = maxY - minY; + + if (debug) + { + Debug.Log("Dist X - " + distX + "\nDist Y - " + distY); + debug = false; + } + + if (movingLeft) + { + if(minX > 0.5f - XOffset / 2f) + movingLeft = false; + } + else + { + if(minX < 0.5f - XOffset) + movingLeft = true; + } + + if (movingRight) + { + if(maxX < 0.5f + XOffset / 2f) + movingRight = false; + } + else + { + if(maxX > 0.5f + XOffset) + movingRight = true; + } + + if (movingUp) + { + if (minY > 0.5f - YOffset / 2f) + movingUp = false; + } + else + { + if (minY < 0.5f - YOffset) + movingUp = true; + } + + if (movingDown) + { + if (maxY < 0.5f + YOffset / 2f) + movingDown = false; + } + else + { + if (maxY > 0.5f + YOffset) + movingDown = true; + } + + if (zoomingOut) + { + if (distX < 0.65f) + //if (Mathf.Min(distX, distY) < 0.8f) + zoomingOut = false; + } + else + { + if (distX > 0.75f) + //if (Mathf.Max(distX, distY) > 0.9f) + zoomingOut = true; + } + + if (zoomingIn) + { + if (distX > 0.7f) + //if (Mathf.Max(distX, distY) > 0.7f) + zoomingIn = false; + } + else + { + if (distX < 0.6f) + //if (Mathf.Min(distX, distY) < 0.6f) + zoomingIn = true; + } + } + + private List GetScreenPositions() + { + List list = new List(); + foreach (Transform t in players) + list.Add(cam.WorldToViewportPoint(t.position)); + return list; + } +} diff --git a/Assets/Scripts/CameraController.cs.meta b/Assets/Scripts/CameraController.cs.meta new file mode 100644 index 0000000..252721c --- /dev/null +++ b/Assets/Scripts/CameraController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 88e55981fb5053743beab34a961a19e6 +timeCreated: 1440294816 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Child.cs b/Assets/Scripts/Child.cs index d2419fa..cbb1b8f 100644 --- a/Assets/Scripts/Child.cs +++ b/Assets/Scripts/Child.cs @@ -66,6 +66,7 @@ public class Child : MonoBehaviour pillow.transform.parent = transform; // make the pillow a child of Child pillow.transform.localPosition = new Vector3(0f, 1.5f, 0f); pillow.GetComponent().isKinematic = true; // dont make pillow obey to gravity when in a child's hands + pillow.IsOwned = true; // TODO: place the pillow correctly or animate or something... } @@ -189,6 +190,8 @@ public class Child : MonoBehaviour pillow.Throw(direction * ThrowForce); + pillow.IsOwned = false; + pillow = null; } } diff --git a/Assets/Scripts/Floor.cs b/Assets/Scripts/Floor.cs index 13bb637..6b781b3 100644 --- a/Assets/Scripts/Floor.cs +++ b/Assets/Scripts/Floor.cs @@ -1,7 +1,6 @@ using UnityEngine; using System.Collections; -[RequireComponent(typeof(MeshRenderer))] public class Floor : MonoBehaviour { public MomBehavior Mom; @@ -9,14 +8,12 @@ public class Floor : MonoBehaviour public Material LavaMaterial; public float PillowWaitTime = 2f; - - private MeshRenderer _renderer; + public MeshRenderer Renderer; private GameObject lostPillows; void Awake() { - _renderer = GetComponent(); Mom.OnEnterRoom += ChangeToNormalFloor; Mom.OnLeaveRoom += ChangeToLavaFloor; lostPillows = transform.GetChild(0).gameObject; @@ -24,14 +21,14 @@ public class Floor : MonoBehaviour private void ChangeToNormalFloor() { - _renderer.material = NormalMaterial; + Renderer.material = NormalMaterial; 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() { - _renderer.material = LavaMaterial; + Renderer.material = LavaMaterial; gameObject.tag = "Lava"; // Might not be necessary since the player is most likely "dead" if he touches a non-lava floor lostPillows.SetActive(false); } 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 9a0af87..6c9cf1b 100644 --- a/Assets/Scripts/Pillow.cs +++ b/Assets/Scripts/Pillow.cs @@ -2,7 +2,10 @@ using System.Collections; public class Pillow : MonoBehaviour { - + + public Color SelectableMinColor; + public float LerpDuration = 2f; + public bool IsThrown = false; public bool IsPickable = true; @@ -10,12 +13,31 @@ public class Pillow : MonoBehaviour { private Collider _col; private Rigidbody _rb; + private MeshRenderer _renderer; + private bool _isOwned; + private Color _defaultColor; + + private float _ratio = 0f; + private bool _lerpingUp = false; + + public bool IsOwned + { + get { return _isOwned; } + set + { + _isOwned = value; + _renderer.material.color = _defaultColor; + } + } // Use this for initialization void Start () { _col = GetComponent(); _rb = GetComponent(); + _renderer = GetComponent(); + + _defaultColor = _renderer.material.color; } // Update is called once per frame @@ -24,6 +46,27 @@ public class Pillow : MonoBehaviour { if (transform.position.y < -1) { Destroy(this.gameObject); } + + if (!_isOwned) + { + _ratio += Time.deltaTime / LerpDuration / 2f; + + if (_lerpingUp) + { + _renderer.material.color = Color.Lerp(SelectableMinColor, _defaultColor, _ratio); + } + else + { + _renderer.material.color = Color.Lerp(_defaultColor, SelectableMinColor, _ratio); + } + + if (_ratio >= 1f) + { + _lerpingUp = !_lerpingUp; + + _ratio = 0f; + } + } } @@ -43,6 +86,7 @@ public class Pillow : MonoBehaviour { _rb.isKinematic = false; _rb.AddForce(force, ForceMode.Impulse); + _renderer.material.color = _defaultColor; } public void MakePickable() { diff --git a/Assets/Test/Door.cs b/Assets/Test/Door.cs index 658a567..4292c4e 100644 --- a/Assets/Test/Door.cs +++ b/Assets/Test/Door.cs @@ -1,22 +1,22 @@ -using UnityEngine; +using UnityEngine; using System.Collections; -using System; - +using System; + public class Door : MonoBehaviour { public float MaxAngle = 135f; public float OpenDuration = 5f; - public float CloseDuration = 1f; - - /* - // Update is called once per frame + public float CloseDuration = 1f; + + /* + // Update is called once per frame void Update () - { + { state = Mathf.Clamp(state + goal * openingSpeed * Time.deltaTime, 0f, 1f); //transform.rotation = Quaternion.identity; //transform.Rotate(Vector3.up * state * angles); - transform.rotation = Quaternion.Euler(Vector3.up * curvature.Evaluate(state) * -angles); + transform.rotation = Quaternion.Euler(Vector3.up * curvature.Evaluate(state) * -angles); }*/ public void Open() @@ -66,5 +66,5 @@ public class Door : MonoBehaviour { ((Action)callback)(); } - } -} + } +} 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: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8c353d8..802c8ce 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.0.2f1 m_StandardAssetsVersion: 0