diff --git a/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java b/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java index 0a3bd58..1fa0d75 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java @@ -11,8 +11,8 @@ public class GameJson { private Map drawingList = new HashMap<>();// - private List map = new ArrayList<>();//cno順にdnoを管理 - private List colorList = new ArrayList<>();//cno順にr,g,b,dを管理 + private List map = new ArrayList<>();//cno順にdnoを管理(要するに絵の並び) + private List colorList = new ArrayList<>();//cno順にr,g,b,dを管理:カードごとの色 //ゲッター diff --git a/app/src/main/java/org/ntlab/irisclient/models/Game.java b/app/src/main/java/org/ntlab/irisclient/models/Game.java index 3ae4a2d..b41fdcc 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Game.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Game.java @@ -12,9 +12,9 @@ private Map cellList = new HashMap<>();// private List map = new ArrayList<>();//cno順にdnoを管理 private List colorList = new ArrayList<>();//cno順にr,g,b,dを管理 + private int gamestate = 0; //引いたカードによって値が変化 (0:turn継続、1:turn終了、2:game終了) *ライブデータのほうがいい? //ゲッター - public Map getDrawingList() {return drawingList;} public Map getKeywordList() {return keywordList;} public Map getCellList() {return cellList;} diff --git a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java index dc28457..fc0d204 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -103,13 +103,11 @@ */ //----------------------------------------------- - // 現在開いているすべてのカードを取得するメソッド + // 現在開いているすべてのカードを取得するメソッド true=開いている false=開いてない  @GET("/{rid}/game/opens") Call> getOpens( @Path("rid") String rid ); - - }