diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index d01fa8d..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\Student\.android\avd\Pixel_2_API_30.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-11-01T06:30:51.936867500Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 9461d79..96a6da2 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -79,9 +79,6 @@
                 //画面に反映
                 EditText Hint = findViewById(R.id.GameHint);
                 Hint.setText(hint);
-
-                //操作できるかを判断する。
-                isActive = CheckActivity();
             }
         });
 
@@ -93,10 +90,6 @@
                 //画面に反映
                 EditText HintMax = findViewById(R.id.GameHintMax);
                 HintMax.setText(hintMax);
-
-                //操作できるかを判断する。
-                isActive = CheckActivity();
-
             }
         });
 
@@ -105,7 +98,7 @@
             @Override
             public void onChanged(String new_currentTeam) {
 
-                //画面に反映
+                //チームの情報を更新
                 currentTeam = new_currentTeam;
 
                 //操作できるかを判断する。
@@ -113,6 +106,21 @@
             }
         });
 
+     /*   //「ヒント入力」か「カード選択」かを監視
+        gameViewModel.getTurnStateLiveData().observe(this, new Observer<Integer>() {
+            @Override
+            public void onChanged(Integer new_turnState) {
+
+                //チームの情報を更新
+                turnState = new_turnState;
+
+                //操作できるかを判断する。
+                isActive = CheckActivity();
+            }
+        });*/
+
+
+
     }
 
     private void buttonProcesses(){
@@ -161,6 +169,14 @@
             isActive = true;
         }
 
+        //非アクティブであればヒントの入力を禁止する
+        if(isActive == false){
+            EditText Hint = findViewById(R.id.GameHint);
+            EditText HintMax = findViewById(R.id.GameHintMax);
+            Hint.setFocusable(false);
+            HintMax.setFocusable(false);
+        }
+
         return isActive;
     }
 
diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
index 3ceea5a..f620fad 100644
--- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
@@ -42,8 +42,12 @@
         Member test3 = new Member("test3");
         test2.setBelongs("r");
         test3.setBelongs("b");
-        players.add(test2);
-        players.add(test3);
+        if(players.contains(test2) == false){
+            players.add(test2);
+        }
+        if(players.contains(test3) == false){
+            players.add(test3);
+        }
 
         //memberのリストから名前(string)だけを抽出
         ArrayList<String> viewPlayers = new ArrayList<>();
@@ -60,9 +64,6 @@
        // BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.fragment_game_player_list, viewPlayers, players);
         playersList.setAdapter(adapter);
 
-        //なぜか他のGamePlayerListFragmentにplayerの内容が引き継がれてしまうので、ここで初期化する。
-        players.clear();
-
         return view;
     }