diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 00deddd..141b11d 100644 Binary files a/FlufflParty/Assets/New Terrain.asset and b/FlufflParty/Assets/New Terrain.asset differ 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 294ee1c..9e2ffbe 100644 Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ 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 3d60a5f..0000000 Binary files a/Server/out/production/Server/Minigame$1$1.class and /dev/null differ diff --git a/Server/out/production/Server/Minigame$1.class b/Server/out/production/Server/Minigame$1.class deleted file mode 100644 index 1429e9b..0000000 Binary files a/Server/out/production/Server/Minigame$1.class and /dev/null differ diff --git a/Server/out/production/Server/Minigame.class b/Server/out/production/Server/Minigame.class index c61b093..dacb5a0 100644 Binary files a/Server/out/production/Server/Minigame.class and b/Server/out/production/Server/Minigame.class differ diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class index 0b80084..85fcad1 100644 Binary files a/Server/out/production/Server/Room$1.class and b/Server/out/production/Server/Room$1.class differ diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 6871c98..f15e4cc 100644 Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index 1d02809..4aa3e47 100644 Binary files a/Server/out/production/Server/Server$1.class and b/Server/out/production/Server/Server$1.class differ diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index f2c08ba..6047c4e 100644 Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ 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 0000000..ac7a96d Binary files /dev/null and b/Server/out/production/Server/TestMiniGame$1$1.class differ diff --git a/Server/out/production/Server/TestMiniGame$1.class b/Server/out/production/Server/TestMiniGame$1.class new file mode 100644 index 0000000..ffee9bd Binary files /dev/null and b/Server/out/production/Server/TestMiniGame$1.class differ diff --git a/Server/out/production/Server/TestMiniGame.class b/Server/out/production/Server/TestMiniGame.class new file mode 100644 index 0000000..568c9be Binary files /dev/null and b/Server/out/production/Server/TestMiniGame.class differ 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(); + } +}