Explorar o código

1.4.15 updates

mbunch_kascope hai 1 ano
pai
achega
1f93a75de1
Modificáronse 100 ficheiros con 4428 adicións e 1947 borrados
  1. 2 2
      Assets/CardBaseEntity/BT6/White/Digimon/シスタモンノワール-BT6-084.asset
  2. 2 2
      Assets/CardBaseEntity/BT6/White/Digimon/シスタモンノワール-BT6-084_P1.asset
  3. 2 2
      Assets/CardBaseEntity/BT7/White/Digimon/シスタモンノワール(覚醒)-BT7-083.asset
  4. 2 2
      Assets/CardBaseEntity/EX5/Blue/Digimon/ガブモンX抗体-EX5-015.asset
  5. 2 2
      Assets/CardBaseEntity/EX5/Blue/Digimon/ガルルモンX抗体-EX5-018.asset
  6. 2 2
      Assets/CardBaseEntity/EX5/Blue/Digimon/メタルガルルモンX抗体-EX5-026.asset
  7. 2 2
      Assets/CardBaseEntity/EX5/Blue/Digimon/ワーガルルモンX抗体-EX5-023.asset
  8. 2 2
      Assets/CardBaseEntity/EX5/Green/Digimon/ドゥフトモンX抗体-EX5-043.asset
  9. 2 2
      Assets/CardBaseEntity/EX5/Purple/Digimon/ケルベロモンX抗体-EX5-061.asset
  10. 2 2
      Assets/CardBaseEntity/EX5/Purple/Digimon/ドーベルモンX抗体-EX5-059.asset
  11. 2 2
      Assets/CardBaseEntity/P/Black/Digimon/レアモン-P-101.asset
  12. 2 2
      Assets/CardBaseEntity/ST12/White/Digimon/シスタモンノワール-ST12-13.asset
  13. 1 1
      Assets/CardEffect/BT1/Green/Rosemon_BT1_082.cs
  14. 1 1
      Assets/CardEffect/BT10/Black/Blustmon_BT10_070.cs
  15. 1 1
      Assets/CardEffect/BT10/Green/Jureimon_BT10_052.cs
  16. 1 1
      Assets/CardEffect/BT11/Black/Analogman_BT11_092.cs
  17. 1 1
      Assets/CardEffect/BT11/Black/BlackwargreymonXAntibody_BT11_074.cs
  18. 1 1
      Assets/CardEffect/BT11/Black/Deathtromon_BT11_070.cs
  19. 16 12
      Assets/CardEffect/BT11/Black/HadesForce_BT11_107.cs
  20. 21 16
      Assets/CardEffect/BT11/Green/BusterDive_BT11_104.cs
  21. 1 0
      Assets/CardEffect/BT11/Yellow/Sukamonking_BT11_043.cs
  22. 1 1
      Assets/CardEffect/BT12/Black/Ancientwisemon_BT12_071.cs
  23. 58 54
      Assets/CardEffect/BT12/Black/LaprasDemon_BT12_107.cs
  24. 62 58
      Assets/CardEffect/BT12/Black/Sefirotomon_BT12_065.cs
  25. 1 1
      Assets/CardEffect/BT12/Blue/Otamamon_BT12_019.cs
  26. 1 1
      Assets/CardEffect/BT12/Purple/Darknessbagramon_BT12_111.cs
  27. 22 17
      Assets/CardEffect/BT12/Red/FinalCrossBlade_BT12_100.cs
  28. 1 1
      Assets/CardEffect/BT13/Blue/Jambogamemon_BT13_032.cs
  29. 1 1
      Assets/CardEffect/BT13/Blue/Shaujinmon_BT13_027.cs
  30. 1 1
      Assets/CardEffect/BT13/Purple/BerfemonSleepMode_BT13_088.cs
  31. 1 1
      Assets/CardEffect/BT13/Purple/Lordknightmon_BT13_090.cs
  32. 1 1
      Assets/CardEffect/BT14/Blue/Otamamon_BT14_019.cs
  33. 1 1
      Assets/CardEffect/BT14/White/Gennai_BT14_088.cs
  34. 7 2
      Assets/CardEffect/BT15/Black/Airdramon_BT15_059.cs
  35. 1 1
      Assets/CardEffect/BT15/Blue/Plesiomon_X_Antibody_BT15_032.cs
  36. 1 1
      Assets/CardEffect/BT15/Green/Izzy_Izumi_BT15_085.cs
  37. 2 2
      Assets/CardEffect/BT15/Yellow/Magnadramon_BT15_042.cs
  38. 2 2
      Assets/CardEffect/BT15/Yellow/Salamon_BT15_034.cs
  39. 114 112
      Assets/CardEffect/BT16/Black/Dorugamon_BT16_058.cs
  40. 1 1
      Assets/CardEffect/BT16/Green/MetallifeKuwagamon_BT16_045.cs
  41. 9 2
      Assets/CardEffect/BT16/Purple/Dinobeemon_BT16_077.cs
  42. 0 1
      Assets/CardEffect/BT17/Black/Trailmon_BT17_054.cs
  43. 22 16
      Assets/CardEffect/BT17/Yellow/Kazuchimon_BT17_040.cs
  44. 1 1
      Assets/CardEffect/BT5/White/OmegamonXAntiBody_BT5_111.cs
  45. 1 1
      Assets/CardEffect/BT6/Green/EncientTroiamon_BT6_054.cs
  46. 0 23
      Assets/CardEffect/BT6/White/SistermonNowaru_BT6_084.cs
  47. 0 26
      Assets/CardEffect/BT7/White/SistermonNowaruAwaken_BT7_083.cs
  48. 1 1
      Assets/CardEffect/BT7/Yellow/Bautomon_BT7_037.cs
  49. 1 1
      Assets/CardEffect/BT8/Blue/TalaishiTakeru_BT8_087.cs
  50. 23 17
      Assets/CardEffect/BT9/Green/GrandisScissor_BT9_100.cs
  51. 16 12
      Assets/CardEffect/BT9/Red/GaiaforceZero_BT9_095.cs
  52. 1 1
      Assets/CardEffect/BT9/Yellow/MagnamonXAntibody_BT9_044.cs
  53. 1 1
      Assets/CardEffect/EX2/Blue/KatouJuri_EX2_058.cs
  54. 1 1
      Assets/CardEffect/EX4/Black/Darkknightmon_EX4_047.cs
  55. 113 109
      Assets/CardEffect/EX5/Black/Etemon_EX5_048.cs
  56. 1 1
      Assets/CardEffect/EX5/Black/Metaletemon_EX5_054.cs
  57. 18 14
      Assets/CardEffect/EX5/Yellow/FlashBanchoPunch_EX5_068.cs
  58. 53 131
      Assets/CardEffect/EX6/Black/RaijiLudomon_EX6_042.cs
  59. 1 1
      Assets/CardEffect/EX6/Purple/Tsukaimon_EX6_045.cs
  60. 1 1
      Assets/CardEffect/EX6/Purple/Witchmon_EX6_048.cs
  61. 2 2
      Assets/CardEffect/EX6/Yellow/ArkhaiAngemon_EX6_021.cs
  62. 1 1
      Assets/CardEffect/EX7/Black/Jazarichmon_EX7_046.cs
  63. 1 1
      Assets/CardEffect/EX7/Purple/BlackGatomon_EX7_054.cs
  64. 1 1
      Assets/CardEffect/EX7/Purple/Tsukaimon_EX7_052.cs
  65. 16 6
      Assets/CardEffect/EX7/Red/MagnaKidmon_EX7_013.cs
  66. 1 1
      Assets/CardEffect/P/Black/Deathtromon_P_094.cs
  67. 0 24
      Assets/CardEffect/P/Black/Raremon_P_101.cs
  68. 1 1
      Assets/CardEffect/P/Blue/Anfimon_P_089.cs
  69. 1 1
      Assets/CardEffect/P/Yellow/Knightmon_P_111.cs
  70. 1 1
      Assets/CardEffect/RB1/Blue/HigashimitaraiKiyoshirou_RB1_033.cs
  71. 19 15
      Assets/CardEffect/RB1/Green/Dilbitmon_RB1_025.cs
  72. 4 4
      Assets/CardEffect/ST10/Yellow/ChaosDigrade_ST10_14.cs
  73. 0 23
      Assets/CardEffect/ST12/White/SistermonNowaru_ST12_13.cs
  74. 1 1
      Assets/CardEffect/ST14/Purple/Belstermon_ST14_09.cs
  75. 58 54
      Assets/CardEffect/ST15/Black/TridentArm_ST15_16.cs
  76. BIN=BIN
      Assets/Image/UI/色ボタン/アイコン_bar_白1_mask.png
  77. 171 0
      Assets/Image/UI/色ボタン/アイコン_bar_白1_mask.png.meta
  78. BIN=BIN
      Assets/Image/UI/色ボタン/アイコン_bar_白1_trimmed.png
  79. 171 0
      Assets/Image/UI/色ボタン/アイコン_bar_白1_trimmed.png.meta
  80. 788 65
      Assets/Prefab/DetailCard_DeckEditor.prefab
  81. 689 54
      Assets/Prefab/FieldPermanentCard.prefab
  82. 675 198
      Assets/Prefab/HandCard.prefab
  83. 8 0
      Assets/Prefab/UI/Battle Scene.meta
  84. 1031 0
      Assets/Prefab/UI/Battle Scene/log.prefab
  85. 7 0
      Assets/Prefab/UI/Battle Scene/log.prefab.meta
  86. 57 758
      Assets/Scenes/BattleScene.unity
  87. 4 4
      Assets/Scripts/AttackProcess.cs
  88. 6 1
      Assets/Scripts/AutoProcessing.cs
  89. 38 25
      Assets/Scripts/CardController.cs
  90. 1 1
      Assets/Scripts/CardEffectCommons/KeyWordEffects/ArmorPurge.cs
  91. 1 1
      Assets/Scripts/CardEffectCommons/KeyWordEffects/Barrier.cs
  92. 22 6
      Assets/Scripts/CardEffectCommons/KeyWordEffects/Overclock.cs
  93. 1 1
      Assets/Scripts/CardEffectCommons/KeyWordEffects/Partition.cs
  94. 5 5
      Assets/Scripts/CardEffectCommons/RevealLibrary.cs
  95. 15 4
      Assets/Scripts/CardEffectFactory/KeyWordEffects/BlastDNADigivolution.cs
  96. 2 2
      Assets/Scripts/CardObjectController.cs
  97. 3 0
      Assets/Scripts/ContinuousController.cs
  98. 4 4
      Assets/Scripts/DetailCard_DeckEditor.cs
  99. 8 4
      Assets/Scripts/FieldPermanentCard.cs
  100. 3 0
      Assets/Scripts/GManager.cs

+ 2 - 2
Assets/CardBaseEntity/BT6/White/Digimon/シスタモンノワール-BT6-084.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:159a4e61b84823e80e8a883424a5bcc954b3085aa36b1d10f966c87f98cc0897
-size 2016
+oid sha256:94c5a1f7473c5545d534574a9d343dc8ca3bb1ca604604f8acbad35a40c82dcf
+size 1758

+ 2 - 2
Assets/CardBaseEntity/BT6/White/Digimon/シスタモンノワール-BT6-084_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd0d817e6c0175f80d16261ddfdff200a79706b7ebec48ce9f6c4677a8139c6c
-size 2022
+oid sha256:2209aa2880ba0112dcf22b5eca9a380296b8783fcb303d0b6da04a2b819bbc0a
+size 1764

+ 2 - 2
Assets/CardBaseEntity/BT7/White/Digimon/シスタモンノワール(覚醒)-BT7-083.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:a43e3d12a47b0d7c3695d800b94bab77abd395559c14c27fc6accc397992ffad
-size 2850
+oid sha256:77d5c58441c107cf528b3de8b8b39ddd6903fd36856a60efe3b3dc4c320325cd
+size 2586

+ 2 - 2
Assets/CardBaseEntity/EX5/Blue/Digimon/ガブモンX抗体-EX5-015.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc8ea266a4c09658a4880c4da1b91cb634670d336a2cc19ec4c037e133aadaa0
-size 3052
+oid sha256:357a55d3ce6a55d8e7005021e535736f1351ee0ba6f9cdbc55bfdbedfb91dabd
+size 3037

+ 2 - 2
Assets/CardBaseEntity/EX5/Blue/Digimon/ガルルモンX抗体-EX5-018.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dfbe95e91602d990c0704370f187bde5bdca0dffb7335de9f475640cff672d8
-size 2768
+oid sha256:770203b1015fb9c69fa95f696660e71577e3efe1329e58056d167b5b2cc4bb31
+size 2753

+ 2 - 2
Assets/CardBaseEntity/EX5/Blue/Digimon/メタルガルルモンX抗体-EX5-026.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f0d70dce4ed488c03abdb74bb24d469d1423069e35181239ff5cf6880e8f95c
-size 2857
+oid sha256:13cef2963c01f063cfd01a3476eaed30ff4a9e171803df924dc016eaca64f6d2
+size 2842

+ 2 - 2
Assets/CardBaseEntity/EX5/Blue/Digimon/ワーガルルモンX抗体-EX5-023.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b47275dc3f4bc14f36aa3e2df80d339c62167461f381a5b6c64b737b18d92cf
-size 3021
+oid sha256:22541185cc4ba8f6d32ad13da4c861d7ca26742a017e08090bc320db53f03e78
+size 3006

+ 2 - 2
Assets/CardBaseEntity/EX5/Green/Digimon/ドゥフトモンX抗体-EX5-043.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:538c9f494d413c3677fffa22db3595efaa84bf4b06e6b61e4093088cddbc8260
-size 3129
+oid sha256:5370ccbd5bcac6c59dcf3f172198c84ba910dc9621c4ac88b63a99f58d115367
+size 3114

+ 2 - 2
Assets/CardBaseEntity/EX5/Purple/Digimon/ケルベロモンX抗体-EX5-061.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:43c168d6c6bf06d4d5a7c37b00a07266d9a9732eb22ef88a531902a73b43f8c5
-size 3059
+oid sha256:659b9213aa28840f12fde51365f5b80d9724f44d6c9b43a3e2d3a5cc99969494
+size 3044

+ 2 - 2
Assets/CardBaseEntity/EX5/Purple/Digimon/ドーベルモンX抗体-EX5-059.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:6992f7a1b1fe652076d1e0da10d625ad33174d7ec897ce29bd06cdf0af07dc33
-size 2792
+oid sha256:e30bb3e0df7c7eabd5f6cb9602aa65abe79c7d552e2f8d10381747721265ead9
+size 2777

+ 2 - 2
Assets/CardBaseEntity/P/Black/Digimon/レアモン-P-101.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:65efefe5d465bd0dbee7f3067123ef0901086a227db17dfd475e43040bf0cb99
-size 2380
+oid sha256:5e70573625ea1123108beb9a72731aa3de50cd0679478ee7da7407352616485c
+size 2161

+ 2 - 2
Assets/CardBaseEntity/ST12/White/Digimon/シスタモンノワール-ST12-13.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5556c6baab844d517de16826d694f5505c601fd7dd584a67001319a819284a2
-size 3022
+oid sha256:d5de03b4a32d97072b65552597a471fefee00ac4faf497e5db3979a7b2322630
+size 2806

+ 1 - 1
Assets/CardEffect/BT1/Green/Rosemon_BT1_082.cs

@@ -11,7 +11,7 @@ public class Rosemon_BT1_082 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Suspend 1 Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Suspend 1 Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT10/Black/Blustmon_BT10_070.cs

@@ -36,7 +36,7 @@ public class Blustmon_BT10_070 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.BlitzSelfEffect(isInheritedEffect: false, card: card, condition: Condition, isWhenDigivolving: false));
             cardEffects.Add(CardEffectFactory.BlitzSelfEffect(isInheritedEffect: false, card: card, condition: Condition, isWhenDigivolving: false));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 1 digivolution card to delete 1 level4 or lower Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 1 digivolution card to delete 1 level4 or lower Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT10/Green/Jureimon_BT10_052.cs

@@ -276,7 +276,7 @@ public class Jureimon_BT10_052 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch Attack Target", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch Attack Target", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT11/Black/Analogman_BT11_092.cs

@@ -113,7 +113,7 @@ public class Analogman_BT11_092 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch Attack Target to your Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch Attack Target to your Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT11/Black/BlackwargreymonXAntibody_BT11_074.cs

