From 17974bed9b26cb9223b24a4f4d2351f59f1a023f Mon Sep 17 00:00:00 2001 From: jparent Date: Sat, 22 Aug 2015 16:55:31 -0400 Subject: [PATCH 1/2] add basic pillow script --- Assets/Scripts/Pillow.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Pillow.cs b/Assets/Scripts/Pillow.cs index 61084a4..22c8f03 100644 --- a/Assets/Scripts/Pillow.cs +++ b/Assets/Scripts/Pillow.cs @@ -2,6 +2,8 @@ using System.Collections; public class Pillow : MonoBehaviour { + + public bool IsThrown = false; // Use this for initialization void Start () { @@ -10,7 +12,20 @@ public class Pillow : MonoBehaviour { // Update is called once per frame void Update () { - + if (transform.position.y < -10) { + Destroy(this.gameObject); + } } + void OnTriggerEnter(Collider other) { + if (IsThrown && other.tag == "Player") { + + Debug.Log("A child got hit by a pillow!"); + + //other.GetComponent().takeHit(); + + Destroy(this.gameObject); + } + } + } From f6181556f551ead5b21b2d9e239a9ede74b6dcd9 Mon Sep 17 00:00:00 2001 From: jparent Date: Sat, 22 Aug 2015 16:59:45 -0400 Subject: [PATCH 2/2] add basic auto targeting, but it needs ajustements --- Assets/Scenes/jp.unity | Bin 23568 -> 26224 bytes Assets/Scripts/AutoTarget.cs | 18 ++++++++++++------ Assets/Scripts/ChildController.cs | 16 +++++++++++++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Assets/Scenes/jp.unity b/Assets/Scenes/jp.unity index 57c5bd11674c559c22c03d9408516f159e6c297b..042ec3ca2a514a8f3b783a3975e4f2c819c97635 100644 GIT binary patch delta 3751 zcma)8drXs86u)0-wJ5l%*cRwUQ8FGPg1mf$Py`A{%R@n_Y>^5Tx)q9TotkW;S?0v4 zk?ib`h3o;D`(qm_gluD5RI()oGdD5IBAbh0%l>eQ$%u0glWpwWulLmU!?@k#_TGDb z=ezfw-?`_U4opaMSEM?|Dk~Y=*UK1t1m|ryvcjCaoDKW(*gy00^U_Kb;5c9O>ei1h zUv&O>Yujec!I=3UE;YU#Opd#pT=ZegdxJm4tWHF|ys^4+m0n^J8;W7U43tRNjo4WY zoKj_JYy3@JKJUSvacS`deP$8L3kEOV&>kuJz1a}=ec@Zb+LuU1FFo`yh^v?NIxaLjO z$g_F4WDScL8-vC&gQNv_S@NcV#VA90zuZIn>=U}Ph!vnbRqi3IQ(#6oUzXe##Ai^A zD1WCu9C>pKjVZ(|xaN8yW7(*H(&g(-p z#?A_`8o_>C8{{6k?m2-?Bc?QSRA6R&&`LAM1lEF>lFFC*-COv%lS}b@r4>g7cnG7x zf=ZEA^b2ePu?Q>pUhJ5_7)FcIh?fP{k64ru-2USNoIy}&#R-AwFw~S*Tym)`{NO`~ zJ)vUk=NR5YtY!4R)5NhEj5wu%nF1TYsOz(!Qly1h0-Q!rY2jLd88IxC7G?`<2(c&& zasPD!n?p=tU^>eYUx=QY6> zT&T*7s}_>5O<>cASx_gEgIa;<^idpy-l|Q2EeI+}unTM!F(nCg0?Wn6tssHb3#e8BV?5)ZJxu*z};h!dx(lvLUSY56Xgkdf%PWB^SH}QA`F%% zm9?4B2F1%6>e3&=P1&u-7|V#nLXplPHhcJ-JT3x5#SNIN=#^C9tXw0-z>&%uFlkMY z)Nrjz58kR+xN9{>tO}~q!mCVqmI5R7MtN2&)}{u&F01D2?uHb2ty+h(631%zqIx;b z_B&GGFIhJ1;5v=FQed=F2W?h0jMi$$gEd+eOg9-(7$+@)GqpQnxp#SU!@XKRUbfqI zG+yEcF;7JZVLd6*|IW zH)>CPcHsQyzfD=-gx&PYwzMc}D47v8l=z4m%92D4WmKYuvM*6XnVR1=lA1gPHI(ij zKn;h&)R5jnY6uDQf|G^RkX95mCX(J&7s~I3?{Np`dv#_Dyl798mf#yQXt)9Qqvm#9 zWYlEW-(ST;Z@md${k5w9ik$VRHSEYQRO8NfpE}FWm1&ayM_RqUc1(^K;4D8^hN6DL zQ5EGt%GKmRO6=r7Dgxv{Dj4KIDlX(eszm(gNC)OC97xsd0S@F)*ny>1#49P9>5xh!mN?rLe>a*IBTR8#hQtvO4jo8k52MuFQ@C%m1elTy#oKq z=IwYI^YR-zPGJ#oHmwC+lUAO2r8v0Olq^5^P(g`nz8?&+U~3K)503HB(7?%N!~Y78 z6ga(;3d{AKR9LjTxQq(Rny7P^z?-}D5t7KWmqS8J=q3*j%XkM5%MwRE{_dCObXJNc z7J1gd-;PpA10}op?{o6+`Q61bTa&v@Fjr-Q+}48dx~(@ GBk^B5(JMm$ delta 2052 zcmah~drVtp6#wpR%S(_lp{?an7-Rz-6oko!q-CSD<*`aOR5UA1ZOg!w$4V1fHbebO z{DS~Fn9L{(Y>Cl`GJ-Kke1w1IBPNp>%-nQgMi-1Vvbk)=2=$z=7jh{+ntb1P&hK~5 z{m$#&u6`+u%n1(0ET1xVRLvMmMR^%dwzs6Lv@4u()QSL!g+=6gBKN(^;mfa2T%3K;)$FBUrAQhYufeEZz-*K*L~z>LEt4lF5Hs1P-DiqLad0%HObg)+uMvXWj0kgv)*1xqH`I!F-+iR1+7Sgu=lU--brUaESNIILKR#$>BUwR{Ato>4`SGRkUPp( z)P7#FpMx@Urf81?hgq+>fO$+pmsy+LiiI9Tb1h#{7vI!roEN+vCefud0X{bCg%0@E zoH_6nmd=6{&2j)M$IZUmUqz=baeJ0GC9V{?*eta}g(mXr{|7&V#EoqA8z6gj(Wk7T z^9quCV#+i5*N>DvOTg)kE%{p#my29%FvU|}JISvDxfk%H)TmX2l}Ox5GEU?K0)D=t zq){RVQyB9iP7PN|jyu$sI#Fe-De!KsUL3q1zNpn#sqqs**VphBeM*L8*@|2R;(2^U zIgP}Pq(Y8GFaD7VRTjM`v;!L#ll(-7rXL+yLI!?Ce z`_0scp~vU7Z@e6S_0ph%!7G+)5UA@G6mX+1Ur>U|dM%yaj590r!07LkSlkPF)&eCB zJ5(R8fK{tfP{A#m28L~kkZ#MBX)U&bO|6Ja2B`LB!5v$Lq)nmbwUajVgaPL4YLv!3 zJK-058cK^E17y_`CU`4xpK%+Y)T*8xt4|j(%oFuSxYB5c(k4G@<4rGtp&=gfkL(5Y zp#)68eZ)u-OdQ%L#Dlx3oU&meq&c+P5^Gr<_4CA*afUImf^8NwhunfDnWx_Sj6C(^ z7J2GTGA#v0TCyM=`zjI1_8CBJ*P%4DsfW0}<})H%+@7CHZ%57V??lHPclr;QIChVZ4uO9I6t5aS diff --git a/Assets/Scripts/AutoTarget.cs b/Assets/Scripts/AutoTarget.cs index d484f15..d2920a6 100644 --- a/Assets/Scripts/AutoTarget.cs +++ b/Assets/Scripts/AutoTarget.cs @@ -25,22 +25,28 @@ public class AutoTarget : MonoBehaviour { } public Transform GetTarget(Vector3 lookingAngle) { - Transform closest = null; float minAngle = minAngleRange; + Debug.Log("looking direction:" + lookingAngle); + + foreach (Transform t in targets) { Vector3 targetDirection = t.transform.position - transform.position; + + float realAngle = Mathf.Atan2(targetDirection.z, targetDirection.x) * Mathf.Rad2Deg; + Debug.Log("real angle:" + realAngle); + + float lookAngle = Mathf.Atan2(lookingAngle.z, lookingAngle.x) * Mathf.Rad2Deg; + Debug.Log("look angle:" + lookAngle); - float dot = Vector3.Dot(targetDirection, lookingAngle); - float angle = Mathf.Acos(dot) * Mathf.Rad2Deg; - if (angle < minAngle) { - minAngle = angle; + if (Mathf.Abs(lookAngle - realAngle) < minAngle) { + minAngle = lookAngle; closest = t; } } - + return closest; } diff --git a/Assets/Scripts/ChildController.cs b/Assets/Scripts/ChildController.cs index fca1baa..991eae0 100644 --- a/Assets/Scripts/ChildController.cs +++ b/Assets/Scripts/ChildController.cs @@ -75,9 +75,19 @@ public class ChildController : MonoBehaviour } if (xLookingValue != 0 || zLookingValue != 0) { - //transform.rotation = new Quaternion(0, 1, 0, Mathf.Atan2(zLookingValue, xLookingValue)); - transform.eulerAngles = new Vector3(transform.eulerAngles.x, Mathf.Atan2(xLookingValue, zLookingValue) * Mathf.Rad2Deg, transform.eulerAngles.z); - _child.target = _autoTarget.GetTarget(new Vector3(xLookingValue, 0, zLookingValue)); + Transform target = _autoTarget.GetTarget(new Vector3(xLookingValue, 0, zLookingValue)); + + _child.target = target; + if (_child.target != null) { + transform.LookAt(_child.target); + } + else { + transform.eulerAngles = new Vector3( + transform.eulerAngles.x, + Mathf.Atan2(xLookingValue, zLookingValue) * Mathf.Rad2Deg, + transform.eulerAngles.z); + } + } }