Merge pull request #895 from DCGO2/hooperk-ADS1-digixros

Fix Digixros not marked as Digixros

Assets/Scripts/Script/SelectDigiXrosClass.cs

@@ -34,10 +34,10 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
         {
             List<int> maxTrashCountList = new List<int>();
 
-            #region 選択可能トラッシュ枚数を変更する効果
+            #region 驕ｸ謚槫庄閭ｽ繝医Λ繝�す繝･譫壽焚繧貞､画峩縺吶ｋ蜉ｹ譫�
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
             {
-                #region 場のパーマネントの効果
+                #region 蝣ｴ縺ｮ繝代�繝槭ロ繝ｳ繝医�蜉ｹ譫�
                 foreach (Permanent permanent in player.GetBattleAreaPermanents())
                 {
                     foreach (ICardEffect cardEffect in permanent.EffectList(EffectTiming.None))
@@ -58,7 +58,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                 }
                 #endregion
 
-                #region プレイヤーの効果
+                #region 繝励Ξ繧､繝､繝ｼ縺ｮ蜉ｹ譫�
                 foreach (ICardEffect cardEffect in player.EffectList(EffectTiming.None))
                 {
                     if (cardEffect is IAddMaxTrashCountDigiXrosEffect)
@@ -77,7 +77,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                 #endregion
             }
 
-            #region カード自身の効果
+            #region 繧ｫ繝ｼ繝芽�霄ｫ縺ｮ蜉ｹ譫�
             if (card.PermanentOfThisCard() == null)
             {
                 foreach (ICardEffect cardEffect in card.EffectList(EffectTiming.None))
@@ -129,10 +129,10 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
         {
             List<int> maxTamerDigivolutionCardsCountList = new List<int>();
 
-            #region 選択可能テイマー進化元枚数を変更する効果
+            #region 驕ｸ謚槫庄閭ｽ繝�う繝槭�騾ｲ蛹門�譫壽焚繧貞､画峩縺吶ｋ蜉ｹ譫�
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
             {
-                #region 場のパーマネントの効果
+                #region 蝣ｴ縺ｮ繝代�繝槭ロ繝ｳ繝医�蜉ｹ譫�
                 foreach (Permanent permanent in player.GetBattleAreaPermanents())
                 {
                     foreach (ICardEffect cardEffect in permanent.EffectList(EffectTiming.None))
@@ -153,7 +153,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                 }
                 #endregion
 
-                #region プレイヤーの効果
+                #region 繝励Ξ繧､繝､繝ｼ縺ｮ蜉ｹ譫�
                 foreach (ICardEffect cardEffect in player.EffectList(EffectTiming.None))
                 {
                     if (cardEffect is IAddMaxUnderTamerCountDigiXrosEffect)
@@ -172,7 +172,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                 #endregion
             }
 
-            #region カード自身の効果
+            #region 繧ｫ繝ｼ繝芽�霄ｫ縺ｮ蜉ｹ譫�
             if (card.PermanentOfThisCard() == null)
             {
                 foreach (ICardEffect cardEffect in card.EffectList(EffectTiming.None))
@@ -518,7 +518,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                         {
                             GManager.instance.commandText.OpenCommandText($"The opponent is choosing from which area to select {element.selectMessage}.", digiXros: true);
 
-                            #region AIモード
+                            #region AI繝｢繝ｼ繝�
                             if (GManager.instance.IsAI)
                             {
                                 List<int> indexes = new List<int>();
@@ -624,7 +624,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region 輯elect Battle Area Permanent
+    #region Select Battle Area Permanent
     IEnumerator SelectBattleAreaPermanent(DigiXrosCondition digiXrosCondition, DigiXrosConditionElement element, CardSource card)
     {
         bool CanSelectPermanentCondition(Permanent permanent) => permanent.TopCard.Owner.GetBattleAreaPermanents().Contains(permanent) && CanSelectDigiXros(element, permanent.TopCard, card);
@@ -896,7 +896,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                             {
                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDigiXrosSelectCardEffect(cardSource.PermanentOfThisCard()));
 
-                                IPlacePermanentToDigivolutionCards placePermanentToDigivolutionCards = new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { cardSource.PermanentOfThisCard(), card.PermanentOfThisCard() } }, false, null);
+                                IPlacePermanentToDigivolutionCards placePermanentToDigivolutionCards = new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { cardSource.PermanentOfThisCard(), card.PermanentOfThisCard() } }, false, null, isDigixros: true);
                                 placePermanentToDigivolutionCards.SetNotShowCards();
                                 yield return ContinuousController.instance.StartCoroutine(placePermanentToDigivolutionCards.PlacePermanentToDigivolutionCards());
                             }
@@ -927,7 +927,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region 効果によって進化元を付与(天野ユウ(BT10),シャウトモンX7スペリオルモード(BT12))
+    #region 蜉ｹ譫懊↓繧医▲縺ｦ騾ｲ蛹門�繧剃ｻ倅ｸ�(螟ｩ驥弱Θ繧ｦ(BT10),繧ｷ繝｣繧ｦ繝医Δ繝ｳX7繧ｹ繝壹Μ繧ｪ繝ｫ繝｢繝ｼ繝�(BT12))
     public IEnumerator AddDigivolutiuonCardsByEffect(CardSource card)
     {
         if (addDigivolutionCardInfos.Count >= 1)
@@ -980,7 +980,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                         {
                             foreach (Permanent digimonPermanent in digimonPermanents)
                             {
-                                yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { digimonPermanent, card.PermanentOfThisCard() } }, false, info.cardEffect).PlacePermanentToDigivolutionCards());
+                                yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { digimonPermanent, card.PermanentOfThisCard() } }, false, info.cardEffect, isDigixros: true).PlacePermanentToDigivolutionCards());
                             }
                         }