@@ -27,7 +27,7 @@ public class BlackwargreymonXAntibody_BT11_074 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.RebootSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
             cardEffects.Add(CardEffectFactory.RebootSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT11/Black/Deathtromon_BT11_070.cs

@@ -121,7 +121,7 @@ public class Deathtromon_BT11_070 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Return 2 [Vemmon] from [Galacticmon]'s digivolution cards to the deck bottom to switch attack target to this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Return 2 [Vemmon] from [Galacticmon]'s digivolution cards to the deck bottom to switch attack target to this Digimon", CanUseCondition, card);

+ 16 - 12
Assets/CardEffect/BT11/Black/HadesForce_BT11_107.cs

@@ -233,6 +233,8 @@ public class HadesForce_BT11_107 : CEntity_Effect
 
 
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                 {
                 {
+                    Permanent selectedPermanent = null;
+
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
 
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -256,22 +258,24 @@ public class HadesForce_BT11_107 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
+
+                        yield return null;
+                    }
 
 
-                        if (selectedPermanent != null)
+                    if (selectedPermanent != null)
+                    {
+                        if (selectedPermanent.CanAttack(activateClass))
                         {
                         {
-                            if (selectedPermanent.CanAttack(activateClass))
-                            {
-                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                            SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                selectAttackEffect.SetUp(
-                                    attacker: selectedPermanent,
-                                    canAttackPlayerCondition: () => true,
-                                    defenderCondition: (permanent) => false,
-                                    cardEffect: activateClass);
+                            selectAttackEffect.SetUp(
+                                attacker: selectedPermanent,
+                                canAttackPlayerCondition: () => true,
+                                defenderCondition: (permanent) => false,
+                                cardEffect: activateClass);
 
 
-                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                            }
+                            yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                         }
                     }
                     }
                 }
                 }

+ 21 - 16
Assets/CardEffect/BT11/Green/BusterDive_BT11_104.cs

@@ -108,6 +108,8 @@ public class BusterDive_BT11_104 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                List<Permanent> selectedPermanents = new List<Permanent>();
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -170,24 +172,27 @@ public class BusterDive_BT11_104 : CEntity_Effect
 
 
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     {
                     {
-                        foreach (Permanent permanent in permanents)
-                        {
-                            Permanent selectedPermanent = permanent;
+                        selectedPermanents = permanents;
+                        yield return null;
+                    }
+
+                    foreach (Permanent permanent in selectedPermanents)
+                    {
+                        Permanent selectedPermanent = permanent;
 
 
-                            if (selectedPermanent != null)
+                        if (selectedPermanent != null)
+                        {
+                            if (selectedPermanent.CanAttack(activateClass))
                             {
                             {
-                                if (selectedPermanent.CanAttack(activateClass))
-                                {
-                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                    selectAttackEffect.SetUp(
-                                        attacker: selectedPermanent,
-                                        canAttackPlayerCondition: () => false,
-                                        defenderCondition: (permanent) => true,
-                                        cardEffect: activateClass);
-
-                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                }
+                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                selectAttackEffect.SetUp(
+                                    attacker: selectedPermanent,
+                                    canAttackPlayerCondition: () => false,
+                                    defenderCondition: (permanent) => true,
+                                    cardEffect: activateClass);
+
+                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                             }
                             }
                         }
                         }
                     }
                     }

+ 1 - 0
Assets/CardEffect/BT11/Yellow/Sukamonking_BT11_043.cs

@@ -397,6 +397,7 @@ public class Sukamonking_BT11_043 : CEntity_Effect
             activateClass.SetUpICardEffect("Prevent this Digimon from being deleted", CanUseCondition, card);
             activateClass.SetUpICardEffect("Prevent this Digimon from being deleted", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateClass.SetIsInheritedEffect(true);
             activateClass.SetIsInheritedEffect(true);
+            activateClass.SetChainActivationCount(2);
             activateClass.SetHashString("Substitute_BT11_043");
             activateClass.SetHashString("Substitute_BT11_043");
             cardEffects.Add(activateClass);
             cardEffects.Add(activateClass);
 
 

+ 1 - 1
Assets/CardEffect/BT12/Black/Ancientwisemon_BT12_071.cs

@@ -11,7 +11,7 @@ public class Ancientwisemon_BT12_071 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Reveal the top 3 cards of deck", CanUseCondition, card);
             activateClass.SetUpICardEffect("Reveal the top 3 cards of deck", CanUseCondition, card);

+ 58 - 54
Assets/CardEffect/BT12/Black/LaprasDemon_BT12_107.cs

@@ -36,6 +36,8 @@ public class LaprasDemon_BT12_107 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -60,88 +62,90 @@ public class LaprasDemon_BT12_107 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
 
 
-                        if (selectedPermanent != null)
-                        {
-                            ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                            activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                            selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                        yield return null;
+                    }
 
 
-                            if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
+                    if (selectedPermanent != null)
+                    {
+                        ActivateClass activateClass1 = new ActivateClass();
+                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                            string EffectDiscription1()
-                            {
-                                return "[Start of Your Main Phase] Attack with this Digimon.";
-                            }
+                        if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                        }
 
 
-                            bool CanUseCondition1(Hashtable hashtable1)
+                        string EffectDiscription1()
+                        {
+                            return "[Start of Your Main Phase] Attack with this Digimon.";
+                        }
+
+                        bool CanUseCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                 {
                                 {
-                                    if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                     {
                                     {
-                                        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            bool CanActivateCondition1(Hashtable hashtable1)
+                            return false;
+                        }
+
+                        bool CanActivateCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                 {
                                 {
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                    if (selectedPermanent.CanAttack(activateClass1))
                                     {
                                     {
-                                        if (permanent.CanAttack(activateClass1))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                            return false;
+                        }
+
+                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.CanAttack(activateClass1))
                                 {
                                 {
-                                    if (permanent.CanAttack(activateClass1))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => true,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass1);
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => true,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass1);
 
 
-                                        selectAttackEffect.SetCanNotSelectNotAttack();
+                                    selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
+                        }
 
 
-                            ICardEffect GetCardEffect(EffectTiming _timing)
+                        ICardEffect GetCardEffect(EffectTiming _timing)
+                        {
+                            if (_timing == EffectTiming.OnStartMainPhase)
                             {
                             {
-                                if (_timing == EffectTiming.OnStartMainPhase)
-                                {
-                                    return activateClass1;
-                                }
-
-                                return null;
+                                return activateClass1;
                             }
                             }
+
+                            return null;
                         }
                         }
                     }
                     }
                 }
                 }

+ 62 - 58
Assets/CardEffect/BT12/Black/Sefirotomon_BT12_065.cs

@@ -76,6 +76,8 @@ public class Sefirotomon_BT12_065 : CEntity_Effect
             {
             {
                 if (isExistOnField(card))
                 if (isExistOnField(card))
                 {
                 {
+                    Permanent selectedPermanent = null;
+
                     if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                     if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -102,97 +104,99 @@ public class Sefirotomon_BT12_065 : CEntity_Effect
 
 
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             {
                             {
-                                Permanent selectedPermanent = permanent;
+                                selectedPermanent = permanent;
 
 
-                                if (selectedPermanent != null)
-                                {
-                                    ActivateClass activateClass1 = new ActivateClass();
-                                    activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                                    activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                    activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                    selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                yield return null;
+                            }
 
 
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                                    }
+                            if (selectedPermanent != null)
+                            {
+                                ActivateClass activateClass1 = new ActivateClass();
+                                activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                                selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                                    string EffectDiscription1()
-                                    {
-                                        return "[Start of Your Main Phase] Attack with this Digimon.";
-                                    }
+                                if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                                {
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                }
+
+                                string EffectDiscription1()
+                                {
+                                    return "[Start of Your Main Phase] Attack with this Digimon.";
+                                }
 
 
-                                    bool CanUseCondition1(Hashtable hashtable1)
+                                bool CanUseCondition1(Hashtable hashtable1)
+                                {
+                                    if (selectedPermanent.TopCard != null)
                                     {
                                     {
-                                        if (selectedPermanent.TopCard != null)
+                                        if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                         {
                                         {
-                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                            if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                             {
                                             {
-                                                if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                                {
-                                                    return true;
-                                                }
+                                                return true;
                                             }
                                             }
                                         }
                                         }
-
-                                        return false;
                                     }
                                     }
 
 
-                                    bool CanActivateCondition1(Hashtable hashtable1)
+                                    return false;
+                                }
+
+                                bool CanActivateCondition1(Hashtable hashtable1)
+                                {
+                                    if (selectedPermanent.TopCard != null)
                                     {
                                     {
-                                        if (selectedPermanent.TopCard != null)
+                                        if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                         {
                                         {
-                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                            if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {
-                                                if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                                if (selectedPermanent.CanAttack(activateClass1))
                                                 {
                                                 {
-                                                    if (permanent.CanAttack(activateClass1))
-                                                    {
-                                                        return true;
-                                                    }
+                                                    return true;
                                                 }
                                                 }
                                             }
                                             }
                                         }
                                         }
-
-                                        return false;
                                     }
                                     }
 
 
-                                    IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                    return false;
+                                }
+
+                                IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                {
+                                    if (selectedPermanent.TopCard != null)
                                     {
                                     {
-                                        if (selectedPermanent.TopCard != null)
+                                        if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                         {
                                         {
-                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                            if (selectedPermanent.CanAttack(activateClass1))
                                             {
                                             {
-                                                if (permanent.CanAttack(activateClass1))
-                                                {
-                                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                                    selectAttackEffect.SetUp(
-                                                        attacker: selectedPermanent,
-                                                        canAttackPlayerCondition: () => true,
-                                                        defenderCondition: (permanent) => true,
-                                                        cardEffect: activateClass1);
+                                                selectAttackEffect.SetUp(
+                                                    attacker: selectedPermanent,
+                                                    canAttackPlayerCondition: () => true,
+                                                    defenderCondition: (permanent) => true,
+                                                    cardEffect: activateClass1);
 
 
-                                                    selectAttackEffect.SetCanNotSelectNotAttack();
+                                                selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                                    Hashtable hashtable = new Hashtable();
-                                                    hashtable.Add("CardEffect", activateClass1);
+                                                Hashtable hashtable = new Hashtable();
+                                                hashtable.Add("CardEffect", activateClass1);
 
 
-                                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                                }
+                                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                             }
                                             }
                                         }
                                         }
                                     }
                                     }
+                                }
 
 
-                                    ICardEffect GetCardEffect(EffectTiming _timing)
+                                ICardEffect GetCardEffect(EffectTiming _timing)
+                                {
+                                    if (_timing == EffectTiming.OnStartMainPhase)
                                     {
                                     {
-                                        if (_timing == EffectTiming.OnStartMainPhase)
-                                        {
-                                            return activateClass1;
-                                        }
-
-                                        return null;
+                                        return activateClass1;
                                     }
                                     }
+
+                                    return null;
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 1 - 1
Assets/CardEffect/BT12/Blue/Otamamon_BT12_019.cs

@@ -12,7 +12,7 @@ public class Otamamon_BT12_019 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 1 digivolution card", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 1 digivolution card", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT12/Purple/Darknessbagramon_BT12_111.cs

@@ -446,7 +446,7 @@ public class Darknessbagramon_BT12_111 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Return all Tamers to hand", CanUseCondition, card);
             activateClass.SetUpICardEffect("Return all Tamers to hand", CanUseCondition, card);

+ 22 - 17
Assets/CardEffect/BT12/Red/FinalCrossBlade_BT12_100.cs

@@ -55,6 +55,8 @@ public class FinalCrossBlade_BT12_100 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                List<Permanent> selectedPermanents = new List<Permanent>();
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -100,26 +102,29 @@ public class FinalCrossBlade_BT12_100 : CEntity_Effect
 
 
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     {
                     {
-                        foreach (Permanent permanent in permanents)
-                        {
-                            Permanent selectedPermanent = permanent;
+                        selectedPermanents = permanents;
+                        yield return null;
+                    }
+
+                    foreach (Permanent permanent in selectedPermanents)
+                    {
+                        Permanent selectedPermanent = permanent;
 
 
-                            if (selectedPermanent != null)
+                        if (selectedPermanent != null)
+                        {
+                            if (selectedPermanent.CanAttack(activateClass))
                             {
                             {
-                                if (selectedPermanent.CanAttack(activateClass))
+                                if (selectedPermanent.CanAttackTargetDigimon(null, activateClass))
                                 {
                                 {
-                                    if (selectedPermanent.CanAttackTargetDigimon(null, activateClass))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                        selectAttackEffect.SetUp(
-                                    attacker: selectedPermanent,
-                                    canAttackPlayerCondition: () => true,
-                                    defenderCondition: (permanent) => false,
-                                    cardEffect: activateClass);
-
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                    selectAttackEffect.SetUp(
+                                attacker: selectedPermanent,
+                                canAttackPlayerCondition: () => true,
+                                defenderCondition: (permanent) => false,
+                                cardEffect: activateClass);
+
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 1 - 1
Assets/CardEffect/BT13/Blue/Jambogamemon_BT13_032.cs

@@ -17,7 +17,7 @@ public class Jambogamemon_BT13_032 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
             cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Play 1 digivolution card", CanUseCondition, card);
             activateClass.SetUpICardEffect("Play 1 digivolution card", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT13/Blue/Shaujinmon_BT13_027.cs

@@ -17,7 +17,7 @@ public class Shaujinmon_BT13_027 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
             cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Play 1 digivolution card", CanUseCondition, card);
             activateClass.SetUpICardEffect("Play 1 digivolution card", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT13/Purple/BerfemonSleepMode_BT13_088.cs

@@ -361,7 +361,7 @@ public class BerfemonSleepMode_BT13_088 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 2 cards from hand to end the attack", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 2 cards from hand to end the attack", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT13/Purple/Lordknightmon_BT13_090.cs

@@ -158,7 +158,7 @@ public class Lordknightmon_BT13_090 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             int getMemory()
             int getMemory()
             {
             {

+ 1 - 1
Assets/CardEffect/BT14/Blue/Otamamon_BT14_019.cs

@@ -8,7 +8,7 @@ public class Otamamon_BT14_019 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 2 digivolution cards", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 2 digivolution cards", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT14/White/Gennai_BT14_088.cs

@@ -97,7 +97,7 @@ public class Gennai_BT14_088 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Move your Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Move your Digimon", CanUseCondition, card);

+ 7 - 2
Assets/CardEffect/BT15/Black/Airdramon_BT15_059.cs

@@ -134,6 +134,8 @@ public class Airdramon_BT15_059 : CEntity_Effect
                                 selectedCards,
                                 selectedCards,
                                 activateClass));
                                 activateClass));
 
 
+                            Permanent selectedPermanent = null;
+
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
                             {
                                 maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                                 maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -160,10 +162,13 @@ public class Airdramon_BT15_059 : CEntity_Effect
 
 
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 {
                                 {
-                                    Permanent selectedPermanent = permanent;
+                                    selectedPermanent = permanent;
 
 
-                                    yield return ContinuousController.instance.StartCoroutine(new IDegeneration(selectedPermanent, 1, activateClass).Degeneration());
+                                    yield return null;
                                 }
                                 }
+
+                                if(selectedPermanent != null)
+                                    yield return ContinuousController.instance.StartCoroutine(new IDegeneration(selectedPermanent, 1, activateClass).Degeneration());
                             }
                             }
                         }
                         }
                     }
                     }

+ 1 - 1
Assets/CardEffect/BT15/Blue/Plesiomon_X_Antibody_BT15_032.cs

@@ -144,7 +144,7 @@ public class Plesiomon_X_Antibody_BT15_032 : CEntity_Effect
         #endregion
         #endregion
 
 
         #region Opponent's Turn
         #region Opponent's Turn
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Memory +2", CanUseCondition, card);
             activateClass.SetUpICardEffect("Memory +2", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT15/Green/Izzy_Izumi_BT15_085.cs

@@ -19,7 +19,7 @@ public class Izzy_Izumi_BT15_085 : CEntity_Effect
         }
         }
 
 
         #region Opponent's Turn
         #region Opponent's Turn
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch Attack Target to your Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch Attack Target to your Digimon", CanUseCondition, card);

+ 2 - 2
Assets/CardEffect/BT15/Yellow/Magnadramon_BT15_042.cs

@@ -119,7 +119,7 @@ public class Magnadramon_BT15_042 : CEntity_Effect
                                     {
                                     {
                                         GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
                                         GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
 
 
-                                        GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
+                                        PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
 
 
                                         selectHandEffect.SetUpCustomMessage_ShowCard("Security Top Card");
                                         selectHandEffect.SetUpCustomMessage_ShowCard("Security Top Card");
                                     }
                                     }
@@ -128,7 +128,7 @@ public class Magnadramon_BT15_042 : CEntity_Effect
                                     {
                                     {
                                         GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
                                         GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
 
 
-                                        GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
+                                        PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
 
 
                                         selectHandEffect.SetUpCustomMessage_ShowCard("Security Bottom Card");
                                         selectHandEffect.SetUpCustomMessage_ShowCard("Security Bottom Card");
                                     }
                                     }

+ 2 - 2
Assets/CardEffect/BT15/Yellow/Salamon_BT15_034.cs

@@ -220,14 +220,14 @@ public class Salamon_BT15_034 : CEntity_Effect
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
                                 }
                                 }
 
 
                                 else
                                 else
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
                                 }
                                 }
 
 
                                 yield return new WaitForSeconds(0.4f);
                                 yield return new WaitForSeconds(0.4f);

+ 114 - 112
Assets/CardEffect/BT16/Black/Dorugamon_BT16_058.cs

@@ -96,6 +96,7 @@ namespace DCGO.CardEffects.BT16
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                 {
                     bool discarded = false;
                     bool discarded = false;
+                    Permanent selectedPermanent = null;
 
 
                     if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                     if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                     {
                     {
@@ -135,10 +136,8 @@ namespace DCGO.CardEffects.BT16
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
 
 
                         #region Has Tamer with [SoC] Trait - grant Start of Your Main Phase Effect
                         #region Has Tamer with [SoC] Trait - grant Start of Your Main Phase Effect
-                        Debug.Log($"Has Tamer: {card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition)}");
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition) >= 1)
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition) >= 1)
                         {
                         {
-                            Debug.Log($"Has Match Permanent: {CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition)}");
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
                             {
                                 int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                                 int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -163,88 +162,90 @@ namespace DCGO.CardEffects.BT16
 
 
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 {
                                 {
-                                    Permanent selectedPermanent = permanent;
+                                    selectedPermanent = permanent;
 
 
-                                    if (selectedPermanent != null)
-                                    {
-                                        ActivateClass activateClass1 = new ActivateClass();
-                                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                    yield return null;
+                                }
 
 
-                                        if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                        {
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                                        }
+                                if (selectedPermanent != null)
+                                {
+                                    ActivateClass activateClass1 = new ActivateClass();
+                                    activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                    activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                    activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                                    selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                                        string EffectDiscription1()
-                                        {
-                                            return "[Start of Your Main Phase] Attack with this Digimon.";
-                                        }
+                                    if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                                    {
+                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                    }
+
+                                    string EffectDiscription1()
+                                    {
+                                        return "[Start of Your Main Phase] Attack with this Digimon.";
+                                    }
 
 
-                                        bool CanUseCondition1(Hashtable hashtable1)
+                                    bool CanUseCondition1(Hashtable hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                             {
                                             {
-                                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                                if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                                 {
                                                 {
-                                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                                    {
-                                                        return true;
-                                                    }
+                                                    return true;
                                                 }
                                                 }
                                             }
                                             }
-
-                                            return false;
                                         }
                                         }
 
 
-                                        bool CanActivateCondition1(Hashtable hashtable1)
+                                        return false;
+                                    }
+
+                                    bool CanActivateCondition1(Hashtable hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {
-                                                if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                                if (selectedPermanent.CanAttack(activateClass1))
                                                 {
                                                 {
-                                                    if (permanent.CanAttack(activateClass1))
-                                                    {
-                                                        return true;
-                                                    }
+                                                    return true;
                                                 }
                                                 }
                                             }
                                             }
-
-                                            return false;
                                         }
                                         }
 
 
-                                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                        return false;
+                                    }
+
+                                    IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (selectedPermanent.CanAttack(activateClass1))
                                             {
                                             {
-                                                if (permanent.CanAttack(activateClass1))
-                                                {
-                                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                                    selectAttackEffect.SetUp(
-                                                        attacker: selectedPermanent,
-                                                        canAttackPlayerCondition: () => true,
-                                                        defenderCondition: (permanent) => true,
-                                                        cardEffect: activateClass1);
+                                                selectAttackEffect.SetUp(
+                                                    attacker: selectedPermanent,
+                                                    canAttackPlayerCondition: () => true,
+                                                    defenderCondition: (permanent) => true,
+                                                    cardEffect: activateClass1);
 
 
-                                                    selectAttackEffect.SetCanNotSelectNotAttack();
+                                                selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                                }
+                                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                             }
                                             }
                                         }
                                         }
+                                    }
 
 
-                                        ICardEffect GetCardEffect(EffectTiming _timing)
+                                    ICardEffect GetCardEffect(EffectTiming _timing)
+                                    {
+                                        if (_timing == EffectTiming.OnStartMainPhase)
                                         {
                                         {
-                                            if (_timing == EffectTiming.OnStartMainPhase)
-                                            {
-                                                return activateClass1;
-                                            }
-
-                                            return null;
+                                            return activateClass1;
                                         }
                                         }
+
+                                        return null;
                                     }
                                     }
                                 }
                                 }
                             }
                             }
