diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..27046dc
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?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\52rin\.android\avd\Pixel_5_API_30.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-11-22T03:10:48.169230100Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
index 74d4494..4f7c4d7 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java
@@ -433,20 +433,20 @@
                     backColors[i].setBackground(resources.getDrawable(R.drawable.red_image));
                     imageButtons[i].setVisibility(INVISIBLE);
                     OpenRedCard += 1;
-                    if( !colorList.get(i).equals(myTeam) ){
-                        gameViewModel.addTurns();
-                    }
+//                    if( !colorList.get(i).equals(myTeam) ){
+//                        gameViewModel.addTurns();
+//                    }
                 } else if (colorList.get(i).contains("b")) {
                     backColors[i].setBackground(resources.getDrawable(R.drawable.blue_image));
                     imageButtons[i].setVisibility(INVISIBLE);
                     OpenBlueCard += 1;
-                    if( !colorList.get(i).equals(myTeam) ){
-                        gameViewModel.addTurns();
-                    }
+//                    if( !colorList.get(i).equals(myTeam) ){
+//                        gameViewModel.addTurns();
+//                    }
                 } else if (colorList.get(i).contains("g")) {
                     backColors[i].setBackground(resources.getDrawable(R.drawable.gray_image));
                     imageButtons[i].setVisibility(INVISIBLE);
-                    gameViewModel.addTurns();
+//                    gameViewModel.addTurns();
                 } else if (colorList.get(i).contains("d")) {
                     backColors[i].setBackground(resources.getDrawable(R.drawable.black_image));
                     imageButtons[i].setVisibility(INVISIBLE);
@@ -462,9 +462,12 @@
             }
         }
 
-        if( OpenRedCard == 6 || OpenBlueCard == 5 ){
+        if( OpenRedCard == 6 ){
             gameViewModel.sendEndState();
-            finishFullOpenGameAlertMake(myTeam, nowTurn);
+            finishFullOpenGameAlertMake(myTeam, "r");
+        }else if( OpenBlueCard == 5 ){
+            gameViewModel.sendEndState();
+            finishFullOpenGameAlertMake(myTeam, "b");
         }
 
     }
@@ -497,12 +500,12 @@
             nowQList.set(cno, false);//疑い関係
             gameViewModel.sendOpenList(cno);
 
-//            if( colorList.get(cno).equals("d") ){
-//                //Game終了
-//                gameViewModel.sendEndState();
-//            } else if ( !colorList.get(cno).equals(myTeam) ){
-//                gameViewModel.addTurns();
-//            }
+            if( colorList.get(cno).contains("d") ){
+                //Game終了
+                gameViewModel.sendEndState();
+            } else if ( !colorList.get(cno).contains(myTeam)){
+                gameViewModel.addTurns();
+            }
 
             //赤のカードが何枚めくれているか(6枚めくれていたら勝利)
             if( colorList.get(cno).equals("r") ){
@@ -516,7 +519,7 @@
                 nowOpenList.set(cno, false);
                 if( OpenRedCard == 6 ){
                     gameViewModel.sendEndState();
-                    finishFullOpenGameAlertMake(myTeam, nowTurn);
+                    finishFullOpenGameAlertMake(myTeam, "r");
                 }
             }
             //青のカードが何枚めくれているか(5枚めくれていたら勝利)
@@ -532,7 +535,7 @@
                 nowOpenList.set(cno, false);
                 if( OpenBlueCard == 5 ){
                     gameViewModel.sendEndState();
-                    finishFullOpenGameAlertMake(myTeam, nowTurn);
+                    finishFullOpenGameAlertMake(myTeam, "b");
                 }
             }
 
diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
index afc6c47..b21c0d1 100644
--- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
+++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
@@ -327,17 +327,19 @@
                             turnsMutableLiveData.setValue(response.body().string());
                             turnsPreData = turnsMutableLiveData.getValue();
                             System.out.println("現在のチームは" + turnsPreData + "です");
+                            updateTurnNumber();
                         } catch (IOException e) {
                             e.printStackTrace();
                         }
 
-                    }else if(turnsMutableLiveData.getValue().equals(turnsPreData)){
+                    }else if(turnsPreData.equals(response.body().toString())){
                         //値が一緒なら書き換えない
                     }else{
                         //値が異なるときのみライブデータを上書き
                         try {
                             turnsMutableLiveData.setValue(response.body().string());
                             turnsPreData = turnsMutableLiveData.getValue();
+                            updateTurnNumber();
                         } catch (IOException e) {
                             e.printStackTrace();
                         }