diff --git a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java index d1da638..f11b88e 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java @@ -10,6 +10,7 @@ private String team; private int max; private int turnstate; //turn内でスパイマスターと諜報員の操作の切り替えに使用(0:スパイマスター, 1:諜報員) + private int gamestate; //0:turn継続, 1:turn終了, 2:game終了 private List openlist = new ArrayList<>(); //--------------------------------------------------------- @@ -29,6 +30,8 @@ public int getTurnstate() {return turnstate;} + public int getGamestate() {return gamestate;} + public List getOpenListAll() {return openlist;} //リストそのものを返す。 //--------------------------------------------------------- @@ -48,6 +51,8 @@ public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + public void setGamestate(int gamestate) {this.gamestate = gamestate;} + public void putHint(String rid, int tno){ this.hint = hint; this.max = max; diff --git a/app/src/main/java/org/ntlab/irisclient/models/Turn.java b/app/src/main/java/org/ntlab/irisclient/models/Turn.java index 7995657..4863a96 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Turn.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Turn.java @@ -9,6 +9,7 @@ private String team; private int max; private int turnstate; //turn内でスパイマスターと諜報員の操作の切り替えに使用(0:スパイマスター, 1:諜報員) + private int gamestate; //0:turn継続, 1:turn終了, 2:game終了 private List openlist = new ArrayList<>(); //--------------------------------------------------------- @@ -28,6 +29,8 @@ public int getTurnstate() {return turnstate;} + public int getGamestate() {return gamestate;} + public List getOpenListAll() {return openlist;} //リストそのものを返す。 //--------------------------------------------------------- @@ -47,6 +50,8 @@ public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + public void setGamestate(int gamestate) {this.gamestate = gamestate;} + //--------------------------------------------------------- //openlist操作