@@ -304,6 +305,7 @@ namespace DCGO.CardEffects.BT16
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                 {
                     bool discarded = false;
                     bool discarded = false;
+                    Permanent selectedPermanent = null;
 
 
                     if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                     if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                     {
                     {
@@ -343,10 +345,8 @@ namespace DCGO.CardEffects.BT16
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
 
 
                         #region Has Tamer with [SoC] Trait - grant Start of Your Main Phase Effect
                         #region Has Tamer with [SoC] Trait - grant Start of Your Main Phase Effect
-                        Debug.Log($"Has Tamer: {card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition)}");
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition) >= 1)
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerCardCondition) >= 1)
                         {
                         {
-                            Debug.Log($"Has Match Permanent: {CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition)}");
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
                             {
                                 int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                                 int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -371,88 +371,90 @@ namespace DCGO.CardEffects.BT16
 
 
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 {
                                 {
-                                    Permanent selectedPermanent = permanent;
+                                    selectedPermanent = permanent;
 
 
-                                    if (selectedPermanent != null)
-                                    {
-                                        ActivateClass activateClass1 = new ActivateClass();
-                                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                    yield return null;
+                                }
 
 
-                                        if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                        {
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                                        }
+                                if (selectedPermanent != null)
+                                {
+                                    ActivateClass activateClass1 = new ActivateClass();
+                                    activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                    activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                    activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                                    selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                                        string EffectDiscription1()
-                                        {
-                                            return "[Start of Your Main Phase] Attack with this Digimon.";
-                                        }
+                                    if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                                    {
+                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                    }
+
+                                    string EffectDiscription1()
+                                    {
+                                        return "[Start of Your Main Phase] Attack with this Digimon.";
+                                    }
 
 
-                                        bool CanUseCondition1(Hashtable hashtable1)
+                                    bool CanUseCondition1(Hashtable hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                             {
                                             {
-                                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                                if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                                 {
                                                 {
-                                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                                    {
-                                                        return true;
-                                                    }
+                                                    return true;
                                                 }
                                                 }
                                             }
                                             }
-
-                                            return false;
                                         }
                                         }
 
 
-                                        bool CanActivateCondition1(Hashtable hashtable1)
+                                        return false;
+                                    }
+
+                                    bool CanActivateCondition1(Hashtable hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {
-                                                if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                                if (selectedPermanent.CanAttack(activateClass1))
                                                 {
                                                 {
-                                                    if (permanent.CanAttack(activateClass1))
-                                                    {
-                                                        return true;
-                                                    }
+                                                    return true;
                                                 }
                                                 }
                                             }
                                             }
-
-                                            return false;
                                         }
                                         }
 
 
-                                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                        return false;
+                                    }
+
+                                    IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                    {
+                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                            if (selectedPermanent.CanAttack(activateClass1))
                                             {
                                             {
-                                                if (permanent.CanAttack(activateClass1))
-                                                {
-                                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                                    selectAttackEffect.SetUp(
-                                                        attacker: selectedPermanent,
-                                                        canAttackPlayerCondition: () => true,
-                                                        defenderCondition: (permanent) => true,
-                                                        cardEffect: activateClass1);
+                                                selectAttackEffect.SetUp(
+                                                    attacker: selectedPermanent,
+                                                    canAttackPlayerCondition: () => true,
+                                                    defenderCondition: (permanent) => true,
+                                                    cardEffect: activateClass1);
 
 
-                                                    selectAttackEffect.SetCanNotSelectNotAttack();
+                                                selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                                }
+                                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                             }
                                             }
                                         }
                                         }
+                                    }
 
 
-                                        ICardEffect GetCardEffect(EffectTiming _timing)
+                                    ICardEffect GetCardEffect(EffectTiming _timing)
+                                    {
+                                        if (_timing == EffectTiming.OnStartMainPhase)
                                         {
                                         {
-                                            if (_timing == EffectTiming.OnStartMainPhase)
-                                            {
-                                                return activateClass1;
-                                            }
-
-                                            return null;
+                                            return activateClass1;
                                         }
                                         }
+
+                                        return null;
                                     }
                                     }
                                 }
                                 }
                             }
                             }

+ 1 - 1
Assets/CardEffect/BT16/Green/MetallifeKuwagamon_BT16_045.cs

@@ -279,7 +279,7 @@ namespace DCGO.CardEffects.BT16
             #endregion
             #endregion
 
 
             #region Inherit
             #region Inherit
-            if (timing == EffectTiming.OnCounterTiming)
+            if (timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Switch attack target", CanUseCondition, card);
                 activateClass.SetUpICardEffect("Switch attack target", CanUseCondition, card);

+ 9 - 2
Assets/CardEffect/BT16/Purple/Dinobeemon_BT16_077.cs

@@ -228,6 +228,8 @@ namespace DCGO.CardEffects.BT16
                             activateETB: true));
                             activateETB: true));
                     }
                     }
 
 
+                    Permanent selectedPermanent = null;
+
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
                     {
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -252,17 +254,22 @@ namespace DCGO.CardEffects.BT16
 
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
                         {
+                            selectedPermanent = permanent;
+
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
                                 targetPermanent: permanent,
                                 targetPermanent: permanent,
                                 effectDuration: EffectDuration.UntilEachTurnEnd,
                                 effectDuration: EffectDuration.UntilEachTurnEnd,
                                 activateClass: activateClass));
                                 activateClass: activateClass));
+                        }
 
 
-                            if (permanent.CanAttack(activateClass))
+                        if(selectedPermanent != null)
+                        {
+                            if (selectedPermanent.CanAttack(activateClass))
                             {
                             {
                                 SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
                                 SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
                                 selectAttackEffect.SetUp(
                                 selectAttackEffect.SetUp(
-                                    attacker: permanent,
+                                    attacker: selectedPermanent,
                                     canAttackPlayerCondition: () => true,
                                     canAttackPlayerCondition: () => true,
                                     defenderCondition: _ => false,
                                     defenderCondition: _ => false,
                                     cardEffect: activateClass);
                                     cardEffect: activateClass);

+ 0 - 1
Assets/CardEffect/BT17/Black/Trailmon_BT17_054.cs

@@ -71,7 +71,6 @@ namespace DCGO.CardEffects.BT17
             {
             {
                 bool condition()
                 bool condition()
                 {
                 {
-                    UnityEngine.Debug.Log($"ESS: {card.PermanentOfThisCard().TopCard != card}, {card.PermanentOfThisCard().TopCard.ContainsTraits("Machine")}");
                     if (card.PermanentOfThisCard().TopCard != card)
                     if (card.PermanentOfThisCard().TopCard != card)
                         return card.PermanentOfThisCard().TopCard.ContainsTraits("Machine");
                         return card.PermanentOfThisCard().TopCard.ContainsTraits("Machine");
 
 

+ 22 - 16
Assets/CardEffect/BT17/Yellow/Kazuchimon_BT17_040.cs

@@ -143,6 +143,8 @@ namespace DCGO.CardEffects.BT17
 
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                 {
+                    List<Permanent> selectedPermanents = new List<Permanent>();
+
                     if (card.Owner.SecurityCards.Count >= 3)
                     if (card.Owner.SecurityCards.Count >= 3)
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -213,24 +215,28 @@ namespace DCGO.CardEffects.BT17
 
 
                         IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                         IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                         {
                         {
-                            foreach (Permanent permanent in permanents)
-                            {
-                                Permanent selectedPermanent = permanent;
+                            selectedPermanents = permanents;
 
 
-                                if (selectedPermanent != null)
+                            yield return null;
+                        }
+
+                        foreach (Permanent permanent in selectedPermanents)
+                        {
+                            Permanent selectedPermanent = permanent;
+
+                            if (selectedPermanent != null)
+                            {
+                                if (selectedPermanent.CanAttack(activateClass))
                                 {
                                 {
-                                    if (selectedPermanent.CanAttack(activateClass))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => false,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass);
-
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => false,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass);
+
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 1 - 1
Assets/CardEffect/BT5/White/OmegamonXAntiBody_BT5_111.cs

@@ -121,7 +121,7 @@ public class OmegamonXAntiBody_BT5_111 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 2 digivolution cards to end the attack", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 2 digivolution cards to end the attack", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT6/Green/EncientTroiamon_BT6_054.cs

@@ -11,7 +11,7 @@ public class EncientTroiamon_BT6_054 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Suspend Digimons without Blocker", CanUseCondition, card);
             activateClass.SetUpICardEffect("Suspend Digimons without Blocker", CanUseCondition, card);

+ 0 - 23
Assets/CardEffect/BT6/White/SistermonNowaru_BT6_084.cs

@@ -13,29 +13,6 @@ public class SistermonNowaru_BT6_084 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.None)
-        {
-            ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-            changeTraitsClass.SetUpICardEffect("Also treated as [Virus]", CanUseCondition, card);
-            changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-            cardEffects.Add(changeTraitsClass);
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return true;
-            }
-
-            List<string> changeTraits(CardSource cardSource, List<string> Traits)
-            {
-                if (cardSource == card)
-                {
-                    Traits.Add("Virus");
-                }
-
-                return Traits;
-            }
-        }
-
         if (timing == EffectTiming.None)
         if (timing == EffectTiming.None)
         {
         {
             bool Condition()
             bool Condition()

+ 0 - 26
Assets/CardEffect/BT7/White/SistermonNowaruAwaken_BT7_083.cs

@@ -13,32 +13,6 @@ public class SistermonNowaruAwaken_BT7_083 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.None)
-        {
-            ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-            changeTraitsClass.SetUpICardEffect("Also treated as [Virus]", CanUseCondition, card);
-            changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-
-            cardEffects.Add(changeTraitsClass);
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return true;
-            }
-
-
-
-            List<string> changeTraits(CardSource cardSource, List<string> Traits)
-            {
-                if (cardSource == card)
-                {
-                    Traits.Add("Virus");
-                }
-
-                return Traits;
-            }
-        }
-
         if (timing == EffectTiming.OnEnterFieldAnyone)
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();

+ 1 - 1
Assets/CardEffect/BT7/Yellow/Bautomon_BT7_037.cs

@@ -11,7 +11,7 @@ public class Bautomon_BT7_037 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Unsuspend this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Unsuspend this Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/BT8/Blue/TalaishiTakeru_BT8_087.cs

@@ -18,7 +18,7 @@ public class TalaishiTakeru_BT8_087 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.SetMemoryTo3TamerEffect(card));
             cardEffects.Add(CardEffectFactory.SetMemoryTo3TamerEffect(card));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);

+ 23 - 17
Assets/CardEffect/BT9/Green/GrandisScissor_BT9_100.cs

@@ -49,6 +49,8 @@ public class GrandisScissor_BT9_100 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                List<Permanent> selectedPermanents = new List<Permanent>();
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -94,26 +96,30 @@ public class GrandisScissor_BT9_100 : CEntity_Effect
 
 
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                     {
                     {
-                        foreach (Permanent permanent in permanents)
-                        {
-                            Permanent selectedPermanent = permanent;
+                        selectedPermanents = permanents;
 
 
-                            if (selectedPermanent != null)
+                        yield return null;
+                    }
+
+                    foreach (Permanent permanent in selectedPermanents)
+                    {
+                        Permanent selectedPermanent = permanent;
+
+                        if (selectedPermanent != null)
+                        {
+                            if (selectedPermanent.CanAttack(activateClass))
                             {
                             {
-                                if (selectedPermanent.CanAttack(activateClass))
+                                if (CardEffectCommons.HasMatchConditionOpponentsPermanent(card, (permanent) => permanent.IsDigimon && selectedPermanent.CanAttackTargetDigimon(permanent, activateClass)))
                                 {
                                 {
-                                    if (CardEffectCommons.HasMatchConditionOpponentsPermanent(card, (permanent) => permanent.IsDigimon && selectedPermanent.CanAttackTargetDigimon(permanent, activateClass)))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => false,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass);
-
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => false,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass);
+
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 16 - 12
Assets/CardEffect/BT9/Red/GaiaforceZero_BT9_095.cs

@@ -117,6 +117,8 @@ public class GaiaforceZero_BT9_095 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -164,22 +166,24 @@ public class GaiaforceZero_BT9_095 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
+
+                        yield return null;
+                    }
 
 
-                        if (selectedPermanent != null)
+                    if (selectedPermanent != null)
+                    {
+                        if (selectedPermanent.CanAttack(activateClass))
                         {
                         {
-                            if (selectedPermanent.CanAttack(activateClass))
-                            {
-                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                            SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                selectAttackEffect.SetUp(
-                                    attacker: selectedPermanent,
-                                    canAttackPlayerCondition: () => true,
-                                    defenderCondition: (permanent) => false,
-                                    cardEffect: activateClass);
+                            selectAttackEffect.SetUp(
+                                attacker: selectedPermanent,
+                                canAttackPlayerCondition: () => true,
+                                defenderCondition: (permanent) => false,
+                                cardEffect: activateClass);
 
 
-                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                            }
+                            yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                         }
                     }
                     }
                 }
                 }

+ 1 - 1
Assets/CardEffect/BT9/Yellow/MagnamonXAntibody_BT9_044.cs

@@ -21,7 +21,7 @@ public class MagnamonXAntibody_BT9_044 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 4, ignoreDigivolutionRequirement: false, card: card, condition: null));
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 4, ignoreDigivolutionRequirement: false, card: card, condition: null));
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX2/Blue/KatouJuri_EX2_058.cs

@@ -105,7 +105,7 @@ public class KatouJuri_EX2_058 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX4/Black/Darkknightmon_EX4_047.cs

@@ -309,7 +309,7 @@ public class Darkknightmon_EX4_047 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);

+ 113 - 109
Assets/CardEffect/EX5/Black/Etemon_EX5_048.cs

@@ -59,6 +59,8 @@ public class Etemon_EX5_048 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -86,94 +88,94 @@ public class Etemon_EX5_048 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
+                        selectedPermanent = permanent;
+
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                             targetPermanent: permanent,
                             targetPermanent: permanent,
                             changeValue: -3000,
                             changeValue: -3000,
                             effectDuration: EffectDuration.UntilOpponentTurnEnd,
                             effectDuration: EffectDuration.UntilOpponentTurnEnd,
                             activateClass: activateClass));
                             activateClass: activateClass));
+                    }
 
 
-                        Permanent selectedPermanent = permanent;
+                    if (selectedPermanent != null)
+                    {
+                        ActivateClass activateClass1 = new ActivateClass();
+                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                        if (selectedPermanent != null)
+                        if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                         {
                         {
-                            ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                            activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                            selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
-
-                            if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                        }
 
 
-                            string EffectDiscription1()
-                            {
-                                return "[Start of Your Main Phase] Attack with this Digimon.";
-                            }
+                        string EffectDiscription1()
+                        {
+                            return "[Start of Your Main Phase] Attack with this Digimon.";
+                        }
 
 
-                            bool CanUseCondition1(Hashtable hashtable1)
+                        bool CanUseCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                 {
                                 {
-                                    if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                     {
                                     {
-                                        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            bool CanActivateCondition1(Hashtable hashtable1)
+                            return false;
+                        }
+
+                        bool CanActivateCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                 {
                                 {
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                    if (selectedPermanent.CanAttack(activateClass1))
                                     {
                                     {
-                                        if (permanent.CanAttack(activateClass1))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                            return false;
+                        }
+
+                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.CanAttack(activateClass1))
                                 {
                                 {
-                                    if (permanent.CanAttack(activateClass1))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => true,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass1);
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => true,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass1);
 
 
-                                        selectAttackEffect.SetCanNotSelectNotAttack();
+                                    selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
+                        }
 
 
-                            ICardEffect GetCardEffect(EffectTiming _timing)
+                        ICardEffect GetCardEffect(EffectTiming _timing)
+                        {
+                            if (_timing == EffectTiming.OnStartMainPhase)
                             {
                             {
-                                if (_timing == EffectTiming.OnStartMainPhase)
-                                {
-                                    return activateClass1;
-                                }
-
-                                return null;
+                                return activateClass1;
                             }
                             }
+
+                            return null;
                         }
                         }
                     }
                     }
                 }
                 }
@@ -217,6 +219,8 @@ public class Etemon_EX5_048 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -244,101 +248,101 @@ public class Etemon_EX5_048 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
+                        selectedPermanent = permanent;
+
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                             targetPermanent: permanent,
                             targetPermanent: permanent,
                             changeValue: -3000,
                             changeValue: -3000,
                             effectDuration: EffectDuration.UntilOpponentTurnEnd,
                             effectDuration: EffectDuration.UntilOpponentTurnEnd,
                             activateClass: activateClass));
                             activateClass: activateClass));
