|
|
@@ -2,13 +2,14 @@ using System.Collections;
|
|
|
using System.Collections.Generic;
|
|
|
using UnityEngine;
|
|
|
using System.Linq;
|
|
|
-using Photon;
|
|
|
using Photon.Pun;
|
|
|
using System;
|
|
|
-using UnityEngine.Events;
|
|
|
|
|
|
public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
+ private static WaitForSeconds _waitForSeconds0_4 = new WaitForSeconds(0.4f);
|
|
|
+ private static WaitForSeconds _waitForSeconds0_3 = new WaitForSeconds(0.3f);
|
|
|
+
|
|
|
public List<CardSource> selectedDigicrossCards { get; private set; } = new List<CardSource>();
|
|
|
public List<AddDigivolutionCardsInfo> addDigivolutionCardInfos { get; private set; } = new List<AddDigivolutionCardsInfo>();
|
|
|
public List<CardSource> excludedCards { get; private set; } = new List<CardSource>();
|
|
|
@@ -424,11 +425,11 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Func<IEnumerator> _SelectHandCard = () => SelectHandCard(digiXrosCondition, element, card);
|
|
|
- Func<IEnumerator> _SelectBattleAreaDigimon = () => SelectBattleAreaPermanent(digiXrosCondition, element, card);
|
|
|
- Func<IEnumerator> _SelectTrashCard = () => SelectTrashCard(digiXrosCondition, element, card);
|
|
|
- Func<IEnumerator> _SelectTamerDigivolutionCard = () => SelectTamerDigivolutionCard(digiXrosCondition, element, card);
|
|
|
- Func<IEnumerator> _EndSelectDigiXros = () => EndSelectDigiXros();
|
|
|
+ IEnumerator _SelectHandCard() => SelectHandCard(digiXrosCondition, element, card);
|
|
|
+ IEnumerator _SelectBattleAreaDigimon() => SelectBattleAreaPermanent(digiXrosCondition, element, card);
|
|
|
+ IEnumerator _SelectTrashCard() => SelectTrashCard(digiXrosCondition, element, card);
|
|
|
+ IEnumerator _SelectTamerDigivolutionCard() => SelectTamerDigivolutionCard(digiXrosCondition, element, card);
|
|
|
+ IEnumerator _EndSelectDigiXros() => EndSelectDigiXros();
|
|
|
|
|
|
List<Func<IEnumerator>> actions = new List<Func<IEnumerator>>() { _SelectHandCard, _SelectBattleAreaDigimon, _SelectTrashCard, _SelectTamerDigivolutionCard, _EndSelectDigiXros };
|
|
|
|
|
|
@@ -560,7 +561,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
|
|
|
if (!card.Owner.isYou && GManager.instance.IsAI)
|
|
|
{
|
|
|
- yield return new WaitForSeconds(0.3f);
|
|
|
+ yield return _waitForSeconds0_3;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -569,7 +570,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
|
|
|
if (selectedDigicrossCards.Count >= 1)
|
|
|
{
|
|
|
- yield return new WaitForSeconds(0.4f);
|
|
|
+ yield return _waitForSeconds0_4;
|
|
|
}
|
|
|
|
|
|
GManager.instance.GetComponent<Effects>().OffShowCard2();
|
|
|
@@ -623,7 +624,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
if (digiXrosCondition.CanTargetCondition_ByPreSelecetedList != null || element.skipAllIfNoSelect)
|
|
|
{
|
|
|
- EndSelectDigiXros();
|
|
|
+ StartCoroutine(EndSelectDigiXros());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -681,7 +682,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
if (digiXrosCondition.CanTargetCondition_ByPreSelecetedList != null || element.skipAllIfNoSelect)
|
|
|
{
|
|
|
- EndSelectDigiXros();
|
|
|
+ StartCoroutine(EndSelectDigiXros());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -743,7 +744,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
if (digiXrosCondition.CanTargetCondition_ByPreSelecetedList != null || element.skipAllIfNoSelect)
|
|
|
{
|
|
|
- EndSelectDigiXros();
|
|
|
+ StartCoroutine(EndSelectDigiXros());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -798,7 +799,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
if (digiXrosCondition.CanTargetCondition_ByPreSelecetedList != null || element.skipAllIfNoSelect)
|
|
|
{
|
|
|
- EndSelectDigiXros();
|
|
|
+ StartCoroutine(EndSelectDigiXros());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -863,7 +864,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
|
if (digiXrosCondition.CanTargetCondition_ByPreSelecetedList != null || element.skipAllIfNoSelect)
|
|
|
{
|
|
|
- EndSelectDigiXros();
|
|
|
+ StartCoroutine(EndSelectDigiXros());
|
|
|
}
|
|
|
}
|
|
|
}
|