From 0a1931c7d07e6255d82552cb00b12b5c61457697 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sat, 22 Aug 2015 04:22:32 -0400 Subject: [PATCH] Add the ability to sleep on a bed anytime --- Assets/ControllerMapper.asset | Bin 4468 -> 4540 bytes Assets/Scenes/PatScene.unity | Bin 20356 -> 32284 bytes Assets/Scripts/Child.cs | 13 ++++++++++++- Assets/Scripts/ChildController.cs | 2 ++ ProjectSettings/TagManager.asset | Bin 4328 -> 4332 bytes 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Assets/ControllerMapper.asset b/Assets/ControllerMapper.asset index 3c8be40eb3f771c55b8c9e9103c82e9a4d21087e..53b355f09c2d4ff60303b8f4e11f9ec4b2f68f12 100644 GIT binary patch delta 117 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 Lq8GN~n~?nvgW3aC delta 1273 zcmZWpYegNTNs?_$vlckP#U5r}~jaKSZi^-f!Q+^c&~A=bY#H&U>Ekd%xZK#kzV~ z5kPJ#!0s*p2%*?WE3DV0>oV-=@W<=*vK3U|!CQOL=H{DwdtC>*OJ6ihgulD*iqOW6 zXwMJMmYtc+xUMGNHh12V?XtD~0G)}H3S?1apafv_rBs~GNek!m`*ytg;SC(2D@6h)2|P$SpG=T$w2uvG zI44aGFhd>Z5Bhj2VHL+#Dgf@$I)B3_66R6hm??%Samo}^LQgA&c$K30274;;tc3MY zT_u_i8LlHoIW-)WKI~j=7csbkI6~ zbe)8y1>?&KwagQYUnD|`0j5tp5LYFBt2~8g%_&%KjzqWFfG*2&{9!)EWN5RjW&wEG z@)i560u%7PRf`kWC^5>Ca=ne`g*F5E9viO~+O+sdto|0Oo2s;^Y6>OfXw^FM#Wmqf zjzd)j7Kq=gcszPMGunS-{71-tzUbgL?hEsuL@t0|48t4|fprA{4-2s05-)H9x*Ao% zb6vTHXWqMpaowF!47F;|SR>$oMTMQ!0&V4&z@scF=Mv=F5NlWcdsaJ`A4EpZPTKj8l<)9xh7gQI6!%y zFPFvNz&WRy>BWAWkkXWh`gT_!{V9MUk;;*mI~;-Zxx 0; } @@ -87,12 +89,21 @@ public class Child : MonoBehaviour { _isSleeping = IsOnBed(); + // Temporary (only for visual cue until we get the animation) + if (_isSleeping) + { + transform.localEulerAngles = new Vector3(90f, transform.localEulerAngles.y, transform.localEulerAngles.z); + } + return _isSleeping; } public void WakeUp() { _isSleeping = false; + + // Temporary (only for visual cue until we get the animation) + transform.localEulerAngles = new Vector3(0f, transform.localEulerAngles.y, transform.localEulerAngles.z); } private bool IsOnBed() diff --git a/Assets/Scripts/ChildController.cs b/Assets/Scripts/ChildController.cs index 70c6ede..647b000 100644 --- a/Assets/Scripts/ChildController.cs +++ b/Assets/Scripts/ChildController.cs @@ -60,10 +60,12 @@ public class ChildController : MonoBehaviour if (input.Actions.Contains("Sleep") && _child.Sleep()) { + Debug.Log("SLEEPING"); InputManager.Instance.PushActiveContext("Sleeping", (int)PlayerNumber); } else if (input.Actions.Contains("WakeUp")) { + Debug.Log("AWAKE"); _child.WakeUp(); InputManager.Instance.PushActiveContext("Awake", (int)PlayerNumber); } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a8d546d240a72755dd54237c068d63b7c0475f28..0875a700f979ae0ee9febe09af849445d5d06db6 100644 GIT binary patch delta 39 vcmaE%_(qX~fr0541B1YujT|4C7~gFE$yCkD#>~LL;FLPKP#|jZ1px^F1y~G@ delta 35 rcmaE(_(G9`fr0541B1YejT|4C7+-Au$yCidS(rIyk^sx(8v-H#-!}{w