+                    }
 
 
-                        Permanent selectedPermanent = permanent;
+                    if (selectedPermanent != null)
+                    {
+                        ActivateClass activateClass1 = new ActivateClass();
+                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                        if (selectedPermanent != null)
+                        if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                         {
                         {
-                            ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                            activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                            selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
-
-                            if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                        }
 
 
-                            string EffectDiscription1()
-                            {
-                                return "[Start of Your Main Phase] Attack with this Digimon.";
-                            }
+                        string EffectDiscription1()
+                        {
+                            return "[Start of Your Main Phase] Attack with this Digimon.";
+                        }
 
 
-                            bool CanUseCondition1(Hashtable hashtable1)
+                        bool CanUseCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                 {
                                 {
-                                    if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                     {
                                     {
-                                        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            bool CanActivateCondition1(Hashtable hashtable1)
+                            return false;
+                        }
+
+                        bool CanActivateCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                 {
                                 {
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                    if (selectedPermanent.CanAttack(activateClass1))
                                     {
                                     {
-                                        if (permanent.CanAttack(activateClass1))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                            return false;
+                        }
+
+                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.CanAttack(activateClass1))
                                 {
                                 {
-                                    if (permanent.CanAttack(activateClass1))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => true,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass1);
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => true,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass1);
 
 
-                                        selectAttackEffect.SetCanNotSelectNotAttack();
+                                    selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
+                        }
 
 
-                            ICardEffect GetCardEffect(EffectTiming _timing)
+                        ICardEffect GetCardEffect(EffectTiming _timing)
+                        {
+                            if (_timing == EffectTiming.OnStartMainPhase)
                             {
                             {
-                                if (_timing == EffectTiming.OnStartMainPhase)
-                                {
-                                    return activateClass1;
-                                }
-
-                                return null;
+                                return activateClass1;
                             }
                             }
+
+                            return null;
                         }
                         }
                     }
                     }
                 }
                 }
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Reveal the top 3 cards of deck", CanUseCondition, card);
             activateClass.SetUpICardEffect("Reveal the top 3 cards of deck", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX5/Black/Metaletemon_EX5_054.cs

@@ -192,7 +192,7 @@ public class Metaletemon_EX5_054 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Place 1 card from hand at the top of security to switch attack target", CanUseCondition, card);
             activateClass.SetUpICardEffect("Place 1 card from hand at the top of security to switch attack target", CanUseCondition, card);

+ 18 - 14
Assets/CardEffect/EX5/Yellow/FlashBanchoPunch_EX5_068.cs

@@ -82,6 +82,8 @@ public class FlashBanchoPunch_EX5_068 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -166,22 +168,24 @@ public class FlashBanchoPunch_EX5_068 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
+
+                        yield return null;
+                    }
 
 
-                        if (selectedPermanent != null)
+                    if (selectedPermanent != null)
+                    {
+                        if (selectedPermanent.CanAttack(activateClass))
                         {
                         {
-                            if (selectedPermanent.CanAttack(activateClass))
-                            {
-                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                selectAttackEffect.SetUp(
-                                    attacker: selectedPermanent,
-                                    canAttackPlayerCondition: () => true,
-                                    defenderCondition: (permanent) => true,
-                                    cardEffect: activateClass);
-
-                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                            }
+                            SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                            selectAttackEffect.SetUp(
+                                attacker: selectedPermanent,
+                                canAttackPlayerCondition: () => true,
+                                defenderCondition: (permanent) => true,
+                                cardEffect: activateClass);
+
+                            yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                         }
                     }
                     }
                 }
                 }

+ 53 - 131
Assets/CardEffect/EX6/Black/RaijiLudomon_EX6_042.cs

@@ -118,6 +118,8 @@ namespace DCGO.CardEffects.EX6
 
 
                     if (selectedPermanent != null)
                     if (selectedPermanent != null)
                     {
                     {
+                        Permanent selectedPermanent1 = null;
+
                         if (CardEffectCommons.HasMatchConditionPermanent(IsEnemyPermanent))
                         if (CardEffectCommons.HasMatchConditionPermanent(IsEnemyPermanent))
                         {
                         {
                             int enemyCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(IsEnemyPermanent));
                             int enemyCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(IsEnemyPermanent));
@@ -143,173 +145,93 @@ namespace DCGO.CardEffects.EX6
 
 
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             {
                             {
-                                Permanent selectedPermanent = permanent;
-
-                                if (selectedPermanent != null)
-                                {
-                                    ActivateClass activateClass1 = new ActivateClass();
-                                    activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                                    activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                    activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                    selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                selectedPermanent1 = permanent;
 
 
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                                    }
+                                yield return null;
+                            }
 
 
-                                    string EffectDiscription1()
-                                    {
-                                        return "[Start of Your Main Phase] Attack with this Digimon.";
-                                    }
+                            if (selectedPermanent1 != null)
+                            {
+                                ActivateClass activateClass1 = new ActivateClass();
+                                activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent1.TopCard);
+                                activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                activateClass1.SetEffectSourcePermanent(selectedPermanent1);
+                                selectedPermanent1.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                                    bool CanUseCondition1(Hashtable hashtable1)
-                                    {
-                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
-                                        {
-                                            if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
-                                            {
-                                                if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                                {
-                                                    return true;
-                                                }
-                                            }
-                                        }
+                                if (!selectedPermanent1.TopCard.CanNotBeAffected(activateClass))
+                                {
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent1));
+                                }
 
 
-                                        return false;
-                                    }
+                                string EffectDiscription1()
+                                {
+                                    return "[Start of Your Main Phase] Attack with this Digimon.";
+                                }
 
 
-                                    bool CanActivateCondition1(Hashtable hashtable1)
+                                bool CanUseCondition1(Hashtable hashtable1)
+                                {
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent1))
                                     {
                                     {
-                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                        if (selectedPermanent1.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent1))
                                         {
                                         {
-                                            if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                            if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent1.TopCard.Owner)
                                             {
                                             {
-                                                if (permanent.CanAttack(activateClass1))
-                                                {
-                                                    return true;
-                                                }
+                                                return true;
                                             }
                                             }
                                         }
                                         }
-
-                                        return false;
                                     }
                                     }
 
 
-                                    IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                    return false;
+                                }
+
+                                bool CanActivateCondition1(Hashtable hashtable1)
+                                {
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent1))
                                     {
                                     {
-                                        if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                        if (!selectedPermanent1.TopCard.CanNotBeAffected(activateClass))
                                         {
                                         {
-                                            if (permanent.CanAttack(activateClass1))
+                                            if (selectedPermanent1.CanAttack(activateClass1))
                                             {
                                             {
-                                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                                selectAttackEffect.SetUp(
-                                                    attacker: selectedPermanent,
-                                                    canAttackPlayerCondition: () => true,
-                                                    defenderCondition: (permanent) => true,
-                                                    cardEffect: activateClass1);
-
-                                                selectAttackEffect.SetCanNotSelectNotAttack();
-
-                                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
+                                                return true;
                                             }
                                             }
                                         }
                                         }
                                     }
                                     }
 
 
-                                    ICardEffect GetCardEffect(EffectTiming _timing)
-                                    {
-                                        if (_timing == EffectTiming.OnStartMainPhase)
-                                        {
-                                            return activateClass1;
-                                        }
-
-                                        return null;
-                                    }
+                                    return false;
                                 }
                                 }
-                            }
-                        }
-
-                        /*if (selectedEnemy != null)
-                        {
-                            ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedEnemy.TopCard);
-                            activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedEnemy);
-                            selectedEnemy.UntilOwnerTurnEndEffects.Add(GetCardEffect);
-
-                            if (!selectedEnemy.TopCard.CanNotBeAffected(activateClass))
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedEnemy));
-                            }
-
-                            string EffectDiscription1()
-                            {
-                                return "[Start of Your Main Phase] Attack with this Digimon.";
-                            }
 
 
-                            bool CanUseCondition1(Hashtable hashtable1)
-                            {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedEnemy))
+                                IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
                                 {
                                 {
-                                    if (selectedEnemy.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedEnemy))
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent1))
                                     {
                                     {
-                                        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedEnemy.TopCard.Owner)
+                                        if (selectedPermanent1.CanAttack(activateClass1))
                                         {
                                         {
-                                            return true;
-                                        }
-                                    }
-                                }
+                                            SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                return false;
-                            }
+                                            selectAttackEffect.SetUp(
+                                                attacker: selectedPermanent1,
+                                                canAttackPlayerCondition: () => true,
+                                                defenderCondition: (permanent) => true,
+                                                cardEffect: activateClass1);
 
 
-                            bool CanActivateCondition1(Hashtable hashtable1)
-                            {
-                                if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(selectedPermanent))
-                                {
-                                    if (!selectedEnemy.TopCard.CanNotBeAffected(activateClass))
-                                    {
-                                        if (selectedEnemy.CanAttack(activateClass1))
-                                        {
-                                            return true;
+                                            selectAttackEffect.SetCanNotSelectNotAttack();
+
+                                            yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }
 
 
-                                return false;
-                            }
-
-                            IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
-                            {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                ICardEffect GetCardEffect(EffectTiming _timing)
                                 {
                                 {
-                                    if (selectedEnemy.CanAttack(activateClass1))
+                                    if (_timing == EffectTiming.OnStartMainPhase)
                                     {
                                     {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedEnemy,
-                                            canAttackPlayerCondition: () => true,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass1);
-
-                                        selectAttackEffect.SetCanNotSelectNotAttack();
-
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
+                                        return activateClass1;
                                     }
                                     }
-                                }
-                            }
 
 
-                            ICardEffect GetCardEffect(EffectTiming _timing)
-                            {
-                                if (_timing == EffectTiming.OnStartMainPhase)
-                                {
-                                    return activateClass1;
+                                    return null;
                                 }
                                 }
-
-                                return null;
                             }
                             }
-                        }*/
+                        }
 
 
                         yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
                         yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
                                 new List<CardSource>() { card },
                                 new List<CardSource>() { card },

+ 1 - 1
Assets/CardEffect/EX6/Purple/Tsukaimon_EX6_045.cs

@@ -79,7 +79,7 @@ namespace DCGO.CardEffects.EX6
             #endregion
             #endregion
 
 
             #region Inherit
             #region Inherit
-            if(timing == EffectTiming.OnCounterTiming)
+            if(timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX6/Purple/Witchmon_EX6_048.cs

@@ -365,7 +365,7 @@ namespace DCGO.CardEffects.EX6
             #endregion
             #endregion
 
 
             #region Inherit
             #region Inherit
-            if (timing == EffectTiming.OnCounterTiming)
+            if (timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);

+ 2 - 2
Assets/CardEffect/EX6/Yellow/ArkhaiAngemon_EX6_021.cs

@@ -117,7 +117,7 @@ namespace DCGO.CardEffects.EX6
 
 
                                 log += "\n";
                                 log += "\n";
 
 
-                                GManager.instance.playLog.AddLogString(log);
+                                PlayLog.OnAddLog?.Invoke(log);
                             }
                             }
                             #endregion
                             #endregion
 
 
@@ -279,7 +279,7 @@ namespace DCGO.CardEffects.EX6
 
 
                                 log += "\n";
                                 log += "\n";
 
 
-                                GManager.instance.playLog.AddLogString(log);
+                                PlayLog.OnAddLog?.Invoke(log);
                             }
                             }
                             #endregion
                             #endregion
 
 

