Needs a coat of paint, but it's functionally doing everything it should
Showing
51 changed files
with
435 additions
and
289 deletions
| 1 | fileFormatVersion: 2 | 1 | fileFormatVersion: 2 |
| 2 | -guid: a84a17318e2de2d448b5440b29a570e1 | 2 | +guid: ac9625a3e3a3b6940b20ab48f4ae3f74 |
| 3 | folderAsset: yes | 3 | folderAsset: yes |
| 4 | -timeCreated: 1463927989 | 4 | +timeCreated: 1465142193 |
| 5 | licenseType: Pro | 5 | licenseType: Pro |
| 6 | DefaultImporter: | 6 | DefaultImporter: |
| 7 | userData: | 7 | userData: | ... | ... |
File moved
File moved
File moved
File moved
Assets/Plugins/x86.meta
deleted
100644 → 0
No preview for this file type
Assets/_Nest/Prefabs/serverCanvas.prefab
0 → 100644
No preview for this file type
| 1 | fileFormatVersion: 2 | 1 | fileFormatVersion: 2 |
| 2 | -guid: c94c955445dabbd40856b18173670fc2 | 2 | +guid: 1a1fa8e2d2766e04eb94c324c8363477 |
| 3 | -folderAsset: yes | 3 | +timeCreated: 1465223968 |
| 4 | -timeCreated: 1462936060 | ||
| 5 | licenseType: Pro | 4 | licenseType: Pro |
| 6 | -DefaultImporter: | 5 | +NativeFormatImporter: |
| 7 | userData: | 6 | userData: |
| 8 | assetBundleName: | 7 | assetBundleName: |
| 9 | assetBundleVariant: | 8 | assetBundleVariant: | ... | ... |
No preview for this file type
| ... | @@ -3,62 +3,12 @@ using System.Collections; | ... | @@ -3,62 +3,12 @@ using System.Collections; |
| 3 | 3 | ||
| 4 | public class AppManager : Singleton<AppManager> | 4 | public class AppManager : Singleton<AppManager> |
| 5 | { | 5 | { |
| 6 | - public AVProWindowsMediaMovie movieScript; | 6 | + public ServerCanvasManager serverCanvas; |
| 7 | - public Canvas serverCanvas; | 7 | + public AppSettings appSettings; |
| 8 | - public CanvasGroup inUseCanvas; | ||
| 9 | - public CanvasGroup timeoutCanvas; | ||
| 10 | - public CanvasGroup videoCanvas; | ||
| 11 | - public float tweenTime; | ||
| 12 | - public float appTimeout; | ||
| 13 | 8 | ||
| 14 | - public void Initialize() | 9 | + public void SpawnServerCanvas() |
| 15 | { | 10 | { |
| 16 | - inUseCanvas.alpha = 1; | 11 | + Instantiate(serverCanvas); |
| 17 | - timeoutCanvas.alpha = 0; | ||
| 18 | - videoCanvas.alpha = 0; | ||
| 19 | - StartCoroutine(AppTimeout()); | ||
| 20 | - } | ||
| 21 | - | ||
| 22 | - private bool _videoPlaying = false; | ||
| 23 | - private float _timeout = 0; | ||
| 24 | - private bool _didTimeout = false; | ||
| 25 | - | ||
| 26 | - private IEnumerator AppTimeout() | ||
| 27 | - { | ||
| 28 | - while(true) | ||
| 29 | - { | ||
| 30 | - _timeout = 0; | ||
| 31 | - _didTimeout = false; | ||
| 32 | - | ||
| 33 | - while (!_videoPlaying) | ||
| 34 | - { | ||
| 35 | - if (!_didTimeout) | ||
| 36 | - _timeout += Time.deltaTime; | ||
| 37 | - | ||
| 38 | - if (_timeout >= appTimeout && !_didTimeout) | ||
| 39 | - { | ||
| 40 | - _didTimeout = true; | ||
| 41 | - | ||
| 42 | - TweenCanvasGroup(inUseCanvas, 0, tweenTime); | ||
| 43 | - TweenCanvasGroup(timeoutCanvas, 1, tweenTime); | ||
| 44 | - } | ||
| 45 | - | ||
| 46 | - yield return null; | ||
| 47 | - } | ||
| 48 | - | ||
| 49 | - yield return null; | ||
| 50 | - } | ||
| 51 | - } | ||
| 52 | - | ||
| 53 | - public void ResetTimer() | ||
| 54 | - { | ||
| 55 | - if (_videoPlaying) return; | ||
| 56 | - | ||
| 57 | - TweenCanvasGroup(inUseCanvas, 1, tweenTime); | ||
| 58 | - TweenCanvasGroup(timeoutCanvas, 0, tweenTime); | ||
| 59 | - | ||
| 60 | - _timeout = 0; | ||
| 61 | - _didTimeout = false; | ||
| 62 | } | 12 | } |
| 63 | 13 | ||
| 64 | public void DestroyServerCanvas() | 14 | public void DestroyServerCanvas() |
| ... | @@ -67,45 +17,6 @@ public class AppManager : Singleton<AppManager> | ... | @@ -67,45 +17,6 @@ public class AppManager : Singleton<AppManager> |
| 67 | Destroy(serverCanvas.gameObject); | 17 | Destroy(serverCanvas.gameObject); |
| 68 | } | 18 | } |
| 69 | 19 | ||
| 70 | - private Coroutine movieCoroutine; | ||
| 71 | - | ||
| 72 | - public void LoadMovie(string filename) | ||
| 73 | - { | ||
| 74 | - movieScript.UnloadMovie(); | ||
| 75 | - | ||
| 76 | - movieScript._filename = filename; | ||
| 77 | - movieScript.LoadMovie(true); | ||
| 78 | - | ||
| 79 | - if (movieCoroutine != null) | ||
| 80 | - StopCoroutine(movieCoroutine); | ||
| 81 | - | ||
| 82 | - movieCoroutine = StartCoroutine(MoviePlaying()); | ||
| 83 | - } | ||
| 84 | - | ||
| 85 | - private IEnumerator MoviePlaying() | ||
| 86 | - { | ||
| 87 | - StopCoroutine("AppTimeout"); | ||
| 88 | - | ||
| 89 | - _videoPlaying = true; | ||
| 90 | - TweenCanvasGroup(videoCanvas, 1, tweenTime); | ||
| 91 | - //TweenCanvasGroup(inUseCanvas, 0, tweenTime); | ||
| 92 | - //TweenCanvasGroup(timeoutCanvas, 0, tweenTime); | ||
| 93 | - | ||
| 94 | - float holdTime = movieScript.MovieInstance.DurationSeconds - tweenTime; | ||
| 95 | - | ||
| 96 | - yield return new WaitForSeconds(holdTime); | ||
| 97 | - | ||
| 98 | - TweenCanvasGroup(videoCanvas, 0, tweenTime); | ||
| 99 | - TweenCanvasGroup(inUseCanvas, 1, tweenTime); | ||
| 100 | - | ||
| 101 | - yield return new WaitForSeconds(tweenTime); | ||
| 102 | - | ||
| 103 | - _videoPlaying = false; | ||
| 104 | - movieScript.UnloadMovie(); | ||
| 105 | - | ||
| 106 | - StartCoroutine("AppTimeout"); | ||
| 107 | - } | ||
| 108 | - | ||
| 109 | public void TweenCanvasGroup(CanvasGroup group, float alpha, float time) | 20 | public void TweenCanvasGroup(CanvasGroup group, float alpha, float time) |
| 110 | { | 21 | { |
| 111 | TweenCanvasGroup(group, alpha, time, null); | 22 | TweenCanvasGroup(group, alpha, time, null); | ... | ... |
| 1 | fileFormatVersion: 2 | 1 | fileFormatVersion: 2 |
| 2 | -guid: 91089e77413452d4a99412e2a71eafe9 | 2 | +guid: 8f90ee94fcb21674a84ebd818d035f33 |
| 3 | -timeCreated: 1464982924 | 3 | +timeCreated: 1465224205 |
| 4 | licenseType: Pro | 4 | licenseType: Pro |
| 5 | MonoImporter: | 5 | MonoImporter: |
| 6 | serializedVersion: 2 | 6 | serializedVersion: 2 | ... | ... |
Assets/_Nest/Scripts/AppSettings.cs
0 → 100644
| 1 | +using UnityEngine; | ||
| 2 | +using System.Collections; | ||
| 3 | +using UnityEngine.UI; | ||
| 4 | +using UnityEngine.Networking; | ||
| 5 | + | ||
| 6 | +public class AppSettings : Singleton<AppSettings> | ||
| 7 | +{ | ||
| 8 | + public CanvasGroup splash; | ||
| 9 | + [Header("Settings")] | ||
| 10 | + public CanvasGroup settings; | ||
| 11 | + public InputField serverIp; | ||
| 12 | + public Toggle isServer; | ||
| 13 | + | ||
| 14 | + void Awake () | ||
| 15 | + { | ||
| 16 | + splash.alpha = 1; | ||
| 17 | + } | ||
| 18 | + | ||
| 19 | + void Start() | ||
| 20 | + { | ||
| 21 | + settings.blocksRaycasts = false; | ||
| 22 | + | ||
| 23 | + if (!PlayerPrefs.HasKey("isServer")) | ||
| 24 | + { | ||
| 25 | + ShowSettings(); | ||
| 26 | + } | ||
| 27 | + else | ||
| 28 | + { | ||
| 29 | + bool server = PlayerPrefs.GetString("isServer").ToLower() == "true" ? true : false; | ||
| 30 | + string ip = string.Empty; | ||
| 31 | + | ||
| 32 | + if (!server && !PlayerPrefs.HasKey("serverIp")) | ||
| 33 | + { | ||
| 34 | + ShowSettings(); | ||
| 35 | + } | ||
| 36 | + else if (!server) | ||
| 37 | + { | ||
| 38 | + ip = PlayerPrefs.GetString("serverIp"); | ||
| 39 | + Finalize(server, ip); | ||
| 40 | + } | ||
| 41 | + else | ||
| 42 | + Finalize(server, ip); | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + Invoke("HideSplash", 3); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + private void HideSplash() | ||
| 49 | + { | ||
| 50 | + AppManager.Instance.TweenCanvasGroup(splash, 0, 1); | ||
| 51 | + splash.blocksRaycasts = false; | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + public void SaveSettings() | ||
| 55 | + { | ||
| 56 | + bool server = isServer.isOn; | ||
| 57 | + string ip = serverIp.text; | ||
| 58 | + | ||
| 59 | + PlayerPrefs.SetString("serverIp", ip); | ||
| 60 | + PlayerPrefs.SetString("isServer", server.ToString()); | ||
| 61 | + | ||
| 62 | + Finalize(server, ip); | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + private void Finalize(bool server, string ip) | ||
| 66 | + { | ||
| 67 | + if (server) | ||
| 68 | + { | ||
| 69 | + NetworkManager.singleton.StartServer(); | ||
| 70 | + AppManager.Instance.SpawnServerCanvas(); | ||
| 71 | + } | ||
| 72 | + else | ||
| 73 | + { | ||
| 74 | + NetworkManager.singleton.networkAddress = ip; | ||
| 75 | + NetworkManager.singleton.StartClient(); | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + settings.blocksRaycasts = false; | ||
| 79 | + AppManager.Instance.TweenCanvasGroup(settings, 0, 1); | ||
| 80 | + | ||
| 81 | + _inSettings = false; | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + private bool _inSettings = false; | ||
| 85 | + | ||
| 86 | + public void ShowSettings() | ||
| 87 | + { | ||
| 88 | + if (_inSettings) return; | ||
| 89 | + | ||
| 90 | + bool server = false; | ||
| 91 | + string ip = string.Empty; | ||
| 92 | + | ||
| 93 | + if (PlayerPrefs.HasKey("isServer")) | ||
| 94 | + server = PlayerPrefs.GetString("isServer").ToLower() == "true" ? true : false; | ||
| 95 | + if (PlayerPrefs.HasKey("serverIp")) | ||
| 96 | + ip = PlayerPrefs.GetString("serverIp"); | ||
| 97 | + | ||
| 98 | + serverIp.text = ip; | ||
| 99 | + isServer.isOn = server; | ||
| 100 | + | ||
| 101 | + _inSettings = true; | ||
| 102 | + settings.blocksRaycasts = true; | ||
| 103 | + settings.alpha = 1; | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + public void SettingsTap() | ||
| 107 | + { | ||
| 108 | + if (_inSettings) return; | ||
| 109 | + | ||
| 110 | + _didTap = true; | ||
| 111 | + _tapCount++; | ||
| 112 | + } | ||
| 113 | + | ||
| 114 | + private bool _didTap; | ||
| 115 | + private int _tapCount; | ||
| 116 | + private float _tapTimer; | ||
| 117 | + | ||
| 118 | + void Update() | ||
| 119 | + { | ||
| 120 | + if (_didTap) | ||
| 121 | + { | ||
| 122 | + _tapTimer += Time.deltaTime; | ||
| 123 | + | ||
| 124 | + if (_tapCount > 5) | ||
| 125 | + { | ||
| 126 | + ShowSettings(); | ||
| 127 | + _tapCount = 0; | ||
| 128 | + _didTap = false; | ||
| 129 | + _tapTimer = 0; | ||
| 130 | + } | ||
| 131 | + | ||
| 132 | + if (_tapTimer > 1) | ||
| 133 | + { | ||
| 134 | + _tapCount = 0; | ||
| 135 | + _didTap = false; | ||
| 136 | + _tapTimer = 0; | ||
| 137 | + } | ||
| 138 | + } | ||
| 139 | + } | ||
| 140 | +} |
Assets/_Nest/Scripts/AppSettings.cs.meta
0 → 100644
| ... | @@ -34,37 +34,68 @@ public class MoviePlayNode : MonoBehaviour | ... | @@ -34,37 +34,68 @@ public class MoviePlayNode : MonoBehaviour |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | private bool _isDragging = false; | 36 | private bool _isDragging = false; |
| 37 | + private float _lastVel = 0; | ||
| 37 | 38 | ||
| 38 | public void Drag(UnityEngine.EventSystems.BaseEventData test) | 39 | public void Drag(UnityEngine.EventSystems.BaseEventData test) |
| 39 | { | 40 | { |
| 40 | _isDragging = true; | 41 | _isDragging = true; |
| 42 | + _canReset = false; | ||
| 43 | + | ||
| 41 | iTween.Stop(_button.gameObject); | 44 | iTween.Stop(_button.gameObject); |
| 42 | 45 | ||
| 43 | var ped = (UnityEngine.EventSystems.PointerEventData)test; | 46 | var ped = (UnityEngine.EventSystems.PointerEventData)test; |
| 44 | _button.transform.position += Vector3.up * ped.delta.y; | 47 | _button.transform.position += Vector3.up * ped.delta.y; |
| 48 | + _lastVel = ped.delta.y; | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | + public void DragEnd() | ||
| 52 | + { | ||
| 53 | + _isDragging = false; | ||
| 54 | + _canPlay = true; | ||
| 55 | + } | ||
| 45 | 56 | ||
| 57 | + private bool _canReset = false; | ||
| 58 | + | ||
| 59 | + private void Update() | ||
| 60 | + { | ||
| 46 | if (_button.transform.position.y >= _dragTarget.position.y) | 61 | if (_button.transform.position.y >= _dragTarget.position.y) |
| 47 | { | 62 | { |
| 48 | _isDragging = false; | 63 | _isDragging = false; |
| 49 | PlayMovie(); | 64 | PlayMovie(); |
| 50 | } | 65 | } |
| 51 | 66 | ||
| 52 | - if (_button.transform.position.y > _dragTarget.position.y) | 67 | + if (_isDragging) return; |
| 53 | - _button.transform.position = new Vector3(_button.transform.position.x, _dragTarget.position.y, _button.transform.position.z); | ||
| 54 | 68 | ||
| 55 | - if (_button.transform.position.y < _initPos.y) | 69 | + _lastVel /= 1.15f; |
| 56 | - _button.transform.position = new Vector3(_button.transform.position.x, _initPos.y, _button.transform.position.z); | 70 | + if (_lastVel < 0) _lastVel = 0; |
| 57 | - } | ||
| 58 | 71 | ||
| 59 | - public void DragEnd() | 72 | + _button.transform.position += Vector3.up * _lastVel; |
| 73 | + | ||
| 74 | + if (_lastVel <= 0.1f) | ||
| 75 | + _canReset = true; | ||
| 76 | + | ||
| 77 | + if (_canReset) | ||
| 60 | { | 78 | { |
| 61 | - iTween.MoveTo(_button.gameObject, iTween.Hash( | 79 | + _canReset = false; |
| 80 | + iTween.MoveUpdate(_button.gameObject, iTween.Hash( | ||
| 62 | "y", _initPos.y, | 81 | "y", _initPos.y, |
| 63 | "speed", _moveSpeed | 82 | "speed", _moveSpeed |
| 64 | )); | 83 | )); |
| 84 | + } | ||
| 85 | + } | ||
| 65 | 86 | ||
| 66 | - _isDragging = false; | 87 | + private void LateUpdate() |
| 67 | - _canPlay = true; | 88 | + { |
| 89 | + if (_button.transform.position.y > _dragTarget.position.y) | ||
| 90 | + { | ||
| 91 | + _lastVel = 0; | ||
| 92 | + _button.transform.position = new Vector3(_button.transform.position.x, _dragTarget.position.y, _button.transform.position.z); | ||
| 93 | + } | ||
| 94 | + if (_button.transform.position.y < _initPos.y) | ||
| 95 | + { | ||
| 96 | + _lastVel = 0; | ||
| 97 | + _button.transform.position = new Vector3(_button.transform.position.x, _initPos.y, _button.transform.position.z); | ||
| 98 | + } | ||
| 68 | } | 99 | } |
| 69 | 100 | ||
| 70 | private bool _canPlay = true; | 101 | private bool _canPlay = true; | ... | ... |
| ... | @@ -13,13 +13,10 @@ public class NetworkUser : NetworkBehaviour | ... | @@ -13,13 +13,10 @@ public class NetworkUser : NetworkBehaviour |
| 13 | { | 13 | { |
| 14 | if (!isServer) | 14 | if (!isServer) |
| 15 | { | 15 | { |
| 16 | - AppManager.Instance.DestroyServerCanvas(); | ||
| 17 | StartCoroutine(WaitForFiles()); | 16 | StartCoroutine(WaitForFiles()); |
| 18 | } | 17 | } |
| 19 | else | 18 | else |
| 20 | { | 19 | { |
| 21 | - AppManager.Instance.Initialize(); | ||
| 22 | - | ||
| 23 | string path = Application.streamingAssetsPath + "/videoSettings.json"; | 20 | string path = Application.streamingAssetsPath + "/videoSettings.json"; |
| 24 | if (!File.Exists(path)) | 21 | if (!File.Exists(path)) |
| 25 | { | 22 | { |
| ... | @@ -87,12 +84,12 @@ public class NetworkUser : NetworkBehaviour | ... | @@ -87,12 +84,12 @@ public class NetworkUser : NetworkBehaviour |
| 87 | [Command] | 84 | [Command] |
| 88 | private void CmdResetTimer() | 85 | private void CmdResetTimer() |
| 89 | { | 86 | { |
| 90 | - AppManager.Instance.ResetTimer(); | 87 | + ServerCanvasManager.Instance.ResetTimer(); |
| 91 | } | 88 | } |
| 92 | 89 | ||
| 93 | [Command] | 90 | [Command] |
| 94 | public void CmdLoadVideo(string file) | 91 | public void CmdLoadVideo(string file) |
| 95 | { | 92 | { |
| 96 | - AppManager.Instance.LoadMovie(file); | 93 | + ServerCanvasManager.Instance.LoadMovie(file); |
| 97 | } | 94 | } |
| 98 | } | 95 | } | ... | ... |
Assets/_Nest/Scripts/ServerCanvasManager.cs
0 → 100644
| 1 | +using UnityEngine; | ||
| 2 | +using System.Collections; | ||
| 3 | + | ||
| 4 | +public class ServerCanvasManager : Singleton<ServerCanvasManager> | ||
| 5 | +{ | ||
| 6 | + public AVProWindowsMediaMovie movieScript; | ||
| 7 | + public CanvasGroup inUseCanvas; | ||
| 8 | + public CanvasGroup timeoutCanvas; | ||
| 9 | + public CanvasGroup videoCanvas; | ||
| 10 | + public float tweenTime; | ||
| 11 | + public float appTimeout; | ||
| 12 | + | ||
| 13 | + void Start() | ||
| 14 | + { | ||
| 15 | + inUseCanvas.alpha = 1; | ||
| 16 | + timeoutCanvas.alpha = 0; | ||
| 17 | + videoCanvas.alpha = 0; | ||
| 18 | + StartCoroutine(AppTimeout()); | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | + private bool _videoPlaying = false; | ||
| 22 | + private float _timeout = 0; | ||
| 23 | + private bool _didTimeout = false; | ||
| 24 | + | ||
| 25 | + private IEnumerator AppTimeout() | ||
| 26 | + { | ||
| 27 | + while(true) | ||
| 28 | + { | ||
| 29 | + _timeout = 0; | ||
| 30 | + _didTimeout = false; | ||
| 31 | + | ||
| 32 | + while (!_videoPlaying) | ||
| 33 | + { | ||
| 34 | + if (!_didTimeout) | ||
| 35 | + _timeout += Time.deltaTime; | ||
| 36 | + | ||
| 37 | + if (_timeout >= appTimeout && !_didTimeout) | ||
| 38 | + { | ||
| 39 | + _didTimeout = true; | ||
| 40 | + | ||
| 41 | + AppManager.Instance.TweenCanvasGroup(inUseCanvas, 0, tweenTime); | ||
| 42 | + AppManager.Instance.TweenCanvasGroup(timeoutCanvas, 1, tweenTime); | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + yield return null; | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + yield return null; | ||
| 49 | + } | ||
| 50 | + } | ||
| 51 | + | ||
| 52 | + public void ResetTimer() | ||
| 53 | + { | ||
| 54 | + if (_videoPlaying) return; | ||
| 55 | + | ||
| 56 | + AppManager.Instance.TweenCanvasGroup(inUseCanvas, 1, tweenTime); | ||
| 57 | + AppManager.Instance.TweenCanvasGroup(timeoutCanvas, 0, tweenTime); | ||
| 58 | + | ||
| 59 | + _timeout = 0; | ||
| 60 | + _didTimeout = false; | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + private Coroutine movieCoroutine; | ||
| 64 | + | ||
| 65 | + public void LoadMovie(string filename) | ||
| 66 | + { | ||
| 67 | + movieScript.UnloadMovie(); | ||
| 68 | + | ||
| 69 | + movieScript._filename = filename; | ||
| 70 | + movieScript.LoadMovie(true); | ||
| 71 | + | ||
| 72 | + if (movieCoroutine != null) | ||
| 73 | + StopCoroutine(movieCoroutine); | ||
| 74 | + | ||
| 75 | + movieCoroutine = StartCoroutine(MoviePlaying()); | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + private IEnumerator MoviePlaying() | ||
| 79 | + { | ||
| 80 | + StopCoroutine("AppTimeout"); | ||
| 81 | + | ||
| 82 | + _videoPlaying = true; | ||
| 83 | + AppManager.Instance.TweenCanvasGroup(videoCanvas, 1, tweenTime); | ||
| 84 | + //TweenCanvasGroup(inUseCanvas, 0, tweenTime); | ||
| 85 | + //TweenCanvasGroup(timeoutCanvas, 0, tweenTime); | ||
| 86 | + | ||
| 87 | + float holdTime = movieScript.MovieInstance.DurationSeconds - tweenTime; | ||
| 88 | + | ||
| 89 | + yield return new WaitForSeconds(holdTime); | ||
| 90 | + | ||
| 91 | + AppManager.Instance.TweenCanvasGroup(videoCanvas, 0, tweenTime); | ||
| 92 | + AppManager.Instance.TweenCanvasGroup(inUseCanvas, 1, tweenTime); | ||
| 93 | + | ||
| 94 | + yield return new WaitForSeconds(tweenTime); | ||
| 95 | + | ||
| 96 | + _videoPlaying = false; | ||
| 97 | + movieScript.UnloadMovie(); | ||
| 98 | + | ||
| 99 | + StartCoroutine("AppTimeout"); | ||
| 100 | + } | ||
| 101 | +} |
Assets/_Nest/Scripts/Utility.meta
deleted
100644 → 0
| 1 | fileFormatVersion: 2 | 1 | fileFormatVersion: 2 |
| 2 | -guid: 7485df7669ded804cb3402554f165eeb | 2 | +guid: 0720f48700bd6214a905b96a75fab946 |
| 3 | folderAsset: yes | 3 | folderAsset: yes |
| 4 | -timeCreated: 1462936077 | 4 | +timeCreated: 1465224786 |
| 5 | licenseType: Pro | 5 | licenseType: Pro |
| 6 | DefaultImporter: | 6 | DefaultImporter: |
| 7 | userData: | 7 | userData: | ... | ... |
Assets/_Nest/UI/telus-logo.jpg
0 → 100644
56.7 KB
Assets/_Nest/UI/telus-logo.jpg.meta
0 → 100644
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: a515a06c490b9d949b3663a843e47661 | ||
| 3 | +timeCreated: 1465224798 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: 0.25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 7 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: 0.5, y: 0.5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + outline: [] | ||
| 54 | + spritePackingTag: | ||
| 55 | + userData: | ||
| 56 | + assetBundleName: | ||
| 57 | + assetBundleVariant: |
Assets/_Nest/UI/whitePixel.png
0 → 100644
16.8 KB
Assets/_Nest/UI/whitePixel.png.meta
0 → 100644
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 1cadee9a90ece3441897393c27eebd01 | ||
| 3 | +timeCreated: 1465224919 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: 0.25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 7 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: 0.5, y: 0.5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + outline: [] | ||
| 54 | + spritePackingTag: | ||
| 55 | + userData: | ||
| 56 | + assetBundleName: | ||
| 57 | + assetBundleVariant: |
No preview for this file type
No preview for this file type
-
Please register or sign in to post a comment