diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 96a6da2..251ae14 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -63,9 +63,9 @@
 
         //自分が赤チームマスターの場合はヒントが入力可能
         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();
         }
 
         //タイマースタート呼び出し
@@ -157,6 +157,8 @@
             }
         });
 
+
+
     }
 
     //操作可能かどうかを調べる関数。masterとかturnをオブザーブしておいて、変更があれば反映する。
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index fd440a5..dd4755a 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -46,8 +46,8 @@
         android:layout_marginEnd="9dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
+        android:hint="ヒントを入力"
         android:inputType="textPersonName"
-        android:text="ヒントを入力"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toStartOf="@+id/GameHintMax"
         app:layout_constraintHorizontal_bias="0.5"
@@ -63,8 +63,8 @@
         android:layout_marginEnd="264dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
+        android:hint="数"
         android:inputType="textPersonName"
-        android:text="数"
         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"