+ 1 - 1
Assets/CardEffect/EX7/Black/Jazarichmon_EX7_046.cs

@@ -111,7 +111,7 @@ namespace DCGO.CardEffects.EX7
 
 
             #region Opponent's Turn - ESS
             #region Opponent's Turn - ESS
 
 
-            if (timing == EffectTiming.OnCounterTiming)
+            if (timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);
                 activateClass.SetUpICardEffect("Switch attack target to this Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX7/Purple/BlackGatomon_EX7_054.cs

@@ -236,7 +236,7 @@ namespace DCGO.CardEffects.EX7
             #endregion
             #endregion
 
 
             #region Inherit
             #region Inherit
-            if (timing == EffectTiming.OnCounterTiming)
+            if (timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX7/Purple/Tsukaimon_EX7_052.cs

@@ -88,7 +88,7 @@ namespace DCGO.CardEffects.EX7
             #endregion
             #endregion
 
 
             #region Inherit
             #region Inherit
-            if (timing == EffectTiming.OnCounterTiming)
+            if (timing == EffectTiming.OnAllyAttack)
             {
             {
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);
                 activateClass.SetUpICardEffect("End the attack by deleting 1 of your Digimon", CanUseCondition, card);

+ 16 - 6
Assets/CardEffect/EX7/Red/MagnaKidmon_EX7_013.cs

@@ -310,9 +310,10 @@ namespace DCGO.CardEffects.EX7
 
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                 {
-                     bool trashed = false;
+                    bool trashed = false;
+                    Permanent selectedPermanent = null;
 
 
-                     List<CardSource> selectedCards = new List<CardSource>();
+                    List<CardSource> selectedCards = new List<CardSource>();
 
 
                      SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                      SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
 
@@ -379,14 +380,23 @@ namespace DCGO.CardEffects.EX7
 
 
                              IEnumerator SelectPermanentCoroutine(Permanent permanent)
                              IEnumerator SelectPermanentCoroutine(Permanent permanent)
                              {
                              {
-                                 yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(targetPermanent: permanent, changeValue: 1, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                                selectedPermanent = permanent;
+
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(
+                                    targetPermanent: permanent, 
+                                    changeValue: 1, 
+                                    effectDuration: EffectDuration.UntilEachTurnEnd, 
+                                    activateClass: activateClass));
+                             }
 
 
-                                if (permanent.CanAttack(activateClass))
+                            if(selectedPermanent != null)
+                            {
+                                if (selectedPermanent.CanAttack(activateClass))
                                 {
                                 {
                                     SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
                                     SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
                                     selectAttackEffect.SetUp(
                                     selectAttackEffect.SetUp(
-                                        attacker: permanent,
+                                        attacker: selectedPermanent,
                                         canAttackPlayerCondition: () => true,
                                         canAttackPlayerCondition: () => true,
                                         defenderCondition: (permanent) => true,
                                         defenderCondition: (permanent) => true,
                                         cardEffect: activateClass);
                                         cardEffect: activateClass);
@@ -395,7 +405,7 @@ namespace DCGO.CardEffects.EX7
 
 
                                     yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                     yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
-                             }
+                            }
                          }
                          }
                      }                    
                      }                    
                 }
                 }

+ 1 - 1
Assets/CardEffect/P/Black/Deathtromon_P_094.cs

@@ -276,7 +276,7 @@ public class Deathtromon_P_094 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Return 2 [Vemmon] from [Galacticmon]'s digivolution cards to the deck bottom to switch attack target to this Digimon", CanUseCondition, card);
             activateClass.SetUpICardEffect("Return 2 [Vemmon] from [Galacticmon]'s digivolution cards to the deck bottom to switch attack target to this Digimon", CanUseCondition, card);

+ 0 - 24
Assets/CardEffect/P/Black/Raremon_P_101.cs

@@ -11,30 +11,6 @@ public class Raremon_P_101 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.None)
-        {
-            ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-            changeTraitsClass.SetUpICardEffect("Also treated as [Cyborg]", CanUseCondition, card);
-            changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-
-            cardEffects.Add(changeTraitsClass);
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return true;
-            }
-
-            List<string> changeTraits(CardSource cardSource, List<string> Traits)
-            {
-                if (cardSource == card)
-                {
-                    Traits.Add("Cyborg");
-                }
-
-                return Traits;
-            }
-        }
-
         if (timing == EffectTiming.OnEnterFieldAnyone)
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();

+ 1 - 1
Assets/CardEffect/P/Blue/Anfimon_P_089.cs

@@ -205,7 +205,7 @@ public class Anfimon_P_089 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Return cards from trash to the bottom of deck to end the attack", CanUseCondition, card);
             activateClass.SetUpICardEffect("Return cards from trash to the bottom of deck to end the attack", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/P/Yellow/Knightmon_P_111.cs

@@ -180,7 +180,7 @@ public class Knightmon_P_111 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnAllyAttack || timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Play 1 Digimon from hand", CanUseCondition, card);
             activateClass.SetUpICardEffect("Play 1 Digimon from hand", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/RB1/Blue/HigashimitaraiKiyoshirou_RB1_033.cs

@@ -74,7 +74,7 @@ public class HigashimitaraiKiyoshirou_RB1_033 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);
             activateClass.SetUpICardEffect("Draw 1", CanUseCondition, card);

+ 19 - 15
Assets/CardEffect/RB1/Green/Dilbitmon_RB1_025.cs

@@ -217,6 +217,8 @@ public class Dilbitmon_RB1_025 : CEntity_Effect
 
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
             {
+                Permanent selectedPermanent = null;
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                 {
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
@@ -242,24 +244,26 @@ public class Dilbitmon_RB1_025 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
+
+                        yield return null;
+                    }
 
 
-                        if (selectedPermanent != null)
+                    if (selectedPermanent != null)
+                    {
+                        if (selectedPermanent.CanAttack(activateClass))
                         {
                         {
-                            if (selectedPermanent.CanAttack(activateClass))
+                            if (CardEffectCommons.HasMatchConditionOpponentsPermanent(card, (permanent) => permanent.IsDigimon && selectedPermanent.CanAttackTargetDigimon(permanent, activateClass)))
                             {
                             {
-                                if (CardEffectCommons.HasMatchConditionOpponentsPermanent(card, (permanent) => permanent.IsDigimon && selectedPermanent.CanAttackTargetDigimon(permanent, activateClass)))
-                                {
-                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                    selectAttackEffect.SetUp(
-                                        attacker: selectedPermanent,
-                                        canAttackPlayerCondition: () => false,
-                                        defenderCondition: (permanent) => true,
-                                        cardEffect: activateClass);
-
-                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                }
+                                SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                selectAttackEffect.SetUp(
+                                    attacker: selectedPermanent,
+                                    canAttackPlayerCondition: () => false,
+                                    defenderCondition: (permanent) => true,
+                                    cardEffect: activateClass);
+
+                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                             }
                             }
                         }
                         }
                     }
                     }

+ 4 - 4
Assets/CardEffect/ST10/Yellow/ChaosDigrade_ST10_14.cs

@@ -86,14 +86,14 @@ public class ChaosDigrade_ST10_14 : CEntity_Effect
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
                                 }
                                 }
 
 
                                 else
                                 else
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
                                 }
                                 }
 
 
                                 yield return new WaitForSeconds(0.4f);
                                 yield return new WaitForSeconds(0.4f);
@@ -202,14 +202,14 @@ public class ChaosDigrade_ST10_14 : CEntity_Effect
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the top of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the top of security\n");
                                 }
                                 }
 
 
                                 else
                                 else
                                 {
                                 {
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
                                     GManager.instance.commandText.OpenCommandText("\"Place to the bottom of security\" was selected.");
 
 
-                                    GManager.instance.playLog.AddLogString($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
+                                    PlayLog.OnAddLog?.Invoke($"\n{card.BaseENGCardNameFromEntity}({card.CardID}):Place the Digimon to the bottom of security\n");
                                 }
                                 }
 
 
                                 yield return new WaitForSeconds(0.4f);
                                 yield return new WaitForSeconds(0.4f);

+ 0 - 23
Assets/CardEffect/ST12/White/SistermonNowaru_ST12_13.cs

@@ -13,29 +13,6 @@ public class SistermonNowaru_ST12_13 : CEntity_Effect
     {
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
 
-        if (timing == EffectTiming.None)
-        {
-            ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-            changeTraitsClass.SetUpICardEffect("Also treated as [Virus]", CanUseCondition, card);
-            changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-            cardEffects.Add(changeTraitsClass);
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return true;
-            }
-
-            List<string> changeTraits(CardSource cardSource, List<string> Traits)
-            {
-                if (cardSource == card)
-                {
-                    Traits.Add("Virus");
-                }
-
-                return Traits;
-            }
-        }
-
         if (timing == EffectTiming.OnEnterFieldAnyone)
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();

+ 1 - 1
Assets/CardEffect/ST14/Purple/Belstermon_ST14_09.cs

@@ -199,7 +199,7 @@ public class Belstermon_ST14_09 : CEntity_Effect
             }
             }
         }
         }
 
 
-        if (timing == EffectTiming.OnCounterTiming)
+        if (timing == EffectTiming.OnAllyAttack)
         {
         {
             ActivateClass activateClass = new ActivateClass();
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 1 card from deck top", CanUseCondition, card);
             activateClass.SetUpICardEffect("Trash 1 card from deck top", CanUseCondition, card);

+ 58 - 54
Assets/CardEffect/ST15/Black/TridentArm_ST15_16.cs

@@ -68,6 +68,8 @@ public class TridentArm_ST15_16 : CEntity_Effect
 
 
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                 {
+                    Permanent selectedPermanent = null;
+
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -90,88 +92,90 @@ public class TridentArm_ST15_16 : CEntity_Effect
 
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
 
 
-                        if (selectedPermanent != null)
-                        {
-                            ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                            activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                            selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                        yield return null;
+                    }
 
 
-                            if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
+                    if (selectedPermanent != null)
+                    {
+                        ActivateClass activateClass1 = new ActivateClass();
+                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                        selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
 
-                            string EffectDiscription1()
-                            {
-                                return "[Start of Your Main Phase] Attack with this Digimon.";
-                            }
+                        if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                        }
+
+                        string EffectDiscription1()
+                        {
+                            return "[Start of Your Main Phase] Attack with this Digimon.";
+                        }
 
 
-                            bool CanUseCondition1(Hashtable hashtable1)
+                        bool CanUseCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
                                 {
                                 {
-                                    if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
                                     {
                                     {
-                                        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            bool CanActivateCondition1(Hashtable hashtable1)
+                            return false;
+                        }
+
+                        bool CanActivateCondition1(Hashtable hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                 {
                                 {
-                                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                    if (selectedPermanent.CanAttack(activateClass1))
                                     {
                                     {
-                                        if (permanent.CanAttack(activateClass1))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                     }
                                 }
                                 }
-
-                                return false;
                             }
                             }
 
 
-                            IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                            return false;
+                        }
+
+                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                        {
+                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                             {
                             {
-                                if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                if (selectedPermanent.CanAttack(activateClass1))
                                 {
                                 {
-                                    if (permanent.CanAttack(activateClass1))
-                                    {
-                                        SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
-                                        selectAttackEffect.SetUp(
-                                            attacker: selectedPermanent,
-                                            canAttackPlayerCondition: () => true,
-                                            defenderCondition: (permanent) => true,
-                                            cardEffect: activateClass1);
+                                    selectAttackEffect.SetUp(
+                                        attacker: selectedPermanent,
+                                        canAttackPlayerCondition: () => true,
+                                        defenderCondition: (permanent) => true,
+                                        cardEffect: activateClass1);
 
 
-                                        selectAttackEffect.SetCanNotSelectNotAttack();
+                                    selectAttackEffect.SetCanNotSelectNotAttack();
 
 
-                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                    }
+                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                                 }
                             }
                             }
+                        }
 
 
-                            ICardEffect GetCardEffect(EffectTiming _timing)
+                        ICardEffect GetCardEffect(EffectTiming _timing)
+                        {
+                            if (_timing == EffectTiming.OnStartMainPhase)
                             {
                             {
-                                if (_timing == EffectTiming.OnStartMainPhase)
-                                {
-                                    return activateClass1;
-                                }
-
-                                return null;
+                                return activateClass1;
                             }
                             }
+
+                            return null;
                         }
                         }
                     }
                     }
                 }
                 }

BIN=BIN
Assets/Image/UI/色ボタン/アイコン_bar_白1_mask.png


+ 171 - 0
Assets/Image/UI/色ボタン/アイコン_bar_白1_mask.png.meta

@@ -0,0 +1,171 @@
+fileFormatVersion: 2
+guid: bc980f55cda294d49872b83d16730f8b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
Assets/Image/UI/色ボタン/アイコン_bar_白1_trimmed.png


+ 171 - 0
Assets/Image/UI/色ボタン/アイコン_bar_白1_trimmed.png.meta

@@ -0,0 +1,171 @@
+fileFormatVersion: 2
+guid: 7946dbf02469e4c4bbb5b5e81ed5f2cd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 788 - 65
Assets/Prefab/DetailCard_DeckEditor.prefab

@@ -76,6 +76,255 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &989572435824889392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4631834396852961135}
+  - component: {fileID: 4208469151980980439}
+  - component: {fileID: 619750364333911447}
+  m_Layer: 5
+  m_Name: Image (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4631834396852961135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 989572435824889392}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4208469151980980439
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 989572435824889392}
+  m_CullTransparentMesh: 1
+--- !u!114 &619750364333911447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 989572435824889392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3656632928331137182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 851814264148311753}
+  - component: {fileID: 2310917126712547854}
+  - component: {fileID: 1359724090423483583}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &851814264148311753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3656632928331137182}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2310917126712547854
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3656632928331137182}
+  m_CullTransparentMesh: 1
+--- !u!114 &1359724090423483583
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3656632928331137182}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4331435830551705110
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1684906399731369983}
+  - component: {fileID: 6181292393061338695}
+  - component: {fileID: 7326299846102972177}
+  - component: {fileID: 8538051585073778739}
+  m_Layer: 5
+  m_Name: Shadow Highlihgt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1684906399731369983
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4331435830551705110}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 11.6900015}
+  m_SizeDelta: {x: 0, y: -23.379995}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6181292393061338695
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4331435830551705110}
+  m_CullTransparentMesh: 1
+--- !u!114 &7326299846102972177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4331435830551705110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.05660379, g: 0.046671428, b: 0.046671428, a: 0.2627451}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8538051585073778739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4331435830551705110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &4377852944227510782
 --- !u!1 &4377852944227510782
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1160,6 +1409,10 @@ GameObject:
   serializedVersion: 6
   serializedVersion: 6
   m_Component:
   m_Component:
   - component: {fileID: 5207758712631616380}
   - component: {fileID: 5207758712631616380}
+  - component: {fileID: 1190604868386657738}
+  - component: {fileID: 2298950135685863374}
+  - component: {fileID: 566471216172899005}
+  - component: {fileID: 7090058770598753473}
   m_Layer: 5
   m_Layer: 5
   m_Name: Background
   m_Name: Background
   m_TagString: Untagged
   m_TagString: Untagged
@@ -1181,67 +1434,37 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 5207758712693228076}
   - {fileID: 5207758712693228076}
   - {fileID: 5207758714064757176}
   - {fileID: 5207758714064757176}
+  - {fileID: 851814264148311753}
+  - {fileID: 6718167987162202421}
+  - {fileID: 4408654120233229805}
+  - {fileID: 6791877622244222337}
+  - {fileID: 2017852535904342794}
+  - {fileID: 4631834396852961135}
+  - {fileID: 8258594113096457743}
+  - {fileID: 1684906399731369983}
   m_Father: {fileID: 5207758712420456630}
   m_Father: {fileID: 5207758712420456630}
   m_RootOrder: 0
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: 0, y: -1.5}
+  m_SizeDelta: {x: 418, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &5207758712646831056
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5207758712646831063}
-  - component: {fileID: 5207758712646831061}
-  - component: {fileID: 5207758712646831062}
-  m_Layer: 5
-  m_Name: BackGround (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5207758712646831063
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5207758712646831056}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5207758713664378067}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -208.39491, y: 0}
-  m_SizeDelta: {x: 91.13, y: 44.45}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &5207758712646831061
+--- !u!222 &1190604868386657738
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5207758712646831056}
-  m_CullTransparentMesh: 0
---- !u!114 &5207758712646831062
+  m_GameObject: {fileID: 5207758712631616381}
+  m_CullTransparentMesh: 1
+--- !u!114 &2298950135685863374
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5207758712646831056}
+  m_GameObject: {fileID: 5207758712631616381}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -1249,13 +1472,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
   m_OnCullStateChanged:
   m_OnCullStateChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1aace823f6e1b1f488235620d628855e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d5c61c20145a93546a111b9f548b7e9c, type: 3}
   m_Type: 1
   m_Type: 1
   m_PreserveAspect: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillCenter: 1
@@ -1265,18 +1488,133 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &5207758712649225385
-GameObject:
+--- !u!114 &566471216172899005
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5207758712649225384}
-  - component: {fileID: 5207758712649225390}
-  - component: {fileID: 5207758712649225391}
-  m_Layer: 5
+  m_GameObject: {fileID: 5207758712631616381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &7090058770598753473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207758712631616381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &5207758712646831056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5207758712646831063}
+  - component: {fileID: 5207758712646831061}
+  - component: {fileID: 5207758712646831062}
+  m_Layer: 5
+  m_Name: BackGround (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5207758712646831063
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207758712646831056}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758713664378067}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -208.39491, y: 0}
+  m_SizeDelta: {x: 91.13, y: 44.45}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5207758712646831061
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207758712646831056}
+  m_CullTransparentMesh: 0
+--- !u!114 &5207758712646831062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207758712646831056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1aace823f6e1b1f488235620d628855e, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5207758712649225385
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5207758712649225384}
+  - component: {fileID: 5207758712649225390}
+  - component: {fileID: 5207758712649225391}
+  m_Layer: 5
   m_Name: CostText
   m_Name: CostText
   m_TagString: Untagged
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
@@ -1418,7 +1756,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5207758712693228076
 --- !u!224 &5207758712693228076
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1559,8 +1897,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_text: DigivolutionCost
   m_text: DigivolutionCost
   m_isRightToLeft: 0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
-  m_sharedMaterial: {fileID: 4219061309029989999, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontMaterials: []
@@ -2434,8 +2772,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   detailCardImage: {fileID: 5207758713485970778}
   detailCardImage: {fileID: 5207758713485970778}
   cardNameBackgrounds:
   cardNameBackgrounds:
-  - {fileID: 5207758712457667344}
-  - {fileID: 5207758713741912293}
+  - {fileID: 1359724090423483583}
+  - {fileID: 2537206693923272881}
+  - {fileID: 7549448440410718363}
+  - {fileID: 8554053223028248559}
+  - {fileID: 6930706334176683260}
+  - {fileID: 619750364333911447}
+  - {fileID: 187924913165376908}
   cardNameText: {fileID: 5207758713668945711}
   cardNameText: {fileID: 5207758713668945711}
   cardID_RarityText: {fileID: 5207758713233729512}
   cardID_RarityText: {fileID: 5207758713233729512}
   _playCostTitleText: {fileID: 5207758714002374503}
   _playCostTitleText: {fileID: 5207758714002374503}
@@ -5661,8 +6004,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_text: PlayCost
   m_text: PlayCost
   m_isRightToLeft: 0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
-  m_sharedMaterial: {fileID: 4219061309029989999, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontMaterials: []
@@ -6129,7 +6472,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5207758714064757176
 --- !u!224 &5207758714064757176
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -7253,8 +7596,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_text: 12
   m_text: 12
   m_isRightToLeft: 0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
-  m_sharedMaterial: {fileID: 4219061309029989999, guid: b33e658e07e29f54c9cb9efa5c97dddb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontMaterials: []
@@ -7320,3 +7663,383 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &5602055241039925999
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4408654120233229805}
+  - component: {fileID: 5254599772301393663}
+  - component: {fileID: 7549448440410718363}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4408654120233229805
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602055241039925999}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5254599772301393663
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602055241039925999}
+  m_CullTransparentMesh: 1
+--- !u!114 &7549448440410718363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602055241039925999}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6842590964026651848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6791877622244222337}
+  - component: {fileID: 1688402731156414983}
+  - component: {fileID: 8554053223028248559}
+  m_Layer: 5
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6791877622244222337
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6842590964026651848}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1688402731156414983
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6842590964026651848}
+  m_CullTransparentMesh: 1
+--- !u!114 &8554053223028248559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6842590964026651848}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7006585106889976209
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6718167987162202421}
+  - component: {fileID: 2461900126816250986}
+  - component: {fileID: 2537206693923272881}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6718167987162202421
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7006585106889976209}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2461900126816250986
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7006585106889976209}
+  m_CullTransparentMesh: 1
+--- !u!114 &2537206693923272881
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7006585106889976209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7656367253475728916
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8258594113096457743}
+  - component: {fileID: 7681219991102465435}
+  - component: {fileID: 187924913165376908}
+  m_Layer: 5
+  m_Name: Image (6)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8258594113096457743
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7656367253475728916}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7681219991102465435
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7656367253475728916}
+  m_CullTransparentMesh: 1
+--- !u!114 &187924913165376908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7656367253475728916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7660949732552023454
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2017852535904342794}
+  - component: {fileID: 6361543297024218262}
+  - component: {fileID: 6930706334176683260}
+  m_Layer: 5
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2017852535904342794
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7660949732552023454}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5207758712631616380}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6361543297024218262
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7660949732552023454}
+  m_CullTransparentMesh: 1
+--- !u!114 &6930706334176683260
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7660949732552023454}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 1, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 78811949c51db024182677b0c86c5f22, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

+ 689 - 54
Assets/Prefab/FieldPermanentCard.prefab

@@ -104,6 +104,82 @@ RectTransform:
   m_AnchoredPosition: {x: 130.7, y: 39.3}
   m_AnchoredPosition: {x: 130.7, y: 39.3}
   m_SizeDelta: {x: 100, y: 100}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &335194687243898354
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2601098082438204119}
+  - component: {fileID: 1150454343903763184}
+  - component: {fileID: 102595287486624854}
+  m_Layer: 7
+  m_Name: DPBackground2_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2601098082438204119
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 335194687243898354}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1150454343903763184
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 335194687243898354}
+  m_CullTransparentMesh: 1
+--- !u!114 &102595287486624854
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 335194687243898354}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &417119198663783479
 --- !u!1 &417119198663783479
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -9993,6 +10069,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 1127725245626114506}
   - {fileID: 1127725245626114506}
+  - {fileID: 3122588733457168322}
   - {fileID: 3581316969694957156}
   - {fileID: 3581316969694957156}
   - {fileID: 2104079957368907959}
   - {fileID: 2104079957368907959}
   - {fileID: 8380388874825695540}
   - {fileID: 8380388874825695540}
@@ -10210,6 +10287,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &805500746710663016
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8227304917277342630}
+  - component: {fileID: 818969405637854505}
+  - component: {fileID: 4634688446778934769}
+  m_Layer: 7
+  m_Name: DPBackground5_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8227304917277342630
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 805500746710663016}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &818969405637854505
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 805500746710663016}
+  m_CullTransparentMesh: 1
+--- !u!114 &4634688446778934769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 805500746710663016}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &902026445220060483
 --- !u!1 &902026445220060483
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -10475,6 +10628,103 @@ RectTransform:
   m_AnchoredPosition: {x: 50, y: -93.4}
   m_AnchoredPosition: {x: 50, y: -93.4}
   m_SizeDelta: {x: 100, y: 100}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1436046976569357851
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3122588733457168322}
+  - component: {fileID: 5810156171075204640}
+  - component: {fileID: 893899029642134983}
+  - component: {fileID: 3499052272948009863}
+  m_Layer: 7
+  m_Name: DPBackground0_mask (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3122588733457168322
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436046976569357851}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.1, y: 1.1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6962190789279555285}
+  - {fileID: 2433208336066921127}
+  - {fileID: 2601098082438204119}
+  - {fileID: 2992050264158220785}
+  - {fileID: 2241595944195851351}
+  - {fileID: 8227304917277342630}
+  - {fileID: 335683923496800165}
+  m_Father: {fileID: 8368728273749513853}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5810156171075204640
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436046976569357851}
+  m_CullTransparentMesh: 1
+--- !u!114 &893899029642134983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436046976569357851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3499052272948009863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436046976569357851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &1461093565983489883
 --- !u!1 &1461093565983489883
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -11260,7 +11510,7 @@ RectTransform:
   m_AnchoredPosition: {x: 50, y: -50}
   m_AnchoredPosition: {x: 50, y: -50}
   m_SizeDelta: {x: 100, y: 100}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &2284950003392383947
+--- !u!1 &2279894228710248378
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11268,92 +11518,75 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   serializedVersion: 6
   m_Component:
   m_Component:
-  - component: {fileID: 3307226291522102083}
-  - component: {fileID: 8475431327264374896}
-  - component: {fileID: 3147055387804591102}
-  - component: {fileID: 8259036082399738092}
+  - component: {fileID: 335683923496800165}
+  - component: {fileID: 8757743191107899548}
+  - component: {fileID: 7226139741621315524}
   m_Layer: 7
   m_Layer: 7
-  m_Name: DIrectStrikeObject
+  m_Name: DPBackground6_color
   m_TagString: Untagged
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
   m_IsActive: 1
---- !u!224 &3307226291522102083
+--- !u!224 &335683923496800165
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2284950003392383947}
+  m_GameObject: {fileID: 2279894228710248378}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.3000002}
-  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5725293444685909303}
-  m_Father: {fileID: 8387490347028970810}
-  m_RootOrder: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -26.9}
-  m_SizeDelta: {x: 56.6, y: 16.2}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8475431327264374896
+--- !u!222 &8757743191107899548
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2284950003392383947}
+  m_GameObject: {fileID: 2279894228710248378}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &3147055387804591102
+--- !u!114 &7226139741621315524
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2284950003392383947}
+  m_GameObject: {fileID: 2279894228710248378}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
   m_RaycastTarget: 0
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
   m_OnCullStateChanged:
   m_OnCullStateChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a999e144d54aca64b9a3ecaed5fb5583, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
   m_PreserveAspect: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillCenter: 1
-  m_FillMethod: 4
+  m_FillMethod: 0
   m_FillAmount: 1
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8259036082399738092
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2284950003392383947}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 1, y: 1}
-  m_UseGraphicAlpha: 1
---- !u!1 &2291726503006195706
+--- !u!1 &2284950003392383947
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11361,17 +11594,110 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   serializedVersion: 6
   m_Component:
   m_Component:
-  - component: {fileID: 2104079957368907959}
-  - component: {fileID: 3785851824984683225}
-  - component: {fileID: 3765830509864539978}
-  - component: {fileID: 7260444828395278689}
-  m_Layer: 7
-  m_Name: DPBackground1_mask
+  - component: {fileID: 3307226291522102083}
+  - component: {fileID: 8475431327264374896}
+  - component: {fileID: 3147055387804591102}
+  - component: {fileID: 8259036082399738092}
+  m_Layer: 7
+  m_Name: DIrectStrikeObject
   m_TagString: Untagged
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
   m_IsActive: 1
+--- !u!224 &3307226291522102083
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2284950003392383947}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.3000002}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5725293444685909303}
+  m_Father: {fileID: 8387490347028970810}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -26.9}
+  m_SizeDelta: {x: 56.6, y: 16.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8475431327264374896
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2284950003392383947}
+  m_CullTransparentMesh: 1
+--- !u!114 &3147055387804591102
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2284950003392383947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: a999e144d54aca64b9a3ecaed5fb5583, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8259036082399738092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2284950003392383947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: 1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &2291726503006195706
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2104079957368907959}
+  - component: {fileID: 3785851824984683225}
+  - component: {fileID: 3765830509864539978}
+  - component: {fileID: 7260444828395278689}
+  m_Layer: 7
+  m_Name: DPBackground1_mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!224 &2104079957368907959
 --- !u!224 &2104079957368907959
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -11386,7 +11712,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 2308555095024825945}
   - {fileID: 2308555095024825945}
   m_Father: {fileID: 8368728273749513853}
   m_Father: {fileID: 8368728273749513853}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11622,7 +11948,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3581316969694957156
 --- !u!224 &3581316969694957156
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -11637,7 +11963,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 3313274849648987325}
   - {fileID: 3313274849648987325}
   m_Father: {fileID: 8368728273749513853}
   m_Father: {fileID: 8368728273749513853}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12979,7 +13305,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
   m_Father: {fileID: 8368728273749513853}
   m_Father: {fileID: 8368728273749513853}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13335,6 +13661,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4132878777681210308}
   m_GameObject: {fileID: 4132878777681210308}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
+--- !u!1 &4291228954525646180
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2992050264158220785}
+  - component: {fileID: 1051117035718175220}
+  - component: {fileID: 9077665061856784944}
+  m_Layer: 7
+  m_Name: DPBackground3_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2992050264158220785
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4291228954525646180}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1051117035718175220
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4291228954525646180}
+  m_CullTransparentMesh: 1
+--- !u!114 &9077665061856784944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4291228954525646180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4354796004880302267
 --- !u!1 &4354796004880302267
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -15024,6 +15426,82 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
   m_ReverseArrangement: 0
+--- !u!1 &5899776189699202089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6962190789279555285}
+  - component: {fileID: 7280101806291874777}
+  - component: {fileID: 8746701133531596825}
+  m_Layer: 7
+  m_Name: DPBackground0_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6962190789279555285
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5899776189699202089}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7280101806291874777
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5899776189699202089}
+  m_CullTransparentMesh: 1
+--- !u!114 &8746701133531596825
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5899776189699202089}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6008102739256032295
 --- !u!1 &6008102739256032295
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -15100,6 +15578,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6236212220488000917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2241595944195851351}
+  - component: {fileID: 8217379266046550718}
+  - component: {fileID: 7744289857146744092}
+  m_Layer: 7
+  m_Name: DPBackground4_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2241595944195851351
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6236212220488000917}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8217379266046550718
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6236212220488000917}
+  m_CullTransparentMesh: 1
+--- !u!114 &7744289857146744092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6236212220488000917}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6578855436255533235
 --- !u!1 &6578855436255533235
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -15328,6 +15882,82 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: 1}
   m_EffectDistance: {x: 1, y: 1}
   m_UseGraphicAlpha: 1
   m_UseGraphicAlpha: 1
+--- !u!1 &6590388477720039717
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2433208336066921127}
+  - component: {fileID: 8237743160828701972}
+  - component: {fileID: 7363336214176004574}
+  m_Layer: 7
+  m_Name: DPBackground1_color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2433208336066921127
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6590388477720039717}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3122588733457168322}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 36.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8237743160828701972
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6590388477720039717}
+  m_CullTransparentMesh: 1
+--- !u!114 &7363336214176004574
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6590388477720039717}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.46666667, b: 0.46666667, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 585076a13a1a4254783fd4356aec6099, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6726097188704675595
 --- !u!1 &6726097188704675595
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -17313,8 +17943,13 @@ MonoBehaviour:
   SkillNameText: {fileID: 810265252813159967}
   SkillNameText: {fileID: 810265252813159967}
   DPText: {fileID: 8932632140442647921}
   DPText: {fileID: 8932632140442647921}
   DPBackground_color:
   DPBackground_color:
-  - {fileID: 8067754281523558177}
-  - {fileID: 7180992853761416550}
+  - {fileID: 7226139741621315524}
+  - {fileID: 4634688446778934769}
+  - {fileID: 7744289857146744092}
+  - {fileID: 9077665061856784944}
+  - {fileID: 102595287486624854}
+  - {fileID: 7363336214176004574}
+  - {fileID: 8746701133531596825}
   EvoRootCountText: {fileID: 4661699799995034945}
   EvoRootCountText: {fileID: 4661699799995034945}
   EvoRootCountBackground: {fileID: 1712106131061476983}
   EvoRootCountBackground: {fileID: 1712106131061476983}
   LevelText: {fileID: 5413509685045449317}
   LevelText: {fileID: 5413509685045449317}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 675 - 198
Assets/Prefab/HandCard.prefab


+ 8 - 0
Assets/Prefab/UI/Battle Scene.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08230ee1167fcb3468bb343927da996a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1031 - 0
Assets/Prefab/UI/Battle Scene/log.prefab

@@ -0,0 +1,1031 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3651413245145144155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413245145144154}
+  - component: {fileID: 3651413245145144151}
+  - component: {fileID: 3651413245145144152}
+  - component: {fileID: 3651413245145144153}
+  m_Layer: 5
+  m_Name: Btn_CloseWindow01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413245145144154
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245145144155}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3651413246452580820}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 210.2, y: 451.66}
+  m_SizeDelta: {x: 180, y: 73}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3651413245145144151
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245145144155}
+  m_CullTransparentMesh: 0
+--- !u!114 &3651413245145144152
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245145144155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 256795ec6a2c7ba428993482471f5583, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651413245145144153
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245145144155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 2
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 21300000, guid: d62c02d4c1f19c246bb6de3a8871a823, type: 3}
+    m_PressedSprite: {fileID: 21300000, guid: d62c02d4c1f19c246bb6de3a8871a823, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: d62c02d4c1f19c246bb6de3a8871a823, type: 3}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3651413245145144152}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 3651413246452580819}
+        m_TargetAssemblyTypeName: PlayLog, Assembly-CSharp
+        m_MethodName: OffPlayLog
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &3651413245387530365
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413245387530364}
+  - component: {fileID: 3651413245387530361}
+  - component: {fileID: 3651413245387530362}
+  - component: {fileID: 3651413245387530363}
+  m_Layer: 5
+  m_Name: Scrollbar Vertical
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413245387530364
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245387530365}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3651413246765181852}
+  m_Father: {fileID: 3651413246165164372}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -23.600006}
+  m_SizeDelta: {x: 29.5, y: -40.600006}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &3651413245387530361
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245387530365}
+  m_CullTransparentMesh: 1
+--- !u!114 &3651413245387530362
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245387530365}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651413245387530363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245387530365}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3651413246561237275}
+  m_HandleRect: {fileID: 3651413246561237276}
+  m_Direction: 2
+  m_Value: 1
+  m_Size: 1
+  m_NumberOfSteps: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3651413245858577327
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413245858577326}
+  - component: {fileID: 3651413245858577324}
+  - component: {fileID: 3651413245858577325}
+  - component: {fileID: 3651413245858577323}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413245858577326
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245858577327}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3651413246572374488}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 470, y: 41.65997}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3651413245858577324
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245858577327}
+  m_CullTransparentMesh: 1
+--- !u!114 &3651413245858577325
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245858577327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: New Text
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 9e80cd515f02c5842bb97ca076ea8f6d, type: 2}
+  m_sharedMaterial: {fileID: -6338033459490715229, guid: 9e80cd515f02c5842bb97ca076ea8f6d, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 4
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &3651413245858577323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413245858577327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a291cb31b29c93b49a58abb23160ca0f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &3651413246081183780
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246081183779}
+  - component: {fileID: 3651413246081183776}
+  - component: {fileID: 3651413246081183777}
+  - component: {fileID: 3651413246081183778}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246081183779
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246081183780}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3651413246572374488}
+  m_Father: {fileID: 3651413246165164372}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -17, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3651413246081183776
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246081183780}
+  m_CullTransparentMesh: 1
+--- !u!114 &3651413246081183777
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246081183780}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651413246081183778
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246081183780}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &3651413246165164373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246165164372}
+  - component: {fileID: 3651413246165164369}
+  - component: {fileID: 3651413246165164370}
+  - component: {fileID: 3651413246165164371}
+  m_Layer: 5
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246165164372
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246165164373}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3651413246081183779}
+  - {fileID: 3651413245387530364}
+  m_Father: {fileID: 3651413246452580820}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -51.5}
+  m_SizeDelta: {x: 542.9, y: 888.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3651413246165164369
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246165164373}
+  m_CullTransparentMesh: 1
+--- !u!114 &3651413246165164370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246165164373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651413246165164371
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246165164373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 3651413246572374488}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 2
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 100
+  m_Viewport: {fileID: 3651413246081183779}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 3651413245387530363}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3651413246452580821
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246452580820}
+  - component: {fileID: 3651413246452580819}
+  m_Layer: 5
+  m_Name: log
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246452580820
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246452580821}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1211094920684379950}
+  - {fileID: 3651413246165164372}
+  - {fileID: 3651413245145144154}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -659.9, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3651413246452580819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246452580821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 264b2446104ef4446aa8b133388424f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _logText: {fileID: 3651413245858577325}
+  _scroll: {fileID: 3651413246165164371}
+--- !u!1 &3651413246561237277
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246561237276}
+  - component: {fileID: 3651413246561237274}
+  - component: {fileID: 3651413246561237275}
+  m_Layer: 5
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246561237276
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246561237277}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3651413246765181852}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -0.1449585}
+  m_SizeDelta: {x: 40, y: 45.38994}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3651413246561237274
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246561237277}
+  m_CullTransparentMesh: 1
+--- !u!114 &3651413246561237275
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246561237277}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1934c1e975fab8c49854d96c9c4fae13, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3651413246572374489
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246572374488}
+  - component: {fileID: 3651413246572374487}
+  - component: {fileID: 3651413246572374486}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246572374488
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246572374489}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3651413245858577326}
+  m_Father: {fileID: 3651413246081183779}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.00018310547}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &3651413246572374487
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246572374489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &3651413246572374486
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246572374489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 85
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 1
+  m_ReverseArrangement: 0
+--- !u!1 &3651413246765181853
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3651413246765181852}
+  m_Layer: 5
+  m_Name: Sliding Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3651413246765181852
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651413246765181853}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3651413246561237276}
+  m_Father: {fileID: 3651413245387530364}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &3651413245372327407
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3651413246452580820}
+    m_Modifications:
+    - target: {fileID: 1819523156681498676, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -123.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1819523156681498676, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 465.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 617.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1060.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4759155783918563818, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Name
+      value: TitleText
+      objectReference: {fileID: 0}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Text
+      value: "\u30D7\u30EC\u30A4\u30ED\u30B0"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: 5e887a426c49a6748a021b8426a3cd53, type: 3}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: f632e5c8120bdd1469cb7eb91413004a, type: 3}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_FontData.m_MaxSize
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 54
+      objectReference: {fileID: 0}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_FontData.m_VerticalOverflow
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7572328055368140201, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_FontData.m_HorizontalOverflow
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7681690508754063368, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_Name
+      value: Popup006_Cyan_Opaque
+      objectReference: {fileID: 0}
+    - target: {fileID: 7681690508754063368, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9169881529843255714, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+--- !u!224 &1211094920684379950 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2477755404981828289, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+  m_PrefabInstance: {fileID: 3651413245372327407}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8117606353681568773 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4759155783918563818, guid: 5d8fad065a43ac14e9124c9fdb5f5132, type: 3}
+  m_PrefabInstance: {fileID: 3651413245372327407}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3651413245372327404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8117606353681568773}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7958ec3f63b47324fa381152fb9ef2b2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _fontMaterial_ENG: {fileID: 0}
+  _fontMaterial_JPN: {fileID: 0}
+  _font_ENG: {fileID: 12800000, guid: 385dce3fc9f7d434cb640e4d4d497263, type: 3}
+  _font_JPN: {fileID: 12800000, guid: f632e5c8120bdd1469cb7eb91413004a, type: 3}
+  _fontSize_ENG: 60
+  _fontSize_JPN: 54
+  _text_ENG: Play Log
+  _text_JPN: "\u30D7\u30EC\u30A4\u30ED\u30B0"

+ 7 - 0
Assets/Prefab/UI/Battle Scene/log.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b028bda2f9bcba64989e7087b45465c6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 57 - 758
Assets/Scenes/BattleScene.unity


+ 4 - 4
Assets/Scripts/AttackProcess.cs

@@ -91,7 +91,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 log += $"\n�«\nSecurity\n";
                 log += $"\n�«\nSecurity\n";
             }
             }
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
 
 
             List<SkillInfo> stackedSkillInfos = new List<SkillInfo>();
             List<SkillInfo> stackedSkillInfos = new List<SkillInfo>();
 
 
@@ -384,7 +384,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 IBattle battle = new IBattle(AttackingPermanent: AttackingPermanent, DefendingPermanent: DefendingPermanent, null);
                 IBattle battle = new IBattle(AttackingPermanent: AttackingPermanent, DefendingPermanent: DefendingPermanent, null);
                 yield return ContinuousController.instance.StartCoroutine(battle.Battle());
                 yield return ContinuousController.instance.StartCoroutine(battle.Battle());
 
 
-                #region effect when determine whether to do security check
+                /*#region effect when determine whether to do security check
                 Hashtable hashtable = new Hashtable()
                 Hashtable hashtable = new Hashtable()
                 {
                 {
                     {"battle", battle}
                     {"battle", battle}
@@ -397,7 +397,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 {
                 {
                     GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
                     GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
                 }
                 }
-                #endregion
+                #endregion*/
                 
                 
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.TriggeredSkillProcess(true, null));
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.TriggeredSkillProcess(true, null));
                 GManager.instance.turnStateMachine.IsSelecting = true;
                 GManager.instance.turnStateMachine.IsSelecting = true;
@@ -498,7 +498,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 // add log
                 // add log
                 string log1 = $"\nBlock:\n{DefendingPermanent.TopCard.BaseENGCardNameFromEntity}({DefendingPermanent.TopCard.CardID})\n";
                 string log1 = $"\nBlock:\n{DefendingPermanent.TopCard.BaseENGCardNameFromEntity}({DefendingPermanent.TopCard.CardID})\n";
 
 
-                GManager.instance.playLog.AddLogString(log1);
+                PlayLog.OnAddLog?.Invoke(log1);
 
 
                 // suspend
                 // suspend
                 yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { DefendingPermanent }, hashtable).Tap());
                 yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { DefendingPermanent }, hashtable).Tap());

+ 6 - 1
Assets/Scripts/AutoProcessing.cs

@@ -802,7 +802,12 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
 
 
     public bool IsCutInEffectHasUsed(ICardEffect cutinEffect)
     public bool IsCutInEffectHasUsed(ICardEffect cutinEffect)
     {
     {
-        return _usedCutinEffects.Some(cardEffect => cardEffect.IsSameEffect(cutinEffect));
+        return false;//TODO: General line 17 - _usedCutinEffects.Some(cardEffect => cardEffect.IsSameEffect(cutinEffect));
+    }
+
+    public bool IsCutInEffectUsedMaxCount(ICardEffect cutinEffect)
+    {
+        return _usedCutinEffects.Count(cardEffect => cardEffect.IsSameEffect(cutinEffect)) < cutinEffect.ChainActivations;
     }
     }
 
 
     public void AddCutinEffect(ICardEffect cardEffect)
     public void AddCutinEffect(ICardEffect cardEffect)

+ 38 - 25
Assets/Scripts/CardController.cs

@@ -68,7 +68,7 @@ public class IDiscardHands
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
         #endregion
         #endregion
     }
     }
@@ -743,7 +743,7 @@ public class PlayCardClass
 
 
             if (endPlayCard)
             if (endPlayCard)
             {
             {
-                GManager.instance.playLog.AddLogString($"\nFailed to play:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
+                PlayLog.OnAddLog?.Invoke($"\nFailed to play:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
 
 
                 GManager.instance.GetComponent<SelectDigiXrosClass>().ResetSelectDigiXrosClass();
                 GManager.instance.GetComponent<SelectDigiXrosClass>().ResetSelectDigiXrosClass();
 
 
@@ -1122,7 +1122,7 @@ public class PlayPermanentClass
                         {
                         {
                             oldLevels.Add(_targetPermanent.Level);
                             oldLevels.Add(_targetPermanent.Level);
 
 
-                            GManager.instance.playLog.AddLogString($"\nEvolution:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
+                            PlayLog.OnAddLog?.Invoke($"\nEvolution:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
 
 
                             permanent = _targetPermanent;
                             permanent = _targetPermanent;
                             evoRoots.Add(_targetPermanent.TopCard);
                             evoRoots.Add(_targetPermanent.TopCard);
@@ -1132,7 +1132,7 @@ public class PlayPermanentClass
 
 
                         else
                         else
                         {
                         {
-                            GManager.instance.playLog.AddLogString($"\nPlay on field:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
+                            PlayLog.OnAddLog?.Invoke($"\nPlay on field:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
 
 
                             permanent = new Permanent(new List<CardSource>() { card }) { IsSuspended = _isTapped };
                             permanent = new Permanent(new List<CardSource>() { card }) { IsSuspended = _isTapped };
 
 
@@ -1235,7 +1235,7 @@ public class PlayPermanentClass
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveField(evoRootPermanent, ignoreOverflow: true));
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveField(evoRootPermanent, ignoreOverflow: true));
                     }
                     }
 
 
-                    GManager.instance.playLog.AddLogString($"\nJogress:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
+                    PlayLog.OnAddLog?.Invoke($"\nJogress:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
 
 
                     permanent = new Permanent(new List<CardSource>() { card }) { IsSuspended = false };
                     permanent = new Permanent(new List<CardSource>() { card }) { IsSuspended = false };
 
 
@@ -1460,7 +1460,7 @@ public class UseOptionClass
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect(card));
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect(card));
             }
             }
 
 
-            GManager.instance.playLog.AddLogString($"\nPlay Option:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
+            PlayLog.OnAddLog?.Invoke($"\nPlay Option:\n{card.BaseENGCardNameFromEntity}({card.CardID})\n");
 
 
             card.Init();
             card.Init();
 
 
@@ -1571,7 +1571,7 @@ public class DrawClass
         #region add log
         #region add log
         if (DrawCards.Count >= 1)
         if (DrawCards.Count >= 1)
         {
         {
-            GManager.instance.playLog.AddLogString($"\nDraw {DrawCards.Count} card{Utils.PluralFormSuffix(DrawCards.Count)}\n{_player.PlayerName}\n");
+            PlayLog.OnAddLog?.Invoke($"\nDraw {DrawCards.Count} card{Utils.PluralFormSuffix(DrawCards.Count)}\n{_player.PlayerName}\n");
         }
         }
         #endregion
         #endregion
 
 
@@ -1655,7 +1655,7 @@ public class IAddTrashCardsFromLibraryTop
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
     }
     }
 }
 }
@@ -1697,7 +1697,7 @@ public class IAddSecurityFromLibrary
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
 
 
             if (GManager.instance.turnStateMachine.DoneStartGame)
             if (GManager.instance.turnStateMachine.DoneStartGame)
             {
             {
@@ -1871,7 +1871,7 @@ public class IDigiBurst
 
 
                     log += "\n";
                     log += "\n";
 
 
-                    GManager.instance.playLog.AddLogString(log);
+                    PlayLog.OnAddLog?.Invoke(log);
                 }
                 }
                 #endregion
                 #endregion
             }
             }
@@ -1951,7 +1951,7 @@ public class DeckBottomBounceClass
             }
             }
 
 
             // cut in effect process
             // cut in effect process
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
 
 
             foreach (Permanent permanent in _deckBounceTargetPermanents)
             foreach (Permanent permanent in _deckBounceTargetPermanents)
             {
             {
@@ -2088,7 +2088,7 @@ public class HandBounceClaass
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
 
 
             // cut in effect process
             // cut in effect process
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
 
 
             foreach (Permanent permanent in _bounceTargetPermanents)
             foreach (Permanent permanent in _bounceTargetPermanents)
             {
             {
@@ -2153,7 +2153,7 @@ public class HandBounceClaass
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
         #endregion
         #endregion
 
 
@@ -2403,7 +2403,7 @@ public class IPlacePermanentToDigivolutionCards
             }
             }
 
 
             // cut in effect process
             // cut in effect process
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
 
 
             foreach (Permanent Permanent in removeFieldPermanents)
             foreach (Permanent Permanent in removeFieldPermanents)
             {
             {
@@ -2487,7 +2487,7 @@ public class IPlacePermanentToDigivolutionCards
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
         #endregion
         #endregion
 
 
@@ -2546,7 +2546,7 @@ public class IPutSecurityPermanent
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
 
 
             // cut in effect process
             // cut in effect process
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false,null));
 
 
             _permanent.HideWillRemoveFieldEffect();
             _permanent.HideWillRemoveFieldEffect();
         }
         }
@@ -2570,7 +2570,7 @@ public class IPutSecurityPermanent
 
 
         log += "\n";
         log += "\n";
 
 
-        GManager.instance.playLog.AddLogString(log);
+        PlayLog.OnAddLog?.Invoke(log);
         #endregion
         #endregion
 
 
         #region show cards
         #region show cards
@@ -2687,7 +2687,7 @@ public class DestroyPermanentsClass
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
 
 
             // cut in effect process
             // cut in effect process
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
 
 
             foreach (Permanent permanent in _destroytargetPermanents)
             foreach (Permanent permanent in _destroytargetPermanents)
             {
             {
@@ -2753,7 +2753,7 @@ public class DestroyPermanentsClass
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
         #endregion
         #endregion
 
 
@@ -2842,6 +2842,9 @@ public class ISecurityCheck
                 return true;
                 return true;
             }
             }
 
 
