diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc21aea..cb6efe7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,7 @@
             android:name=".TestEnterActivity"
             android:exported="true"
             android:screenOrientation="landscape" />
+
         <activity
             android:name=".TestDrawingActivity"
             android:exported="true"
diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 96a6da2..47b1621 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -2,6 +2,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -27,6 +28,10 @@
     private String currentTeam = "r";
     private int turnState = 0;//0:ヒント入力,1:カード選択
 
+    //ヒントの情報
+    private String hint = "aaa";
+    private Integer hintMax = 0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -63,33 +68,26 @@
 
         //自分が赤チームマスターの場合はヒントが入力可能
         if(myTeam == null) {
-            System.out.println(("myteamがnullです"));
-        }else if(myTeam.equals("r")){
-            isActive = true;
+            System.out.println(("GameMasterActivity: Gakuto: myteamがnullです"));
+        }else{
+            isActive = CheckActivity();
         }
 
         //タイマースタート呼び出し
         gameViewModel.start(500,iris);
 
-        //hintを監視
+        //ヒントの変更を監視
         gameViewModel.getHintLiveData().observe(this, new Observer<String>() {
             @Override
-            public void onChanged(String hint) {
-
-                //画面に反映
-                EditText Hint = findViewById(R.id.GameHint);
-                Hint.setText(hint);
+            public void onChanged(String new_Hint) {
+                hint = new_Hint;
             }
         });
 
-        //hintMaxを監視
         gameViewModel.getmaxLiveData().observe(this, new Observer<Integer>() {
             @Override
-            public void onChanged(Integer hintMax) {
-
-                //画面に反映
-                EditText HintMax = findViewById(R.id.GameHintMax);
-                HintMax.setText(hintMax);
+            public void onChanged(Integer new_HintMax) {
+                hintMax = new_HintMax;
             }
         });
 
@@ -106,7 +104,7 @@
             }
         });
 
-     /*   //「ヒント入力」か「カード選択」かを監視
+        //「ヒント入力」か「カード選択」かを監視
         gameViewModel.getTurnStateLiveData().observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer new_turnState) {
@@ -114,10 +112,26 @@
                 //チームの情報を更新
                 turnState = new_turnState;
 
+                //ヒントの情報を反映
+                EditText Hint = findViewById(R.id.GameHint);
+                EditText HintMax = findViewById(R.id.GameHintMax);
+
+
+                if(new_turnState == 0){
+                    //「ヒント入力」になったときは古いヒントを消す
+                    Hint.getEditableText().clear();
+                    HintMax.getEditableText().clear();
+                }else{
+                    //「カード選択」のときは新しいヒントを表示する
+                    Hint.setText(hint);
+                    HintMax.setText(hintMax.toString());
+                }
+
+
                 //操作できるかを判断する。
                 isActive = CheckActivity();
             }
-        });*/
+        });
 
 
 
@@ -157,6 +171,8 @@
             }
         });
 
+
+
     }
 
     //操作可能かどうかを調べる関数。masterとかturnをオブザーブしておいて、変更があれば反映する。
diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
index f620fad..3c40bc2 100644
--- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
@@ -35,11 +35,25 @@
 
         //irisからプレイヤーの一覧を取得
         Iris iris = (Iris)this.getActivity().getApplication();
+
+        //test
+        if(iris == null){
+            System.out.println("通信失敗:Gakuto Game GamePlayerListFragment irisが取得できていません");
+        }else{
+            System.out.println("通信成功:Gakuto Game GamePlayerListFragment irisが取得できています");
+        }
+
         List<Member> players = iris.getMemberList();
 
+        if(players == null){
+            System.out.println("通信失敗:Gakuto Game GamePlayerListFragment playersが取得できていません");
+        }else{
+            System.out.println("通信成功:Gakuto Game GamePlayerListFragment playerが取得できています");
+        }
+
         //テスト用
-        Member test2 = new Member("test2");
-        Member test3 = new Member("test3");
+      /*  Member test2 = new Member("test0");
+        Member test3 = new Member("test1");
         test2.setBelongs("r");
         test3.setBelongs("b");
         if(players.contains(test2) == false){
@@ -47,7 +61,10 @@
         }
         if(players.contains(test3) == false){
             players.add(test3);
-        }
+        }*/
+
+        //System.out.println(players.get(0).getNickname());
+        System.out.println("Gakuto" + players.size());
 
         //memberのリストから名前(string)だけを抽出
         ArrayList<String> viewPlayers = new ArrayList<>();
@@ -55,9 +72,12 @@
         players.forEach(m -> {
             if(m.getBelongs() == myTeam){
                 viewPlayers.add(m.getNickname());
+              //  System.out.println("通信成功:Gakuto Game GamePlayerListFragment" + m.getNickname());
             }
         });
 
+
+
         ListView playersList = (ListView) view.findViewById(R.id.PlayersList);
 
         BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players);
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index fd440a5..8db564d 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -46,8 +46,9 @@
         android:layout_marginEnd="9dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
+        android:hint="ヒントを入力"
         android:inputType="textPersonName"
-        android:text="ヒントを入力"
+        android:maxLength="10"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toStartOf="@+id/GameHintMax"
         app:layout_constraintHorizontal_bias="0.5"
@@ -63,8 +64,9 @@
         android:layout_marginEnd="264dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:text="数"
+        android:hint="数"
+        android:inputType="number"
+        android:maxLength="1"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/activity_member_game.xml b/app/src/main/res/layout/activity_member_game.xml
index 92e343d..7e201a3 100644
--- a/app/src/main/res/layout/activity_member_game.xml
+++ b/app/src/main/res/layout/activity_member_game.xml
@@ -75,9 +75,9 @@
         android:layout_marginEnd="9dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
+        android:hint="ヒントを入力"
         android:inputType="text"
         android:maxLength="10"
-        android:text="ヒントを入力"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toStartOf="@+id/GameHintMax"
         app:layout_constraintHorizontal_bias="0.5"
@@ -92,11 +92,11 @@
         android:layout_marginTop="20dp"
         android:layout_marginEnd="264dp"
         android:layout_marginBottom="23dp"
-        android:ems="10"
-        android:inputType="number"
         android:digits="0123456789"
+        android:ems="10"
+        android:hint="数"
+        android:inputType="number"
         android:maxLength="1"
-        android:text="数"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"