hooperk 3 месяцев назад
Родитель
Сommit
84d9f54331
1 измененных файлов с 15 добавлено и 13 удалено
  1. 15 13
      Assets/Scripts/CardEffect/BT25/Black/BT25_075.cs

+ 15 - 13
Assets/Scripts/CardEffect/BT25/Black/BT25_075.cs

@@ -63,22 +63,25 @@ namespace DCGO.CardEffects.BT25
                     int validHandCardCount = card.Owner.HandCards.Count(CanLinkCardCondition);
                     int validTrashCardCount = card.Owner.TrashCards.Count(CanLinkCardCondition);
 
-                    List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>();
-                    if (validHandCardCount > 0)
+                    if (validHandCardCount > 0 && validTrashCardCount > 0)
                     {
-                        selectionElements.Add(new(message: "from Hand", value: 1, spriteIndex: 0));
+                        List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
+                        {
+                            new(message: "from Hand", value: 1, spriteIndex: 0),
+                            new(message: "from Trash", value: 2, spriteIndex: 0),
+                            new(message: "Do not link", value: 3, spriteIndex: 1)
+                        };
+
+                        GManager.instance.userSelectionManager.SetIntSelection(
+                            selectionElements: selectionElements,
+                            selectPlayer: card.Owner,
+                            selectPlayerMessage: "From which area will you link a card?",
+                            notSelectPlayerMessage: "The opponent is choosing from which area to link card.");
                     }
-                    if (validTrashCardCount > 0)
+                    else
                     {
-                        selectionElements.Add(new(message: "from Trash", value: 2, spriteIndex: 0));
+                        GManager.instance.userSelectionManager.SetInt(validHandCardCount > 0 ? 1 : 2);
                     }
-                    selectionElements.Add(new(message: "Do not link", value: 3, spriteIndex: 1));
-
-                    GManager.instance.userSelectionManager.SetIntSelection(
-                        selectionElements: selectionElements,
-                        selectPlayer: card.Owner,
-                        selectPlayerMessage: "From which area will you link a card?",
-                        notSelectPlayerMessage: "The opponent is choosing from which area to link card.");
 
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
 
@@ -143,7 +146,6 @@ namespace DCGO.CardEffects.BT25
                             $"The opponent is selecting cards to link.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-                        break;
                     }
 
                     IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)