diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index be641c6..85d392b 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -81,6 +81,17 @@ //今回のゲームで使用するキーワードを追加 keywordList.put(i, randKeys.get(i));//(dno, キーワード) } + + //1ターン目の作成 + nowTurn = new Turn(); + this.turnList.add(nowTurn); + if(turnList.size()%2==0){//偶数ターンなら青い色,奇数ターンは赤色 + nowTurn.setTeam("b"); + }else{ + nowTurn.setTeam("r"); + } + this.turnList.add(nowTurn); + } public DrawingController getDrawingController() { diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index 0f126d0..e0a540b 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -123,7 +123,7 @@ @GET //カードごとの疑っている人のリストを取得...は動いてんのかな? @Path("/{rid}/game/turns/{tno}//questions") @Produces(MediaType.APPLICATION_JSON) - public Boolean[] getq(@PathParam("rid") String rid, @PathParam("tno") int tno){ + public Boolean[] getQ(@PathParam("rid") String rid, @PathParam("tno") int tno){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); @@ -135,7 +135,7 @@ @POST //怪しいの切り替え @Path("/{rid}/game/turns/{tno}/questions") - public void changeq(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("cno") int cno){ + public void changeQ(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("cno") int cno){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid);