This commit is contained in:
SoulliesOfficial
2025-10-23 00:49:44 -04:00
parent 9b1b5ca93f
commit 61a397dd4c
9846 changed files with 2618439 additions and 793547 deletions

View File

@@ -4,7 +4,7 @@ using System.Linq;
using Continentis.MainGame.Card;
using Continentis.MainGame.Character;
using DG.Tweening;
using SoulliesFramework.General;
using SLSFramework.General;
using UniRx;
using UnityEngine;
using Random = UnityEngine.Random;
@@ -25,7 +25,7 @@ namespace Continentis.MainGame.Commands
this.interval = interval;
}
protected override IObservable<Unit> OnExecute(CommandContext context)
protected override IObservable<Unit> OnExecute(CommandContext outerContext)
{
if (cardsToDiscard == null || cardsToDiscard.Count == 0)
{
@@ -67,10 +67,10 @@ namespace Continentis.MainGame.Commands
private IObservable<Unit> DiscardCard(CardInstance card)
{
deck.TransferCard(deck.Pile(card.currentPileName), deck.DiscardPile, card);
deck.TransferCard(deck.Pile(card.cardLocation.pileName), deck.DiscardPile, card);
card.cardLogic.eventSubmodule.onDiscard.Invoke();
card.handCardView.TransferCardView(CombatUIManager.Instance.deckPage.discardPile);
card.handCardView.TransferCardView(CombatUIManager.Instance.combatMainPage.discardPile);
RectTransform cardTransform = card.handCardView.cardTransform;
Vector3 deltaMove = Vector3.zero - card.handCardView.cardTransform.localPosition;