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 b41fdcc..7c5bd9a 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Game.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Game.java @@ -12,7 +12,7 @@ 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終了) *ライブデータのほうがいい? + private int gamestate = 0; //引いたカードによって値が変化 (0:turn継続、1:turn終了、2:game終了) *GameViewModelでLiveDateで監視中 //ゲッター public Map getDrawingList() {return drawingList;} 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 d76203f..78cb88d 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -2,6 +2,7 @@ import com.squareup.moshi.Json; +import org.ntlab.irisclient.entities.GameJson; import org.ntlab.irisclient.entities.RoomJson; import org.ntlab.irisclient.entities.TurnJson; @@ -17,7 +18,14 @@ public interface GameRest { - //-------------------------------------- + //----------------------------------------------- + //Gameの開始に必要な情報を取得する。 + @GET("/{rid}/game") + Call getGame( + @Path("rid") String rid + ); + + //----------------------------------------------- // 今回のゲームで使われる16個のお題をdno順のリストで取得するメソッド @GET("/{rid}/game/keywords") Call getkeywords(