diff --git a/src/main/java/com/ntlab/irisserver/entities/Cell.java b/src/main/java/com/ntlab/irisserver/entities/Cell.java index 1e4cdc2..1217fb0 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Cell.java +++ b/src/main/java/com/ntlab/irisserver/entities/Cell.java @@ -16,10 +16,12 @@ @JsonProperty("cno") public int cno; + //コンストラクタ public Cell(){ - isOpen=false; + isOpen = false; } + //setter public void setIsOpen(boolean isOpen) {this.isOpen = isOpen;} public void setColor(String color) {this.color = color;} @@ -28,6 +30,7 @@ public void setCno(int cno) {this.cno = cno;} + //getter public boolean getIsOpen() {return this.isOpen;} public String getColor() {return this.color;} @@ -35,5 +38,4 @@ public int getDno() {return this.dno;} public int getCno() {return this.cno;} - } diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index a6e50d7..be641c6 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -142,6 +142,7 @@ public void createTurn(){ nowTurn = new Turn(); + this.turnList.add(nowTurn); if(turnList.size()%2==0){//偶数ターンなら青い色,奇数ターンは赤色 nowTurn.setTeam("b"); }else{ diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java index 8795b93..015c51c 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Turn.java +++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java @@ -23,7 +23,7 @@ @JsonProperty("gamestate") private int endstate;//0:game継続, 1:game終了 - private List questions[] = new ArrayList[16]; //> + private Boolean questions[] = new Boolean[16];//> private List openlist = new ArrayList<>(); @@ -59,7 +59,7 @@ public List getOpenListAll() {return openlist;} //リストそのものを返す。 - public List[] getQuestionsList() {return questions;} + public Boolean[] getQuestionsList() {return questions;} public int getTurnstate() {return turnstate;} @@ -68,10 +68,11 @@ //--------------------------------------------------------- //questions操作 - public List getQuestions(int cno){return questions[cno];} + public boolean getQuestions(int cno){return questions[cno];} - public void addQuestions(int cno, Member m){questions[cno].add(m);} + public void setQuestions(int cno){questions[cno] = !questions[cno];} + /* public void delieteQuestions(int cno, Member m){ List list = questions[cno]; for(Iterator it = list.iterator(); it.hasNext();){ @@ -85,6 +86,7 @@ } public int sizeQuestions(int cno){return questions[cno].size();} + */ //openlist操作 diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index a7d3b45..9c8c2a5 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -106,47 +106,26 @@ @GET //カードごとの疑っている人のリストを取得...は動いてんのかな? @Path("/{rid}/game/turns/{tno}//questions") @Produces(MediaType.APPLICATION_JSON) - public List[] getqmember(@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); Game game = room.getGame(); Turn t = game.getTurn(tno); - if (t == null) { - //部屋がなければエラー - var response = Response.status(Response.Status.NO_CONTENT); - response.status(404).entity("部屋が存在しません"); - throw new WebApplicationException(response.build()); - } - return t.getQuestionsList(); } @POST //怪しいの切り替え @Path("/{rid}/game/turns/{tno}/questions") - public void changeq(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("cno") int cno, @FormParam("nickname") String nickname){ - - boolean on = true; + public void changeq(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("cno") int cno){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); Turn t = game.getTurn(tno); - List list = t.getQuestions(cno); - for(Iterator it = list.iterator(); it.hasNext();){ - Member m = (Member) it.next(); - if(m.getNickname() == nickname){ - on = false; - break; - } - } - Member member = room.getMember(nickname); - if(on == true){ - t.addQuestions(cno, member); - }else{ - t.delieteQuestions(cno, member); - } + + t.setQuestions(cno); } @@ -186,6 +165,9 @@ for(i = 0; i < 16; i++){ Cell cell = game.getCell(i); boolean isOpen = cell.getIsOpen(); + if(isOpen == true){ + + } } if(card.color == "d"){