From 5bb2c0629756ba9d858197ab1f0205675252b912 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sun, 23 Aug 2015 13:28:57 -0400 Subject: [PATCH] Anchor modifications --- Assets/Prefabs/Child.prefab | 4 +- Assets/Scenes/Gameplay.unity | 153 ++++++++++++- Assets/Scripts/MomBehavior.cs | 310 +++++++++++++------------- ProjectSettings/ProjectSettings.asset | 20 +- 4 files changed, 319 insertions(+), 168 deletions(-) diff --git a/Assets/Prefabs/Child.prefab b/Assets/Prefabs/Child.prefab index 3691cf5..c8330af 100644 --- a/Assets/Prefabs/Child.prefab +++ b/Assets/Prefabs/Child.prefab @@ -920,7 +920,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 190616} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.02999997, y: .97299999, z: 2.27999997} + m_LocalPosition: {x: -2.3900001, y: .970000029, z: .25} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 421634} @@ -1069,7 +1069,9 @@ MonoBehaviour: GroundCheck: {fileID: 100272} pillow: {fileID: 0} Mom: {fileID: 0} + Avatar: {fileID: 0} Animator: {fileID: 9580008} + AnimationPillow: {fileID: 134552} target: {fileID: 0} --- !u!114 &11446734 MonoBehaviour: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index de37735..9dfd389 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -620,6 +620,7 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 --- !u!4 &573037243 Transform: m_ObjectHideFlags: 0 @@ -726,6 +727,146 @@ Prefab: propertyPath: RoomDoor value: objectReference: {fileID: 544939640} + - target: {fileID: 120876, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.x + value: .189999998 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMin.y + value: .699999988 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22456076, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11406010, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 188232, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMin.y + value: .699999988 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMin.x + value: .810000002 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22497504, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 141632, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.x + value: .189999998 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.y + value: .300000012 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22484266, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11406500, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11458950, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 180592, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMin.x + value: .810000002 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchorMax.y + value: .300000012 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436868, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11494372, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dec23153e975cb94db47e642092ad58e, type: 2} m_IsPrefabParent: 0 @@ -2446,14 +2587,18 @@ Prefab: propertyPath: Mom value: objectReference: {fileID: 673576180} - - target: {fileID: 190616, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} - propertyPath: m_Name - value: Child 1 - objectReference: {fileID: 0} - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} propertyPath: Avatar value: objectReference: {fileID: 673576181} + - target: {fileID: 190616, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} + propertyPath: m_Name + value: Child 1 + objectReference: {fileID: 0} + - target: {fileID: 11446734, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} + propertyPath: PlayerNumber + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/MomBehavior.cs b/Assets/Scripts/MomBehavior.cs index 231b88c..785ca4f 100644 --- a/Assets/Scripts/MomBehavior.cs +++ b/Assets/Scripts/MomBehavior.cs @@ -1,157 +1,157 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; -using System.Collections.Generic; -using System; -using MenusHandler; -using InputHandler; - -public class MomBehavior : MonoBehaviour -{ - public Action OnEnterRoom; - public Action OnLeaveRoom; - - public Text WarningText; - public float MinTriggerTime = 60f; - public float MaxTriggerTime = 90f; - public float WarningHeadsupTime = 5f; - public float MotherStayTime = 2f; - public Door RoomDoor; - - public Child[] Children; - - public enum State { Away, Warning, InRoom } - - private State _currentState; - - private float _elapsedTime = 0f; - - private float _nextTriggerTime; - - private bool _gameOver = false; - - public bool IsInRoom - { - get { return _currentState == State.InRoom; } - } - - void Awake() - { - _nextTriggerTime = GetNextTriggerTime(); - } - - void Update() - { - if (_gameOver) return; - - // When the mom hasn't been triggered for a while, it can appear anytime between 2 borders - - _elapsedTime += Time.deltaTime; - - switch (_currentState) - { - case State.Away: - if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime) - { - SetState(State.Warning); - } - break; - case State.Warning: - if (_elapsedTime >= _nextTriggerTime) - { - SetState(State.InRoom); - } - break; - case State.InRoom: - if (_elapsedTime >= MotherStayTime) - { - SetState(State.Away); - } - - CheckIfSleeping(); - break; - } - } - - private void SetState(State newState) - { - switch (newState) - { - case State.Away: - RoomDoor.Close(OnLeaveRoom); - _elapsedTime = 0f; - break; - case State.Warning: - // Temporary - WarningText.gameObject.SetActive(true); - - RoomDoor.Open(); - break; - case State.InRoom: - // Temporary - WarningText.gameObject.SetActive(false); - _nextTriggerTime = GetNextTriggerTime(); - - _elapsedTime = 0f; - - if (OnEnterRoom != null) - { - OnEnterRoom(); - } - break; - } - - _currentState = newState; - } - - public State GetState(){ - return _currentState; - } - - private void CheckIfSleeping() - { - List safeChildren = new List(); - - foreach (Child child in Children) - { - if (child == null) continue; - - if (child.IsSleeping) - { - safeChildren.Add(child); - } - else - { - Debug.Log("Player " + child.Index + " has been spotted by mom."); - +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using System.Collections.Generic; +using System; +using MenusHandler; +using InputHandler; + +public class MomBehavior : MonoBehaviour +{ + public Action OnEnterRoom; + public Action OnLeaveRoom; + + public Text WarningText; + public float MinTriggerTime = 60f; + public float MaxTriggerTime = 90f; + public float WarningHeadsupTime = 5f; + public float MotherStayTime = 2f; + public Door RoomDoor; + + public Child[] Children; + + public enum State { Away, Warning, InRoom } + + private State _currentState; + + private float _elapsedTime = 0f; + + private float _nextTriggerTime; + + private bool _gameOver = false; + + public bool IsInRoom + { + get { return _currentState == State.InRoom; } + } + + void Awake() + { + _nextTriggerTime = GetNextTriggerTime(); + } + + void Update() + { + if (_gameOver) return; + + // When the mom hasn't been triggered for a while, it can appear anytime between 2 borders + + _elapsedTime += Time.deltaTime; + + switch (_currentState) + { + case State.Away: + if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime) + { + SetState(State.Warning); + } + break; + case State.Warning: + if (_elapsedTime >= _nextTriggerTime) + { + SetState(State.InRoom); + } + break; + case State.InRoom: + if (_elapsedTime >= MotherStayTime) + { + SetState(State.Away); + } + + CheckIfSleeping(); + break; + } + } + + private void SetState(State newState) + { + switch (newState) + { + case State.Away: + RoomDoor.Close(OnLeaveRoom); + _elapsedTime = 0f; + break; + case State.Warning: + // Temporary + WarningText.gameObject.SetActive(true); + + RoomDoor.Open(); + break; + case State.InRoom: + // Temporary + WarningText.gameObject.SetActive(false); + _nextTriggerTime = GetNextTriggerTime(); + + _elapsedTime = 0f; + + if (OnEnterRoom != null) + { + OnEnterRoom(); + } + break; + } + + _currentState = newState; + } + + public State GetState(){ + return _currentState; + } + + private void CheckIfSleeping() + { + List safeChildren = new List(); + + foreach (Child child in Children) + { + if (child == null) continue; + + if (child.IsSleeping) + { + safeChildren.Add(child); + } + else + { + Debug.Log("Player " + child.Index + " has been spotted by mom."); + // TODO: Visual animation that the player lost (lasso?) - child.NumZ = 4; - Destroy(child.gameObject); - } - } - - if (safeChildren.Count == 0) - { - Debug.Log("Mom wins!"); - - MenusManager.Instance.ShowMenu("MomWinsMenu"); - - _gameOver = true; - } - else if (safeChildren.Count == 1) - { - Debug.Log("Player " + safeChildren[0].Index + " wins!"); - - PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu"); - menu.SetPlayerIndex(safeChildren[0].Index); - - _gameOver = true; - } - } - - private float GetNextTriggerTime() - { - return UnityEngine.Random.Range(MinTriggerTime, MaxTriggerTime); - } -} + child.NumZ = 4; + Destroy(child.gameObject); + } + } + + if (safeChildren.Count == 0) + { + Debug.Log("Mom wins!"); + + MenusManager.Instance.ShowMenu("MomWinsMenu"); + + _gameOver = true; + } + else if (safeChildren.Count == 1) + { + Debug.Log("Player " + safeChildren[0].Index + " wins!"); + + PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu"); + menu.SetPlayerIndex(safeChildren[0].Index); + + _gameOver = true; + } + } + + private float GetNextTriggerTime() + { + return UnityEngine.Random.Range(MinTriggerTime, MaxTriggerTime); + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 77d8ed2..bcff247 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,17 +3,14 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 7 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 - targetGlesGraphics: -1 - targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: PillowUnity - cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 @@ -26,7 +23,6 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 - m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -81,6 +77,7 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 + virtualRealitySupported: 0 productGUID: f74b42ae0c00e944a95d85e94fc9366e AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 @@ -123,6 +120,7 @@ PlayerSettings: iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 + androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -136,6 +134,7 @@ PlayerSettings: resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} actionOnDotNetUnhandledException: 1 @@ -197,6 +196,7 @@ PlayerSettings: ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 + ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -339,8 +339,7 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenCertificatePath: - tizenCertificatePassword: + tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 stvDeviceAddress: @@ -402,4 +401,9 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedLevelWithResources: 0 + firstStreamedSceneWithResources: 0 + cloudProjectId: + projectId: + projectName: + organizationId: + cloudEnabled: 0