From a5b354d69ac525cd9f135d03e223dc9a10c671ba Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sun, 23 Aug 2015 14:54:58 -0400 Subject: [PATCH] Fix the mom not noticing children anymore --- Assets/Prefabs/Canvas.prefab | 40 ++++---- Assets/Scenes/Gameplay.unity | 166 +++++----------------------------- Assets/Scripts/AutoTarget.cs | 118 ++++++++++++------------ Assets/Scripts/MomBehavior.cs | 2 + 4 files changed, 102 insertions(+), 224 deletions(-) diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index 383b274..3d1e09d 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -164,7 +164,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -185,7 +185,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -214,8 +214,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: WarningText: {fileID: 11404408} - MinTriggerTime: 30 - MaxTriggerTime: 45 + MinTriggerTime: 20 + MaxTriggerTime: 30 WarningHeadsupTime: 5 MotherStayTime: 5 RoomDoor: {fileID: 0} @@ -237,7 +237,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -312,7 +312,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -415,10 +415,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 22413388} m_RootOrder: 4 - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -84.5, y: 108} - m_SizeDelta: {x: 169, y: 216} + m_AnchorMin: {x: .810000002, y: 0} + m_AnchorMax: {x: 1, y: .300000012} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!224 &22441784 RectTransform: @@ -467,10 +467,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 22413388} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -113} - m_SizeDelta: {x: 169, y: 216} + m_AnchorMin: {x: 0, y: .699999988} + m_AnchorMax: {x: .189999998, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!224 &22484266 RectTransform: @@ -485,9 +485,9 @@ RectTransform: m_Father: {fileID: 22413388} m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 84.5, y: 108} - m_SizeDelta: {x: 169, y: 216} + m_AnchorMax: {x: .189999998, y: .300000012} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!224 &22497504 RectTransform: @@ -501,10 +501,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 22413388} m_RootOrder: 2 - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: .810000002, y: .699999988} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -84.5, y: -108} - m_SizeDelta: {x: 169, y: 216} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!1001 &100100000 Prefab: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 66b2efc..66ad268 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -608,6 +608,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 88e55981fb5053743beab34a961a19e6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &638369586 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11406004, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, + type: 2} + m_PrefabInternal: {fileID: 488401107} + m_Script: {fileID: 11500000, guid: dd2c12784e85d194ca7216a12233e1fa, type: 3} --- !u!1001 &673576178 Prefab: m_ObjectHideFlags: 0 @@ -645,7 +651,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2} propertyPath: m_AnchoredPosition.x @@ -691,146 +697,14 @@ Prefab: propertyPath: RoomDoor value: objectReference: {fileID: 544939640} - - target: {fileID: 120876, guid: dec23153e975cb94db47e642092ad58e, type: 2} - 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} + - target: {fileID: 11451246, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: Children.Array.data[0] + value: + objectReference: {fileID: 981569108} + - target: {fileID: 11451246, guid: dec23153e975cb94db47e642092ad58e, type: 2} + propertyPath: Children.Array.data[1] + value: + objectReference: {fileID: 638369586} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dec23153e975cb94db47e642092ad58e, type: 2} m_IsPrefabParent: 0 @@ -1220,10 +1094,6 @@ Prefab: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 6472040, guid: 0839912c1546d474686e48f2f1ea76fe, type: 2} - propertyPath: m_Material - value: - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0839912c1546d474686e48f2f1ea76fe, type: 2} m_IsPrefabParent: 0 @@ -1273,6 +1143,12 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f2c38d0d3154bc4d8148a949b98af28, type: 2} m_IsPrefabParent: 0 +--- !u!114 &981569108 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, + type: 2} + m_PrefabInternal: {fileID: 1928589739} + m_Script: {fileID: 11500000, guid: dd2c12784e85d194ca7216a12233e1fa, type: 3} --- !u!1001 &987851018 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AutoTarget.cs b/Assets/Scripts/AutoTarget.cs index fe13b47..598bef2 100644 --- a/Assets/Scripts/AutoTarget.cs +++ b/Assets/Scripts/AutoTarget.cs @@ -1,30 +1,30 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -public class AutoTarget : MonoBehaviour -{ - private List targets; - public float minAngleRange = 30f; - - // Use this for initialization - void Start () - { - targets = new List(); - GameObject[] gos = GameObject.FindGameObjectsWithTag("Player"); - foreach (GameObject go in gos) - { - if(!go.Equals(gameObject)) - { - targets.Add(go.transform); - } - } - } - - // Update is called once per frame - void Update () - { - +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class AutoTarget : MonoBehaviour +{ + private List targets; + public float minAngleRange = 30f; + + // Use this for initialization + void Start () + { + targets = new List(); + GameObject[] gos = GameObject.FindGameObjectsWithTag("Player"); + foreach (GameObject go in gos) + { + if(!go.Equals(gameObject)) + { + targets.Add(go.transform); + } + } + } + + // Update is called once per frame + void Update () + { + } public Transform GetTarget(float screenX, float screenZ) @@ -43,50 +43,50 @@ public class AutoTarget : MonoBehaviour Vector3 movement = forwardDir + rightDir; return GetTarget(movement); - } - - public Transform GetTarget(Vector3 lookingAngle) - { - Transform closest = null; - float minAngle = minAngleRange; - + } + + public Transform GetTarget(Vector3 lookingAngle) + { + Transform closest = null; + float minAngle = minAngleRange; + //Debug.Log("looking direction:" + lookingAngle); - Debug.DrawRay(transform.position, lookingAngle * 2); - - - foreach (Transform t in targets) + Debug.DrawRay(transform.position, lookingAngle * 2); + + + foreach (Transform t in targets) { - if (t == null) continue; - - Vector3 targetDirection = t.transform.position - transform.position; - + if (t == null) continue; + + Vector3 targetDirection = t.transform.position - transform.position; + float realAngle = Mathf.Atan2(targetDirection.z, targetDirection.x) * Mathf.Rad2Deg; - - float lookAngle = Mathf.Atan2(lookingAngle.z, lookingAngle.x) * Mathf.Rad2Deg; + + float lookAngle = Mathf.Atan2(lookingAngle.z, lookingAngle.x) * Mathf.Rad2Deg; //Debug.Log("look angle:" + lookAngle); float angle = (lookAngle - realAngle + 5*360) % 360; if (angle > 180) angle -= 360; - //float angle = lookAngle - realAngle; - + //float angle = lookAngle - realAngle; + if (Input.GetKeyDown(KeyCode.D)) - Debug.Log("Angle: " + angle + "Looking - " + lookAngle + "\nReal - " + realAngle); - //Debug.Log("real angle:" + realAngle); - - if (Mathf.Abs(angle) < minAngle) - { - minAngle = angle; - closest = t; - } + Debug.Log("Angle: " + angle + "Looking - " + lookAngle + "\nReal - " + realAngle); + //Debug.Log("real angle:" + realAngle); + + if (Mathf.Abs(angle) < minAngle) + { + minAngle = angle; + closest = t; + } } if (closest != null) { Debug.DrawRay(transform.position, closest.transform.position - transform.position, Color.blue); - } - - return closest; - } -} + } + + return closest; + } +} diff --git a/Assets/Scripts/MomBehavior.cs b/Assets/Scripts/MomBehavior.cs index 785ca4f..180935c 100644 --- a/Assets/Scripts/MomBehavior.cs +++ b/Assets/Scripts/MomBehavior.cs @@ -116,6 +116,8 @@ public class MomBehavior : MonoBehaviour { if (child == null) continue; + Debug.Log(child.IsSleeping); + if (child.IsSleeping) { safeChildren.Add(child);