+            if (!AttackingPermanent.IsDigimon)
+                return true;
+
             return false;
             return false;
         }
         }
 
 
@@ -2892,7 +2895,7 @@ public class ISecurityCheck
 
 
                         checkedCount++;
                         checkedCount++;
 
 
-                        GManager.instance.playLog.AddLogString($"\nSecurity Check:\n{brokenSecurityCard.BaseENGCardNameFromEntity}({brokenSecurityCard.CardID})\n");
+                        PlayLog.OnAddLog?.Invoke($"\nSecurity Check:\n{brokenSecurityCard.BaseENGCardNameFromEntity}({brokenSecurityCard.CardID})\n");
 
 
                         if (brokenSecurityCard.IsDigimon)
                         if (brokenSecurityCard.IsDigimon)
                         {
                         {
@@ -3277,7 +3280,7 @@ public class IDestroySecurity
 
 
                 log += "\n";
                 log += "\n";
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
             }
             }
             #endregion
             #endregion
         }
         }
@@ -3388,7 +3391,7 @@ public class IBattle
                     log += $"\n??\n{DefendingCard.BaseENGCardNameFromEntity}({DefendingCard.CardID})\n";
                     log += $"\n??\n{DefendingCard.BaseENGCardNameFromEntity}({DefendingCard.CardID})\n";
                 }
                 }
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
 
 
                 #region "At the start of battle" effect
                 #region "At the start of battle" effect
 
 
@@ -3560,6 +3563,16 @@ public class IBattle
 
 
                 yield return ContinuousController.instance.StartCoroutine(new DestroyPermanentsClass(LoserPermanents, hashtable).Destroy());
                 yield return ContinuousController.instance.StartCoroutine(new DestroyPermanentsClass(LoserPermanents, hashtable).Destroy());
 
 
+                #region effect when determine whether to do security check
+                List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(hashtable, EffectTiming.OnDetermineDoSecurityCheck)
+                    .Filter(skillInfo => skillInfo.CardEffect != null && skillInfo.CardEffect.CanActivate(skillInfo.Hashtable));
+
+                if (skillInfos_Pierce.Count >= 1)
+                {
+                    GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
+                }
+                #endregion
+
                 //Fix winner/loser permanents
                 //Fix winner/loser permanents
                 int index = -1;
                 int index = -1;
                 foreach (Permanent permanent in LoserPermanents)
                 foreach (Permanent permanent in LoserPermanents)
@@ -3748,7 +3761,7 @@ public class IDegeneration
 
 
                 log += "\n";
                 log += "\n";
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
             }
             }
             #endregion
             #endregion
         }
         }
@@ -4242,7 +4255,7 @@ public class AceOverflowClass
     public IEnumerator Overflow()
     public IEnumerator Overflow()
     {
     {
         _cardSources = _cardSources
         _cardSources = _cardSources
-        .Filter(cardSource => cardSource.IsACE && CardEffectCommons.IsExistOnBattleArea(cardSource))
+        .Filter(cardSource => cardSource.IsACE && CardEffectCommons.IsExistOnBattleArea(cardSource) || CardEffectCommons.IsExistOnBreedingAreaDigimon(cardSource))
         .OrderBy(cardSource => cardSource.Owner == GManager.instance.turnStateMachine.gameContext.TurnPlayer ? -1 : 1)
         .OrderBy(cardSource => cardSource.Owner == GManager.instance.turnStateMachine.gameContext.TurnPlayer ? -1 : 1)
         .ToList();
         .ToList();
 
 
@@ -4252,7 +4265,7 @@ public class AceOverflowClass
 
 
             string log = $"\nOverflow -{cardSource.OverflowMemory}:\n{cardSource.BaseENGCardNameFromEntity}({cardSource.CardID})\n";
             string log = $"\nOverflow -{cardSource.OverflowMemory}:\n{cardSource.BaseENGCardNameFromEntity}({cardSource.CardID})\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
     }
     }
 }
 }

+ 1 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/ArmorPurge.cs

@@ -73,7 +73,7 @@ public partial class CardEffectCommons
 
 
                         log += "\n";
                         log += "\n";
 
 
-                        GManager.instance.playLog.AddLogString(log);
+                        PlayLog.OnAddLog?.Invoke(log);
                         #endregion
                         #endregion
                     }
                     }
                 }
                 }

+ 1 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/Barrier.cs

@@ -53,7 +53,7 @@ public partial class CardEffectCommons
 
 
                     log += "\n";
                     log += "\n";
 
 
-                    GManager.instance.playLog.AddLogString(log);
+                    PlayLog.OnAddLog?.Invoke(log);
                     #endregion
                     #endregion
                 }
                 }
             }
             }

+ 22 - 6
Assets/Scripts/CardEffectCommons/KeyWordEffects/Overclock.cs

@@ -15,8 +15,7 @@ public partial class CardEffectCommons
     public static bool CanActivateOverclock(string trait, CardSource cardSource, ICardEffect activateClass)
     public static bool CanActivateOverclock(string trait, CardSource cardSource, ICardEffect activateClass)
     {
     {
         return IsExistOnBattleArea(cardSource) &&
         return IsExistOnBattleArea(cardSource) &&
-               HasMatchConditionPermanent(permanent => CanSelectPermanentCondition(permanent, trait, cardSource)) &&
-               cardSource.PermanentOfThisCard().CanAttack(activateClass, withoutTap: true);
+               HasMatchConditionPermanent(permanent => CanSelectPermanentCondition(permanent, trait, cardSource));
     }
     }
 
 
     #endregion
     #endregion
@@ -25,6 +24,9 @@ public partial class CardEffectCommons
 
 
     public static IEnumerator OverclockProcess(string trait, CardSource cardSource, ICardEffect activateClass)
     public static IEnumerator OverclockProcess(string trait, CardSource cardSource, ICardEffect activateClass)
     {
     {
+        Permanent selectedPermanent = null;
+        bool isDeleted = false;
+
         if (HasMatchConditionPermanent(permanent => CanSelectPermanentCondition(permanent, trait, cardSource)))
         if (HasMatchConditionPermanent(permanent => CanSelectPermanentCondition(permanent, trait, cardSource)))
         {
         {
             SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
             SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -48,24 +50,38 @@ public partial class CardEffectCommons
             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
 
             IEnumerator SelectPermanentCoroutine(Permanent permanent)
             IEnumerator SelectPermanentCoroutine(Permanent permanent)
+            {
+                selectedPermanent = permanent;
+
+                yield return null;
+            }
+
+            if(selectedPermanent != null)
             {
             {
                 yield return ContinuousController.instance.StartCoroutine(
                 yield return ContinuousController.instance.StartCoroutine(
                     DeletePeremanentAndProcessAccordingToResult(
                     DeletePeremanentAndProcessAccordingToResult(
-                        targetPermanents: new List<Permanent>() { permanent },
+                        targetPermanents: new List<Permanent>() { selectedPermanent },
                         activateClass: activateClass,
                         activateClass: activateClass,
                         successProcess: _ => SuccessProcess(),
                         successProcess: _ => SuccessProcess(),
                         failureProcess: null));
                         failureProcess: null));
 
 
                 IEnumerator SuccessProcess()
                 IEnumerator SuccessProcess()
                 {
                 {
-                    Permanent selectedPermanent = cardSource.PermanentOfThisCard();
+                    isDeleted = true;
+                    yield return null;
+                    
+                }
+
+                if (isDeleted)
+                {
+                    Permanent attacker = cardSource.PermanentOfThisCard();
 
 
-                    if (selectedPermanent.CanAttack(activateClass, withoutTap: true))
+                    if (attacker.CanAttack(activateClass, withoutTap: true))
                     {
                     {
                         SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
                         SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 
 
                         selectAttackEffect.SetUp(
                         selectAttackEffect.SetUp(
-                            attacker: selectedPermanent,
+                            attacker: attacker,
                             canAttackPlayerCondition: () => true,
                             canAttackPlayerCondition: () => true,
                             defenderCondition: _ => false,
                             defenderCondition: _ => false,
                             cardEffect: activateClass);
                             cardEffect: activateClass);

+ 1 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/Partition.cs

@@ -153,7 +153,7 @@ public partial class CardEffectCommons
 
 
                 log += "\n";
                 log += "\n";
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
                 #endregion
                 #endregion
             }
             }
         }
         }

+ 5 - 5
Assets/Scripts/CardEffectCommons/RevealLibrary.cs

@@ -55,7 +55,7 @@ public partial class CardEffectCommons
 
 
                         log += "\n";
                         log += "\n";
 
 
-                        GManager.instance.playLog.AddLogString(log);
+                        PlayLog.OnAddLog?.Invoke(log);
                     }
                     }
                 }
                 }
                 break;
                 break;
@@ -78,7 +78,7 @@ public partial class CardEffectCommons
 
 
                         log += "\n";
                         log += "\n";
 
 
-                        GManager.instance.playLog.AddLogString(log);
+                        PlayLog.OnAddLog?.Invoke(log);
                     }
                     }
                 }
                 }
                 break;
                 break;
@@ -126,7 +126,7 @@ public partial class CardEffectCommons
 
 
                         log += "\n";
                         log += "\n";
 
 
-                        GManager.instance.playLog.AddLogString(log);
+                        PlayLog.OnAddLog?.Invoke(log);
                     }
                     }
                 }
                 }
                 break;
                 break;
@@ -148,7 +148,7 @@ public partial class CardEffectCommons
 
 
                         log += "\n";
                         log += "\n";
 
 
-                        GManager.instance.playLog.AddLogString(log);
+                        PlayLog.OnAddLog?.Invoke(log);
                     }
                     }
                 }
                 }
                 break;
                 break;
@@ -758,7 +758,7 @@ public class RevealLibraryClass
 
 
             log += "\n";
             log += "\n";
 
 
-            GManager.instance.playLog.AddLogString(log);
+            PlayLog.OnAddLog?.Invoke(log);
         }
         }
         #endregion
         #endregion
 
 

+ 15 - 4
Assets/Scripts/CardEffectFactory/KeyWordEffects/BlastDNADigivolution.cs

@@ -64,11 +64,11 @@ public partial class CardEffectFactory
         }
         }
 
 
         bool HasValidDNATargets()
         bool HasValidDNATargets()
-        {
-            if (blastDNAConditions[0].Permanents.Count > 0 && blastDNAConditions[1].CardSources.Count > 0)
+        {//TODO: General - Line 20
+            if (blastDNAConditions[0].Permanents.Count(permanent => !permanent.TopCard.CanNotEvolve(permanent)) > 0 && blastDNAConditions[1].CardSources.Count > 0)
                 return true;
                 return true;
 
 
-            if (blastDNAConditions[0].CardSources.Count > 0 && blastDNAConditions[1].Permanents.Count > 0)
+            if (blastDNAConditions[0].CardSources.Count > 0 && blastDNAConditions[1].Permanents.Count(permanent => !permanent.TopCard.CanNotEvolve(permanent)) > 0)
                 return true;
                 return true;
 
 
             return false;
             return false;
@@ -214,7 +214,18 @@ public partial class CardEffectFactory
                     yield return ContinuousController.instance.StartCoroutine(CardObjectController.CreateNewPermanent(playedPermanent, frameID));
                     yield return ContinuousController.instance.StartCoroutine(CardObjectController.CreateNewPermanent(playedPermanent, frameID));
                 }
                 }
                 
                 
-                int[] JogressEvoRootsFrameIDs = { selectedPermanent.PermanentFrame.FrameID, selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID };
+                int[] JogressEvoRootsFrameIDs = { 0, 0 };
+
+                if (selectedPermanent.TopCard.EqualsCardName(blastDNAConditions[0].Name))
+                {
+                    JogressEvoRootsFrameIDs[0] = selectedPermanent.PermanentFrame.FrameID;
+                    JogressEvoRootsFrameIDs[1] = selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID;
+                }
+                else
+                {
+                    JogressEvoRootsFrameIDs[0] = selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID;
+                    JogressEvoRootsFrameIDs[1] = selectedPermanent.PermanentFrame.FrameID;
+                }                
 
 
                 if (card.CanPlayJogress(true))
                 if (card.CanPlayJogress(true))
                 {
                 {

+ 2 - 2
Assets/Scripts/CardObjectController.cs

@@ -835,7 +835,7 @@ public class CardObjectController : MonoBehaviour
 
 
                 log += "\n";
                 log += "\n";
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
             }
             }
         }
         }
         #endregion
         #endregion
@@ -929,7 +929,7 @@ public class CardObjectController : MonoBehaviour
 
 
                 log += "\n";
                 log += "\n";
 
 
-                GManager.instance.playLog.AddLogString(log);
+                PlayLog.OnAddLog?.Invoke(log);
             }
             }
         }
         }
         #endregion
         #endregion

+ 3 - 0
Assets/Scripts/ContinuousController.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.IO;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Events;
@@ -469,6 +470,8 @@ public class ContinuousController : MonoBehaviour
 
 
             CreateDeckFromFile(fileName.Split("_")[1], deckName, KeyCard, deck, SortValue);
             CreateDeckFromFile(fileName.Split("_")[1], deckName, KeyCard, deck, SortValue);
         }
         }
+
+        DeckDatas = DeckDatas.OrderBy(x => x.DeckName).ToList();
     }
     }
 
 
     private void CreateDeckFromFile(string id, string name, int keyID, string deckCode, int index = 0)
     private void CreateDeckFromFile(string id, string name, int keyID, string deckCode, int index = 0)

+ 4 - 4
Assets/Scripts/DetailCard_DeckEditor.cs

@@ -83,14 +83,14 @@ public class DetailCard_DeckEditor : MonoBehaviour
             if (i < cEntity_Base.cardColors.Count)
             if (i < cEntity_Base.cardColors.Count)
             {
             {
                 cardColor = cEntity_Base.cardColors[i];
                 cardColor = cEntity_Base.cardColors[i];
+                cardNameBackgrounds[i].color = DataBase.CardColor_ColorDarkDictionary[cardColor];
+                cardNameBackgrounds[i].gameObject.SetActive(true);
             }
             }
 
 
             else
             else
             {
             {
-                cardColor = cEntity_Base.cardColors[0];
-            }
-
-            cardNameBackgrounds[i].sprite = DataBase.instance.ColorIcons_bar[(int)cardColor];
+                cardNameBackgrounds[i].gameObject.SetActive(false);
+            }            
         }
         }
 
 
         //カード名
         //カード名

+ 8 - 4
Assets/Scripts/FieldPermanentCard.cs

@@ -450,15 +450,19 @@ public class FieldPermanentCard : MonoBehaviour
                     if (i < ThisPermanent.TopCard.CardColors.Count)
                     if (i < ThisPermanent.TopCard.CardColors.Count)
                     {
                     {
                         cardColor = ThisPermanent.TopCard.CardColors[i];
                         cardColor = ThisPermanent.TopCard.CardColors[i];
+                        float fillAmount = (float)((i + 1) / (float)ThisPermanent.TopCard.CardColors.Count);
+
+                        if (DPBackground_color[i].color != DataBase.CardColor_ColorLightDictionary[cardColor])
+                            DPBackground_color[i].color = DataBase.CardColor_ColorLightDictionary[cardColor];
+
+                        DPBackground_color[i].fillAmount = fillAmount;
+                        DPBackground_color[i].gameObject.SetActive(true);
                     }
                     }
 
 
                     else
                     else
                     {
                     {
-                        cardColor = ThisPermanent.TopCard.CardColors[0];
+                        DPBackground_color[i].gameObject.SetActive(false);
                     }
                     }
-
-                    if (DPBackground_color[i].color != DataBase.CardColor_ColorLightDictionary[cardColor])
-                        DPBackground_color[i].color = DataBase.CardColor_ColorLightDictionary[cardColor];
                 }
                 }
             }
             }
 
 

+ 3 - 0
Assets/Scripts/GManager.cs

@@ -215,9 +215,12 @@ public class GManager : MonoBehaviour
     public int CardIndex { get; set; } = 0;
     public int CardIndex { get; set; } = 0;
 
 
     #region Events
     #region Events
+
+    //Cards flipped
     public static Action OnReverseOpponentsCardsChanged;
     public static Action OnReverseOpponentsCardsChanged;
     public static Action OnCardFlippedChanged;
     public static Action OnCardFlippedChanged;
     public static Action<bool> OnCardSuspendedChanged;
     public static Action<bool> OnCardSuspendedChanged;
+    
     #endregion
     #endregion
 
 
     private async void Awake()
     private async void Awake()

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio