From 54c40d7cf4f21d344615d79ff879eb4a347beddd Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sat, 15 Apr 2023 16:05:42 +0200 Subject: [PATCH] Mini Game Improved --- FlufflParty/Assets/New Terrain.asset | Bin 2085228 -> 2083932 bytes .../ProjectSettings/ProjectSettings.asset | 4 +- .../UserSettings/EditorUserSettings.asset | 4 +- Server/.idea/workspace.xml | 2 +- Server/out/artifacts/Server_jar/Server.jar | Bin 13716 -> 14129 bytes .../out/production/Server/Minigame$1$1.class | Bin 611 -> 0 bytes Server/out/production/Server/Minigame$1.class | Bin 1649 -> 0 bytes Server/out/production/Server/Minigame.class | Bin 1562 -> 1106 bytes Server/out/production/Server/Room$1.class | Bin 3361 -> 3361 bytes Server/out/production/Server/Room.class | Bin 6025 -> 6043 bytes Server/out/production/Server/Server$1.class | Bin 4462 -> 4462 bytes Server/out/production/Server/Server.class | Bin 2940 -> 2940 bytes .../production/Server/TestMiniGame$1$1.class | Bin 0 -> 643 bytes .../production/Server/TestMiniGame$1.class | Bin 0 -> 1666 bytes .../out/production/Server/TestMiniGame.class | Bin 0 -> 777 bytes Server/src/Minigame.java | 71 +--------------- Server/src/Room.java | 2 +- Server/src/TestMiniGame.java | 78 ++++++++++++++++++ 18 files changed, 89 insertions(+), 72 deletions(-) delete mode 100644 Server/out/production/Server/Minigame$1$1.class delete mode 100644 Server/out/production/Server/Minigame$1.class create mode 100644 Server/out/production/Server/TestMiniGame$1$1.class create mode 100644 Server/out/production/Server/TestMiniGame$1.class create mode 100644 Server/out/production/Server/TestMiniGame.class create mode 100644 Server/src/TestMiniGame.java diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 00deddd921deb09377b5862a3b40fc90b24db9e2..141b11d8619b1cb3fa0261d5f2812a8bdb0f8f3c 100644 GIT binary patch delta 191 zcmWl}DGtIw06@`n%D(TzTAEA+8imJTNWh?Q+@KBtLo%WkS2XDbNJwfp00N0Xa0Ivm zAMxJjtluYnbi`wQaTiKNOXI7+R~7_pB#=Z3X=IQ^4tW$%L*a!V(sTgfH) za5Ca7=TiI{9@o7<=H#M`l$DhUO_GfYV%MuUSMLcplCXfx1nNm$U7dO{UFwh9ucyG} z@J)P|?=0LV^T>n`Rgj#V9ASiPDulmEnz#V76Dn%;7KwYrL?)A|y-rL06%mEyFci0q zkI|Nc;~#Cv7=r4_*w~mb(z8qh^P|O_udE9$7$%TOi@Oh@p`k+4DXWGrf;+hWVLc3a zHz5=BxdydbtD!_2JM`1 zr2j70oL>tC&qt85#oh=V$<57GC$q1)5$TPQQ&XI^y#@}Se}&8ks_#fxSeUR9;O&7O zajW@g|BLW#S~oJ^OzKHyW~R`z9{0qTwaHw;2_4MmJVoYQa5gcU%|bIf9Eg0g1D{(t z056|BL@ElMKW-!)9UVdxb95_)Oy1_w_L|_T$0#x*p9J$UF)>0DUK)UxdaiNu-LueR z`w*Epk%7$2%&3*8rR@r%cMr^|3i;hB!FWvdn?+lQNH}9Fdd~|^G=RKY$?sAJ;hy`` z7HvaHFqur27qKSb_YC;#t3!PDxD?Y*{b>=~lT7}mMuDRf zWn_GOTo`g&Q3%goJm5B`55lpXbI3gNoWuaSK-6jOARi>!IR@W@OgwDX7Th>tG0 za_z6?!EkR7nLs~@27P^fg{aNA5%sp)x#-}fIBhmrY>90oX=!QdkPPYG^)>@ru-`nw t`TT7FzTS+?a=nryB_&x#tn*YEQtEBWomxe$raY)M)Y=wRhUYJl{{o>JtZ)DT diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index bc5a504..8c27b84 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.16 - preloadedAssets: [] + preloadedAssets: + - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index c0df6fe..f96d479 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -21,10 +21,10 @@ EditorUserSettings: value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 RecentlyUsedSceneGuid-5: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0254505450065d02585f5573157b0744424f1b282e2971342f2b1c37b2e6663e flags: 0 RecentlyUsedSceneGuid-6: - value: 0254505450065d02585f5573157b0744424f1b282e2971342f2b1c37b2e6663e + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 4cc7230..369c217 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -103,7 +103,7 @@ - + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 294ee1c6719144f60f64a3bd548306c3234d4148..9e2ffbe6fbf9cb991851412a486a5b900777e5fc 100644 GIT binary patch delta 12047 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 delta 11722 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 diff --git a/Server/out/production/Server/Minigame$1$1.class b/Server/out/production/Server/Minigame$1$1.class deleted file mode 100644 index 3d60a5fea308d30bfde79bd0d096d30a142629a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmYjP%SyvQ6g|_%#>P?W`~8kuE2srmDs>?WLUp0VeQbw1nkJC6{+Cb{T=)Tglz1j> z)IjFG&YW}a%zS-+d;&N`DUTfH9N3u8BaekV7O~`D87nqcZLA68+7CK*%Qn^pt01Q@7`x-yc*U$ z|IUlFiTg>*ND7SnV@U+EQ6~_{77e3w8+M|)y3mGYIPGKa(R=o&a~{7QEt?ebG*&iLwI;$I=2yAVRznS1Zv-#z#DaqhXh|NQsoUjVMaPhb%5 ztL_8U-7;|+c@ytpHi6riQ{B9Y4{=ALVB#)5N}z~^I2KJT;hx0DCQczQaoh9kWr+t8p9)w7-*=m{H9H90Kp^qZuBAP{>TU~&f`F;!PR(=uP#|8MjozjO zy25oYNKX(@T=0Bv&91x3dXw+rjKE-~V=lCJjV=r5vyG}N&{On$cd=Dpb(>{-wMI){ zvEkUYWxMIA`Jqu)QJCYAv-BjRXw8<-KBN2zrqx^AupipFR_N7oWv}iwiHU_=7&y65 zwu4PB8lJz^;(F>}-D~7-+o4@h#!}dH?Yb(Z(F!BbnU_FIk@W}_C%UROGvZ2Kpt}^> z&gO!>6%`QCT#@)p;t~&v#FMX5qt$fWc~2GH-RAD1s(`f2`A)47c>dag8?HC15-S!y z#}^jfz&Q(N@S26Qc-_JExdwKifKEJ z8&IHL95jb@-sXD1m7ex2KaRwXZDkz*%>zEhV4S;iiuABZ1!?UFPWw z@{>W@pe2(^H~>d#CmN|Heh*@7!+4XZxA=C4bDd*@(=UMd-KL zcM%PGO|u`2JoIA(=Q-m}rBbd7yo1bvSJ8yQJ-{#7rx1U@;1FZeN~(K`uHwNc7n0_S z_~HfCS2Vp`(Y12LVC!O&Y;m@vnk3aM8BG&fc@Oa&7*qP#_#Vs$m}J7uKwl+lmAJ@oJF|2?Je?7v_^BdGAkC3v}h#7`K2 z232;RpHYy$Bncd1nZqn}B*KmoeV*tXs+hz!uHq4{<1udF32xCxfnMhEGeQcd2|A>42tTL`&E$viy}H#=PLJsO5_7ps>xP2yb$ kiR&Vj<|qFKVN-;~FpZlWb^bMGkm6e(ZG#-uqsrm)KL8|V^#A|> diff --git a/Server/out/production/Server/Minigame.class b/Server/out/production/Server/Minigame.class index c61b09343bbd648c7d0bf0d160c143a8a3874f20..dacb5a0253674976d9d466f1c8470d62f209550e 100644 GIT binary patch delta 661 zcmXX^L2nX46#iy*VU}fqibAQVNGsGXl+{wTYHh7mYmH4ba!@a3RiY?qjG{-m_y-KP z-r7sgO$tpl5>FmHdh!Q&(tpr2>Nksd**EXa`{sS$o7pwzyLIo|pO1Y2)3|9PiHd?} zL!uJF0i4qAbOckVDopF78pRo$)$W|ajEyMHD_pP!Na3=B5gZl>FE$(X)t177gDY5c za23}ChMxOxeXr@SKJ{wPUe*044z9Dsy3E9uP;hWVyJhZtmE-Yv0DjYIG`(Am*PWX2 zpl#+kL6Wl?Ff|_|6C{VgFk^`fbMglWfh>-&a+Fz}CnVRry942Vg1o;2qYKk5brEt) z+X(kRLv>+o1#OPerxBu0v0;LiCfRTs$H|Zjia|H#d1mYzs1c^XD8`rzoIv3}_fIk# z+`D7UX5DR=yNC#EPzvMhE^LV}i1y%Y!dfZ!5PvVk=HDL!u+`r{l0Yjv)kC5klztDI z3<+$JAwfN(d_4nNbcOG!)g;KC!vrfu>N$yV?oHBW;9-I55~{e(KSs~ua>OxyMWQ6F pMEnFhdz^I;QF}0HQG@lJg!duELxqyLhtNKR*yH^Rlv$LR{0DLdT{Hjy literal 1562 zcmZ8hZBrXn6n^gJWs_xT(ojI9YN4n}CiA5B3e5qqe$5#dn+%%BHtpVJ|*J@Q#t8dist=g7#EE~vR#Xth9 z%6v!1T^(xzX32G>w^X-UE!h%?dX2`eK)k%hd0s&GA9>QM(UUGeww_ppw(rynWvAuS znOt{vT+45JQeg6oyBO~4mb+7^1Q_!R3a?qWo=T5+$<6Xo-I1;WiWeQ%@fT>!hQzrI zrn1zi5ja(LT)EQT-IiX(+OE@*DK~7ZzF~Qe+INgm|B*vfqr6P09cx#r{H$6n!i8J-JFLJHZ|Yl|0KbpL@WTwtUM|ge~W1mXU2^ZzDUBrr~TU*T)j3rY?=+ z`qJ~-O~#~}9(O?(E1qQ&A!gSbt#Fo>$6}4}g@Ug$s>;okrfLs?w}bUN+_P6)M`;_! z1jozVNuJO+kLM4e<&P1m9wNGrSbl0B@%+?F=qJA;u@CWrK^i7Gjv&S{O&}8~oW}*e z=SvvEdx0+i!~6JvJHiIZ@Dd`6T!-=rbe;t!j*+Y$!>HyjP90+45avq$C1TS@7}RiY z`T*y8oSERnsQPkH&?<571bq1r>6C8*c}$Uq=(vJuW}IQBGbm7|z%1rEIs8pegi&`R z#W6*Cgp|NDR)OoWBcwI_f#d!F#n{yYTnIe>gc!pD zFG!GLr6))n3CcBt0TNYcy-)i?daA7aCJR(yf?N2M_jHl-ZPX}Ap31sRX;<+f6V)i` z8e;`zywO=P^^WL|h(3(?YiMFi$H&oEh`ojouP~ZU;1j}!jV^Fjb&09Wf8`==I?)*g);E~ diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class index 0b80084a09282a0e046a9eed81e0c97dc39e2b22..85fcad110b04068ea4df595ace6b8e313a80d423 100644 GIT binary patch delta 331 zcmWN_O(?^00EhAK_xEyOJCLOQ2dNpYRxXpJNv$Y_Vkw$LT-3-yiD^Zan~SNnHRdIW zP;*goQgTxci(*B@Z76Xdzti*S$ygcdcu8?J8&eNDnm{p z4PT-hKf;M$5i*^Qk|IJWqAU_Cw2L@P#I13jW#W;R_+X{<(2|X;l1+5V4!UH3ZW%XD zvQDO1FAwRJC-lj0<3Bbl(yvO{qAJ*?g2qE^S0n6HQ|wZ+>`~{&7wlD+462442h=?W qwSz(J;;?peRQnjxeva#aaUa9FpObow5k0{f9p;=~U?iKcE%P6Db5Yv> delta 331 zcmWN_PbkA-0LJm>dH!chLb8>bR!Z7IJ1y_&`{|o;W}H{sio5x^D(cuC8gYOo9KwYYbRvN+9Af~d z@F9f>oFj>>Q3h%AvdG~A*SJK1Zrstr1HE|UhVd4j7{@b@@X8e4Su!r8$O_8*#g`DM z2phhI13#hzRk3Wk8pEGhM@_^~7yG10P>VO?5*x%P?V`#SY0)mdbjTq(rJrpw$aa}9 zKBHTv*&}o8lQ-;_HRC!hMS4^-y{eVNYQ{Lk5w*ZEwL+g-IX%db9_73a8c%ak&vHqJ8PySnb(9gk$!I=l+u=VJaZ+*s diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 6871c984b011d405a47564e8de18b12046f57f4e..f15e4cc8b95b2caafbea32228d3eb58eb49dc522 100644 GIT binary patch delta 1025 zcmXw&d2Ezb6vcn%4byMtn`aw9a3LhaVk9A2{xC-QLq%C^kR{Tn6pbD0*oD&8wgDkF z6XSxS4eBHY10^Ho4TY+2IYBtEmeUq~4{0Ee?%gw(@3(CYQI^=2AnmLyN<9 zmx;XXkaC$!(pS6_Vn>Kpmz}iv$@UN(A>Q@FT|Vq~=yZ6`Wg2xZnRJEd_Ic0!KJJas z!@e--yzj#YK78oge&ieWhWVIJ{OD7c&-mQ+7W#a}7e4Iw4ZaL{LC*RJ+HX5A|74l8RUBg4#zCV z`PK3pMgMCHOEa^QRl%t`k!%c3iJY{Y;&;nw{zx7U-Vi#?pyf}7k|Wcii8CT2yP!NC zdo;SRIJPogK0RtV>l^+>k;6I5d4??)_}lW24;Ov7#C?{_!jY_u0#+jwbd+Z0cv6KZ zvI@(!ipW}B;kV{g{!LsE9v!eeLR`EB|STkSWSdAT**tGMK#y)G7pfXKu__Ep5}QyOH$AA z8mrl$7ulj}Qd&!=*0EO`b-ikIn>J~tYL%tUTA(`Rs6mf;T&%5HrDj#BNeOM!8ZWL^ zs|K~xgw$rz)ow=LsSb0EcA3fQG}Ao3S>0x)_L(`_W3tp^vbEOasM_SJ&#cgX)9mpM z4VX3^FzxC$Jvx+{H|nZD;wWJqW44a7K&QA@Cs?FG9@G%8>kPFTrcURm*F~CjnUe<2 znjq&*fMFAsF%jKvtnM}=HP>Y59y3NuyvCNAYqidd*LpKf8@ybtiK@X&P?MRc?Pd}& P@2ii+XnyL*n0oySAB+oU delta 975 zcmXYueN2^Q7{-6sb2#UH&&v}uN~N{7li6}>1%I@bt?6i*QJR%xMOKoXLPSw;R;D|} zXtOr{$g|9ntwco1544jal!U3NXl7rQrDa-vg%&DBR@C#Z{<*Gu_kCa2b3gaJwBW^p zpnIUB6SzSay&NP{`Mephj7E>;0r@n=iLxS~nUx+bao*x>pH%^?SreAmdbE113mD3J zk9Puwkq#9ZpLcyW1Z<=&Om6aN_vr}3_d|HgnpOWiyhNhpD$5;yaJ;ErZd=n>0NeiS)VE30afi5dTQd;DZM#&OGu^xWtOolLKb4$nSi`I#QeY0jjNMz8Zv z^NZzIdeix_MCz=_Eh(=~mOY-hyRz(=WcAGn%em0vJQW^&mf!f@($6233nBa&!e30X z{LO&JKUPRqMiEb0R#7Kaj0!7HzExa-RW=pEoAci*R+e57Pt?q*nl&rk78{;973
Eqd5SB`Z19EGLG-FFOEF_y<1motv(6jRCg%uZXRqI>X|NG>G|<~}ZG5(!GV zmdUQQl$n$s1wNi6-cEm8wBcIIh$inx`f$ z&@!d8Trat}UaQor)yCHvlcTlfl3UekF4KB5Oc_(?_(p9sqt#)?s?8Lu-IS=#l&aQD z(RTBcc9>Sj8??u4(k|1k-DaEiW**HO5=k8(u7ljBLrl;S?$u!?>KK!Cg4cACMx9}W zdT7>JT6LZt_0gvb^vhjV12P7UGSclPraMiR#+g75xe2G6TrDwqT52vPx# delta 42 zcmV+_0M-BQBJLuvm=7Jt0?q))0@?t{0`LIO0{8&b0{Z~b0{j5e0|Wrov$YSo0gWCJ A)Bpeg diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index f2c08ba3cfd2a0f4e557edf5367415a3f6c52df4..6047c4e7c5338b56ded3d7b155697fcf0faba94f 100644 GIT binary patch delta 76 zcmew(_D5`k6esU323v;P3=Rx;7#tZMOjhSSult&TmEkP|FT)20QHD23v+33=Rx885|kzPFCkUuls_5mEjcwFT+~~QHJ*n8Vp|;EEv85 fReWa%28u^A{AEaGWMC*@WMU{~WZkUH70Czymx2{t diff --git a/Server/out/production/Server/TestMiniGame$1$1.class b/Server/out/production/Server/TestMiniGame$1$1.class new file mode 100644 index 0000000000000000000000000000000000000000..ac7a96d2ea6c44c26d8a2b6de0136ec0ad3ec607 GIT binary patch literal 643 zcmZ8f%SyvQ6g|_%#>P?W`~8kuE2ss*g~g4i2-Sra_puH-nkJB>{+Cb{T=)Tglz1ks z*c!;(*O_zf+?lWMk52&mDCLpEi~}39dE_yd$2=AsEMm#VvW*piT=Jk}w`^loK%NJI zijI9Rj#VsBsMb`RT34~ecYN{$4^ivNpSHv-mic&7x0t2$7Z&Bm>YYTm8S z%xE>Nd;X0VX%lynmXS8KUYS%V8#M!gY|*ef*I_fNt5a>5M!LZ}kKVIKy_2Bshp`Us zFI4gn-bsvMT%sQX64H2UaBZwhY+%zyQDO_@JYF}GTXxGlmEqfMCfeVv>4xb(ei9h! z1^&)#kCmR*IUm^#G0r_9iTI9#~EM!OZ+Ru?`{YrZ06p(_ndRjkMDeU^Ur^;{sM3XUKIWK zTuoo7>B|_-A{)hLn2F*BX4Nzo!%f_h$i;9QUqz9}d;|+IEaHyD*D-VIB)%0ebDn4WGp<#u*)@UaL(5G%Ud7%P5IKRE+Lv9&_5y)OekOdI z66g%poLcgtKv%wK*MfP+b8cFjw$fbZdoV39m}*z$nx{vW1oW9|#TGc7cRYKczPV!i zMQg>Sq$gi3TkewOJ8FL@)KxTrc$>rIB%^75-Q%26J_S?k&aYb!t%-WzxD!QZ)Ani8 z5m3>0Qc<*O8&n#Ow^gS;(a<~9i5pg6<&>}x__npFN~+d_&}gvDXfc!?Sw(1FQHL3E zIV*6g5Lo4nd21^yB80po@twpaHjPanxP@xnFWYmDD!jWD$8l8!;hFWyZnfrktMhiS zR;@@Zo4AkfO}vZqCI<1giF0_z#1K*@9^eOwA5Dy5+{6SfGMEVqD*|UiP*_`Tadx|G zZv{@(lPH-egFbB&KVg;72kd0~Be7<}!8%hpfh)Vwns9P5IjPdvFyUge8PT=8)rq5s zBuo1d`Ut&-W{WH9cA1UnITqcmdtQSTXPX6_XpX=@tEROhq;_jGQroIj8vLay)g)t1 zF-LB>)+5_j{9kS=*!HHi@w4v)Y>|;#&W7Ywoj%<1jcYMb? z=F?F-TEr>|W#p31eW?b|LR`o%_J2ynJ=1=pcmb3&QY)|7mAc|k;_%=x{X>@D9$8{* z`uPnZUeMxk#TW-t_1mMEcwwI?`i%(9$oV{~20; zz`2vwKsS<{`$G@C7{-U(@uZ?D^#UIu)$l5O7(4?!PwztP!r;=up%v7$i_UywmGkk~ zo5;ciHJ3EKSkkp($>8YZkQ@FM!dwDx-&*XPZ+)E*+=ir!QUBu=im(s8b*m%F3Q{W8=j#L z8dTX?epgk&ae_L)-w**ECUhmv_X*zvTtEfm*v2J1##KCF5>GKrA9M6FgWtI-$fgO# z69P4YG{Js~7)E(geXyS&!Z?6m)s1HIL-<8q>oBLsn51V7muYz(#sP!s5?3UyN?eop n7((I`kx24C;8U7qXx4!#T<5CuZ)6$?zV%Sn&s9CD96tX8=5B77 literal 0 HcmV?d00001 diff --git a/Server/out/production/Server/TestMiniGame.class b/Server/out/production/Server/TestMiniGame.class new file mode 100644 index 0000000000000000000000000000000000000000..568c9bec24bfdee87f552b6a8abc747e50cb5793 GIT binary patch literal 777 zcmZ8f+iuf95Ivil6W2}Ca4D2>XNkf6RpuR)`MYye0qM-I|6R%oVjxE_v#cv@Y zDyYN<@KK1fc3T3LJi9YHbIzIB{q_6DPXKT5+JuS62A&vLH&H~(L;)K$)UdgLr+B8_ z=LT#8Z2@Z#hAQp{GD%b-PJzE%4poxw5$?U5svc2d;*lZ8C4=<5e&DMxr3%~4x4nTTtW2)r z)$6c8*$+MSSwIZP zs-4f>+|h}SHd_{6pkrX$LKiPB?BEsE&L<00b(1G-Qef5ox9h>Re%;lIJtz5a7KVCg z*?^5SYk*U0Cp@yJ;tXz2pwedjAGo$oLT_|*A^>R+B_R?#5p2RwvJoqHLdlOx^mwXlMF f1S07D1UK literal 0 HcmV?d00001 diff --git a/Server/src/Minigame.java b/Server/src/Minigame.java index 441b481..550c0f5 100644 --- a/Server/src/Minigame.java +++ b/Server/src/Minigame.java @@ -6,16 +6,16 @@ import java.util.List; import java.util.Timer; import java.util.TimerTask; -public class Minigame +public abstract class Minigame { //referenz auf den ursprünglichen raum protected Room room; //liste aller threads zum korrekten beenden dieser - private List threads = new ArrayList<>(); + protected List threads = new ArrayList<>(); //liste aller temporären minigame verbindungen - private Client[] players; + protected Client[] players; public Minigame(Room room) { @@ -24,70 +24,7 @@ public class Minigame } //fügt dem minigame "Raum" einen spieler hinzu (ähnlich wie im Room selbst) - public void addClient(Client client, int index) - { - Thread t = new Thread(new Runnable() - { - @Override - public void run() - { - - players[index] = client; - DataInputStream input = client.input; - DataOutputStream output = client.output; - - //Buffer für eingehende narichten - byte[] readData = new byte[10]; - - - //TEST - try - { - output.write(new byte[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}); - } catch (IOException e) - { - - } - - //eingehende narichten verarbeiten: - while (true) - { - try - { - input.read(readData); - - switch (readData[0]) - { - //TEST - case 1: - System.out.println("testtttttttttttttt"); - - - Timer t = new Timer(); - TimerTask tt = new TimerTask() - { - @Override - public void run() - { - room.closeMinigame(); - } - }; - t.schedule(tt, 1000); - - break; - //TEST END - } - } catch (Exception e) - { - - } - } - } - }); - - threads.add(t); - t.start(); - } + public abstract void addClient(Client client, int index); //das minigame wird beendet public void end() diff --git a/Server/src/Room.java b/Server/src/Room.java index 725ecd8..8f35ff2 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -67,7 +67,7 @@ public class Room int randomGame = (int) (Math.random() * 1); //minigame instanz erstellen - currentMiniGame = new Minigame(this); + currentMiniGame = new TestMiniGame(this); try { diff --git a/Server/src/TestMiniGame.java b/Server/src/TestMiniGame.java new file mode 100644 index 0000000..f5976af --- /dev/null +++ b/Server/src/TestMiniGame.java @@ -0,0 +1,78 @@ +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Timer; +import java.util.TimerTask; + +public class TestMiniGame extends Minigame +{ + public TestMiniGame(Room room) { + super(room); + } + + @Override + public void addClient(Client client, int index) + { + Thread t = new Thread(new Runnable() + { + @Override + public void run() + { + + players[index] = client; + DataInputStream input = client.input; + DataOutputStream output = client.output; + + //Buffer für eingehende narichten + byte[] readData = new byte[10]; + + + //TEST + try + { + output.write(new byte[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + } catch (IOException e) + { + + } + + //eingehende narichten verarbeiten: + while (true) + { + try + { + input.read(readData); + + switch (readData[0]) + { + //TEST + case 1: + System.out.println("testtttttttttttttt"); + + + Timer t = new Timer(); + TimerTask tt = new TimerTask() + { + @Override + public void run() + { + room.closeMinigame(); + } + }; + t.schedule(tt, 1000); + + break; + //TEST END + } + } catch (Exception e) + { + + } + } + } + }); + + threads.add(t); + t.start(); + } +}