diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index a3459bf..b96cf8e 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -10,7 +10,7 @@ public class HelloWorld { @GET public String getHello() { - return "12/22-17:00 ログ出力8"; + return "12/24-10:40 あと一息"; } } diff --git a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java index 5f345ab..99dac3f 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java @@ -70,16 +70,19 @@ //String[] keywords = km.getKeywords(path); //Game game = new Game(room, keywords); - session.getBasicRemote().sendText("3"); // ここいけてない + session.getBasicRemote().sendText("3"); // 同じridのメンバーに一斉にメッセージ送って、画面を切り替えさせる // 本来はここに処理を書くべきではないかも。 + // ここいけてない for(Map.Entry entry : sessionMap.entrySet()) { - if(entry.getKey().contains(rid)){ + session.getBasicRemote().sendText(entry.getKey()); + if(entry.getKey().contains(room.rid)){ entry.getValue().getBasicRemote().sendText("changeState-2"); } } + } }