From b289bc1beb5a617b819aabcf6139ca08d9e061f6 Mon Sep 17 00:00:00 2001 From: JWS Date: Sat, 5 Feb 2022 18:03:03 -0600 Subject: [PATCH] Move MusicHandler to separate network object, important move rpc calls before destroy call or they don't happen on the clients. Argh! tough bug to find out why my rpc were not happening. --- Assets/Game1.unity | Bin 30844 -> 29828 bytes Assets/Game2.unity | Bin 23040 -> 21792 bytes Assets/Game3.unity | Bin 21308 -> 20060 bytes Assets/Game4.unity | Bin 23256 -> 22008 bytes Assets/Game5.unity | Bin 21560 -> 20312 bytes Assets/Game6.unity | Bin 24976 -> 23728 bytes Assets/MusicHandler.cs | 11 +++++++++-- Assets/NetworkManagerRocket.cs | 6 ++++-- Assets/RockSphere.cs | 19 ++++++++++--------- ProjectSettings/GraphicsSettings.asset | Bin 5540 -> 5528 bytes 10 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Assets/Game1.unity b/Assets/Game1.unity index e8d0232af0d95219f1c94bbb3adfdd95dc6c8375..29b3bc4c1745f8fab7e01a3976ea9fb875e4c96e 100644 GIT binary patch delta 1493 zcmZXUe@t6d6vxk_?OTUs{Mc(L8wdkeCwZ{8OaWa$$Htgrw#gF5!hVz=Euk&H3T2u> z3a(LfnF+gSCV{P+x;3V8(I<(b(Ppw`G7IQpH1kKQ%qUD|=ZKDsKRma6jkLbx+;hI4 zd+xm__r3F$LyUWlNdY+YH9(ge0F)Sq22+$w@_U+rEMcTzjZAnyYd%>xuU}$?K=~NM zBnZczs*y4h;fEd4L`Ew7Y?x&knQ-~pJ*x?4GP?F%yrsaMpdQ!jzB2%M?uD!l@$3~oTfd}ETc<`J& zP=XLVi2x6wm!r*#>?*Q$)T_}#A}e_yl7~~E;j_xofeBf3zshva-Y{DOFe0A8e>-WS z3{nBkf-O>Yp$NSQ58xc`0h>i8PXq9yrq`qu*;QmisFToiA~UT8_>cj>vp_F0HNK%9 z)bzGk5~$nFY#n`tKH$MC7zP(0*IYiM=DDaJ27*}PjVyebx z-8o#SQ>poH*B+11Q+G%2 zOpN-rzk5ch zJ#pnYt=Fe@?&c;j>@*pIQF(>6W*Z? zN0d@M64ncCR4>{n;d=T?tJ8viuth z_=|(@HnHBqYckrU@Z#d+%`aypfK3Ot%P$uOGo^sd1}e@nR<)l64&$ldo#3rMW%QQ_ zs)^d-!4ITB_dRqeIft`KAsyp+LsE5mT95@binRTke$BVAkb$v(VWz%il#Tf+X}d=Y pTDKymuS6`4xQ=8MM~iz9d9=9f6>$#6(Ly);7nA;G9pRrd{tJe$i@N{- delta 1620 zcmY+E4Nz276vxkFA8&V&Z+90k*5yk=!tDB)eOQ6Ok!#Z)(gibDGIE~BrzeUNsaIm6e1_hCLB9=_bo$j=Dhp=|IT^$zWeUI zuX&uAnPz+ebXtH{b^w4Jwb||~XM8`2+^gizgiZPIT}p3v{&?I&Zm9(;zzvdMpZxB6 zS@P4al|TRRQH5dmp3=)#6~7#BKNnV=T7UZ2C0O+Z@Ly`HM8q7+lF7tiuZ_sIVR&K$ zlS}z3MoB`WRLnxMI%>XbLb2|h*`LfQb8KUL8#T(m5Lk^KO?0@uVZ+Uuf%fFzRH`4bPV|{Szi?3{vKvnqLRqT zJF%SfICU6{Nqtdvlg(t?V#sYUR_H8wRr#i^wbrb92i7E?}xwPq{zV05W$lgVraQ^WtVhAmc`qgHD%RaD8SGPxdR#J?giRA1MHhief-&KQ zFoevEUW##FU@u_7GqB-BJ@x^y0xR+ZNMHc43y2fget!UZ zAm|qqleUtVyy)CVU+u;_zB(B%iSZ4bXJKvA>fFxw&_`Xr<;RivrN_umrO{2zHdV*< zlbSUj=47@!kcZvGuZ-7$c!}x}tqtqf>0k=xv*TnPESblSUi= zx%7A8ZOw^wBloLDRxWbVYfttReBJnTO-pcH*3!<#TqnIPJv?Oex{%)6l5zHqcKbn5 zlViByyUo2@Dl2l{oZQ*}+U3DQXYu3itk~^`xQvglzFT&Y_3n4l zVS9?Yo%C2j@sp_s>6twbFWgJZ40+B;PgVM;XOvvV>1O*|8g;wSZ}stc#q9$hL5Ry>`t_n zXmYd0mkgU_O$%`XbRkDOcRHp*cMe@dm#2&8(sa>W8rODKXinXw;Li!-d4FoB@6yLhnE^L&#yL?yD@=$hbf*R3H35^*PKoM!d6p%g6y-%h{V#& zh{@ZQjp0G~eglU057=8dz)kE3daM>;d^>n?Y~~I}x~+P^sJ){-jDaeVtG UhboM19P!gVPj*-&B*mur4@Et-Qvd(} diff --git a/Assets/Game2.unity b/Assets/Game2.unity index 12fc3678e30d9cd40988656da640ba090121f779..377f88d6b501ae6510943bb5b2b2bc9b5cadea15 100644 GIT binary patch delta 1238 zcmZ8hUr1A76#s5s=bT0(olbT^$ygYoGiN56TDtb9=B{&h4opmRRQPYEfl`Eq&>oCv z2VWvYNkW23nGY302toyh3JK9mK4ws4`H$zE&rs%^M3Ug~Q>IGit#<@Tl60hio>TvBD(AM8vyoEq$bYJjB?k zsJ42~Hbj~>W8Y5HtPYb_o5ff^?#c8!PSeAtX4srIMR`5U;F)R^%$k@nTGeHslat%qvmQ2sH00 z7?$9Umn%DHLxEM$-c0V>=uUxEu-;rrb|0GaF>(&yF)m4>le<*Q$M`t%{Cp97ae+-Q6!Fk$ZA+o^tGv2_O9J`uZ{$7n^cH<+8Ww>{ET7yGUxSy zs~xuX-p+3SHKehJeB>J$u8E4V^Dt%2l*(d95fEpvW-UyQ6KY+Ff-OOqOSG7?=|gg6 z{Acpy1g|{19s-G0Yjy*?@#x}RNyI`Wil#cc=i;5DNp-9fC zw;0z^>{}WzLgi6T1E#@_CQf}#9iZWT9^uph8tQYtMh1+y5%AYfqkDh3_4vZ&&lAw5 T6rhdZlwiY${~qCO-yz{Yh>=(g delta 1570 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 delta 1495 zcmY*Z4NO~A6h4o>QP}wDCXYcVd%#8=lQAZB{I!LaSK2~h{ERsNaQt-G2^88QF~k7@ z&7vj>N6m!IR2`dcIJOWL6D7J#6BDOG#&pwdvIO^|u#hEgEMek#@3n|8Ip=)eckey- zzI)Dl3n!RMV~h$wxCij`B>><6%&I;W$Aq2Mq~xZ$NrE8Af;YKa^m8q0J^YR8LedD8o_AnP{tBYQ$QDwgUYy2 zanfsKVfdAj!<~r{j7Hoj{!!8x=prva3^6goyF^*!L%2wp9~U`U3f|P%JH0M%O=D?W zQ?0|jb8m&K?nRHS+3tAB(FkQ_Ubk+Ov8~?eDrj`J7{J-=b-PO1JkC0iLsJ0RU9J`n zxZ3_V+F0Z9N^{HHt_HWm<8iv0(W&*Yuv1N zKCN^pBk|tJ-zy$Rh5i+MPoLV^>*YVZ_LW=S{9k#NgvVs{RDERH zVtlaqOmE*C)-<0#?}Oo<+nORpL2t-M$M8pe49@5eF)Vf)HZrSl$dIABv)in<%>An0 zGQ}CFWAiZG7(M!r;e#M17!MmW$WI!#;n#&MvL>xRsf|e_Jc@v^|rwvxV~3VwP_Tv*au#a@1MUCEj9@ zvX4#|sg(T&7JJK8o#NdFx=ZR7auJN&(9=WvB}r^}v6%y0{0#+g_zE1c0@L@iJcquA zWlW#JGNx8nFOx@B3`EHo7xS`lzI>M9@M=XS`AH*>+Da86#w2ovYCx4D)GBeYCR8Qj s*Oz&qMx0b5S|is;Tuq27B%xgL-BlUn^+Fs@RH?)0#|^%Q`>QCxzg6;{-2eap diff --git a/Assets/Game5.unity b/Assets/Game5.unity index 23bdfeb60bba2115fd5e8d421b664c954db15bb3..1b833d697b3eb31182749fc1c2df78c28c12cc86 100644 GIT binary patch delta 730 zcmdn7g7L;YMgax}+Y$x_{|E*K22mh;!bAa4M(&Mjn%0a0lN%f-)JK|sl?2K$tYBtf zumECqAp7N-7&VaC12zVRKTHrYwOi4?U@=aFn49>5V6Yeu1A_)suRBzX18B1fP?7_P zJ)mL+P%)qp44x3NAchE_U;$8o3y5c#O2+{yh7&-sLLkio#IvDd4uT8}9Y8+NO$@D(H=Usly4;#-FpKk5H_&X;8=t73cHO?-Ruek_K zKISruk$G~Wt1=_Yff-gwb|0S|vgOO{wq{^xu%9g8A-4IR>ntW0KA<*MAkO}I za+gv^lL5#9x$%C9xv2~cK#w!{mKJ9wdnD$ixo`l|6HqPeKh?6ud-4Gf5gB8+ z6oi4I;Dd(_51N3;WE)QjRKWyKG*uToMJBI7S9QTtVls!P2&z_)N{Ik8^BlY+CRd=V z{NN=$xj#S@Rr`hj15|+zUIxw}2k&WTp2wm2B^#7*ij!0GQaw|^acOL9X>Mp_XkcK3 z>TQr7_rg63Dts4~08`%NUk=hr3=E*SF}5^7RSM*RR4+*X&N_Lci^$>%53b1x!8ZWm Cx}i@1 delta 1099 zcmY+DYe}D4~SlN{bDg(uyvv*r|;5q02|DESO=Ww3$K0nXgxXkbY z6c+(DtpNZ5>cK|7fbqUAj+Vrj5P=)4fun+noB+v8ckARmw|N4xAxkTh4@MC=^^%&9QgE*VSD;Dk5Xe=ga#M+8Ny>VTMzDy4K zQj5u`sxa$!QV#~F$~GFy%wVkeZ?P&(M8gJC*kIasI< zKpA>3jP)$jK?A~Z1amQLs}}2UfPKCIzdd$m-GKnE?043k4Y4--A7UApbO- zb8>%jT^i3{IM>9re2-JNC4~Lze!Foc8I|UcG+A18twnU<%~fSuiz?IhLl8brKLt3R z;JJGHp7!+(XARPKLxM(@CN+Ol774ed51ji1Q%~lJSQ=ya^XRwsy|OD~w~891gF%#-IIyhfgObfs>5Fo3>|uW zU&|&>_GGQ7Y;sS(^6HrG0oQkkrIPmOdd^o}R%_lfDYtJ+4@)}|w@!cip~&p}Is7># zGjusiuNC^mO$EEB_t!QaQN}fEIpl&Ykerg)7%o{MU&72GT6qFLBe6g(IX)yC>^LpK z_nAV*QiZ+Ua+_O=RpCV%WLy%U=2z1dop)+KG$HUSi#J| zU;)JJK=$p}Y5X9u2W$)s22inGa@D3FF##?HhCfUYbqtQSW?(U11_lkNI2$T@q^0sAUOsQAI9dHZ0l?=x!KuU4Nm{AU87r0K=`p3jhEB delta 1313 zcmY+Ee@s(X6vxk_m4fo4B5h&(c)*~Oi42FjLEDEYwS~~~I!9KbGI21hqZHc`wvk8| zJL7&u@N7#~(9}$rzrheq<|GRt`)e-KsQVF}a|u)CbRj0rEy1vJ-)k#-$+`FY{oHfk zz4zVIj(y4XPjPAha~(iSKLBV*ZyQi+xTG`sVnd0S5X8ZY@S$eLk#3kjUHQYeUu^Gq zXU~=^H?%(=4}Vk8F6=sY{aMQTYJ9w)U4frf~t^9E0*c(0}t3*CQlPde;%u^KO9eq7ss(I=SQS^I_ zh1K1yF3*MzSC;^;PQTY<>-M=`V;Rxsk8G~ei zk_ZbOwAvUdqf3p>-KYz1lGw5*b1gFK1E&_CkVX?ItdYb(gwa}18(~L@b&+38Q5Rtu zI)G{NODIBXvYM#_$N<X8r1;#YiudBdWX9A8nr#T&-aunhDrZiG# z>^$CUQj_}4{({u(); + // wait for outro music + last music loop + 5 seconds before switching to the next level - Invoke("SwitchScenes", Camera.main.transform.gameObject.GetComponent().outroMusicClip.length + - Camera.main.transform.gameObject.GetComponent().musicClipLoops[Camera.main.transform.gameObject.GetComponent().musicClipLoops.Length - 1].length + Invoke("SwitchScenes", mh.outroMusicClip.length + + mh.musicClipLoops[mh.musicClipLoops.Length - 1].length + 5); } diff --git a/Assets/RockSphere.cs b/Assets/RockSphere.cs index fe6998f..4420a7b 100644 --- a/Assets/RockSphere.cs +++ b/Assets/RockSphere.cs @@ -72,7 +72,7 @@ public override void OnStartServer() totalRocks++; currentRocks++; - Debug.Log("current rocks " + currentRocks + " Rocks " + currentRocks + " total " + totalRocks + " destoyed " + destroyedRocks); + Debug.Log("OnStartServer current rocks " + currentRocks + " Rocks " + currentRocks + " total " + totalRocks + " destoyed " + destroyedRocks); rpcSetRockStats(currentRocks, totalRocks, destroyedRocks); } @@ -97,12 +97,18 @@ void OnTriggerEnter(Collider other) GameObject explosion = Instantiate(explosionPrefab, rock.transform.position, Quaternion.identity) as GameObject; NetworkServer.Spawn(explosion); - destroyed = true; - NetworkServer.Destroy(transform.gameObject); - destroyedRocks++; currentRocks--; + Debug.Log("OntriggerEnter Rocks " + currentRocks + " total " + totalRocks + " destoyed " + destroyedRocks); + + // let all the clients know the current rock counts for music + // IMPORTANT!!!!, this must be called before the detroy or the rpc will never go out. + rpcSetRockStats(currentRocks, totalRocks, destroyedRocks); + + destroyed = true; + NetworkServer.Destroy(transform.gameObject); + if (rockSpherePrefab) { for (int i = 0; i < pieces; i++) @@ -111,11 +117,6 @@ void OnTriggerEnter(Collider other) NetworkServer.Spawn(newRock); } } - - Debug.Log("Rocks " + currentRocks + " total " + totalRocks + " destoyed " + destroyedRocks); - - // let all the clients know the current rock counts for music - rpcSetRockStats(currentRocks, totalRocks, destroyedRocks); } } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9861984a752be30a740c2c5d7e930ae86ef0d8cd..4794c37a03dbac71db4a0fafa0a9d2f81291930e 100644 GIT binary patch delta 33 pcmZ3YJwuy=fk8xrfkAY}Mvgbaj1iN+3ZG}>ntW8Gda{pb1OS`p3OxV- delta 40 wcmbQCy+oUXfk8xrfkAZ1Mvgbaj46}93ZG}>o_tiKnvIcxfuY%MvXy8Y0O2zW5&!@I