|
@@ -286,7 +286,7 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
|
|
|
_CanEndSelectCondition: null,
|
|
_CanEndSelectCondition: null,
|
|
|
_MaxCount: 1,
|
|
_MaxCount: 1,
|
|
|
_CanEndNotMax: false,
|
|
_CanEndNotMax: false,
|
|
|
- _CanNoSelect: () => skillInfos_active.All(skillInfo => skillInfo.CardEffect.IsOptional),
|
|
|
|
|
|
|
+ _CanNoSelect: () => skillInfos_active.All(skillInfo => skillInfo.CardEffect.IsOptionalCondition(skillInfo.Hashtable)),
|
|
|
CanLookReverseCard: true,
|
|
CanLookReverseCard: true,
|
|
|
skillInfos: skillInfos_active,
|
|
skillInfos: skillInfos_active,
|
|
|
root: SelectCardEffect.Root.None));
|
|
root: SelectCardEffect.Root.None));
|
|
@@ -295,6 +295,13 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
|
|
|
{
|
|
{
|
|
|
skillIndex = GManager.instance.selectCardPanel.SelectedIndex[0];
|
|
skillIndex = GManager.instance.selectCardPanel.SelectedIndex[0];
|
|
|
}
|
|
}
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ foreach (FieldPermanentCard fieldPermanentCard in player.FieldPermanentObjects)
|
|
|
|
|
+ {
|
|
|
|
|
+ fieldPermanentCard.OffPermanentIndexText();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
else
|
|
else
|