diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index f6b0822..a6e50d7 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -1,22 +1,35 @@ package com.ntlab.irisserver.entities; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.*; public class Game { + @JsonProperty("assignments") private Map> assignments = new HashMap<>();//> + @JsonProperty("drawingList") private Map drawingList = new HashMap<>();// + @JsonProperty("keywordList") private Map keywordList = new HashMap<>();// + @JsonProperty("cellList") private Map cellList = new HashMap<>();// + @JsonProperty("map") private List map = new ArrayList<>();//cno順にdnoを管理 + @JsonProperty("colorList") private List colorList = new ArrayList<>();//cno順にr:赤,g:灰,b:青,d:黒を管理 + @JsonProperty("turnList") private List turnList = new ArrayList<>(); + @JsonProperty("nowTurn") private Turn nowTurn = null;//現在のターン + @JsonProperty("drawingController") private DrawingController drawingController = null; + @JsonProperty("settings") private Settings settings = null; + public Game(Room room, String[] keywords) { room.setGame(this);