Soullies/Continentis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Card爆改！

Browse Source
This commit is contained in:
SoulliesOfficial
2025-11-15 12:17:34 -05:00
parent 85bbe2431c
commit 5fe665d0ce
121 changed files with 838 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/MainGame/Commands/Cmd_DiscardCards.cs
View File

@@ -72,11 +72,11 @@ namespace Continentis.MainGame.Commands
{
if (isInitiative)
{
if (card.cardLogic.eventSubmodule.onInitiativeDiscard.GetChecks().Any()) // 如果主动弃牌后，有触发条件，则打断弃牌，直接触发效果
if (card.eventSubmodule.onInitiativeDiscard.GetChecks().Any()) // 如果主动弃牌后，有触发条件，则打断弃牌，直接触发效果
{
CommandQueueManager.Instance.AddCommand(new Cmd_Function(() =>
{
card.cardLogic.eventSubmodule.onInitiativeDiscard.GetEffects().ForEach(effect => effect.Invoke());
card.eventSubmodule.onInitiativeDiscard.GetEffects().ForEach(effect => effect.Invoke());
}));
return Observable.Return(Unit.Default);
}

4
Assets/Scripts/MainGame/Commands/Cmd_DrawCards.cs
View File

@@ -97,7 +97,7 @@ namespace Continentis.MainGame.Commands
CardInstance card = deck.DrawPile[0];
deck.TransferCard(deck.DrawPile, deck.HandPile, card);
card.cardLogic.eventSubmodule.onDraw.Invoke();
card.eventSubmodule.onDraw.Invoke();
card.handCardView.TransferCardView(CombatUIManager.Instance.combatMainPage.handPile);
Vector3 targetPosition = CombatUIManager.Instance.combatMainPage.handPile.GetCardPosition(index, totalCount);
@@ -116,7 +116,7 @@ namespace Continentis.MainGame.Commands
private IObservable<Unit> Draw(CardInstance card, int index, int totalCount)
{
deck.TransferCard(card.cardLocation.pileName, "Hand", card);
card.cardLogic.eventSubmodule.onDraw.Invoke();
card.eventSubmodule.onDraw.Invoke();
card.handCardView.TransferCardView(CombatUIManager.Instance.combatMainPage.handPile);
Vector3 targetPosition = CombatUIManager.Instance.combatMainPage.handPile.GetCardPosition(index, totalCount);

4
Assets/Scripts/MainGame/Commands/Cmd_ExhaustCards.cs
View File

@@ -72,7 +72,7 @@ namespace Continentis.MainGame.Commands
private IObservable<Unit> PlayerExhaustCard(CardInstance card)
{
deck.TransferCard(deck.Pile(card.cardLocation.pileName), deck.ExhaustPile, card);
card.cardLogic.eventSubmodule.onExhaust.Invoke();
card.eventSubmodule.onExhaust.Invoke();
card.handCardView.TransferCardView(CombatUIManager.Instance.combatMainPage.exhaustPile);
@@ -94,7 +94,7 @@ namespace Continentis.MainGame.Commands
private IObservable<Unit> NpcExhaustCard(CardInstance card)
{
deck.TransferCard(deck.Pile(card.cardLocation.pileName), deck.ExhaustPile, card);
card.cardLogic.eventSubmodule.onExhaust.Invoke();
card.eventSubmodule.onExhaust.Invoke();
return Observable.Timer(TimeSpan.FromSeconds(singleCardAnimationDuration)).AsUnitObservable();
}
}

2
Assets/Scripts/MainGame/Commands/Cmd_UsePowerCards.cs
View File

@@ -77,7 +77,7 @@ namespace Continentis.MainGame.Commands
card.handCardView.TransferCardView(CombatUIManager.Instance.combatMainPage.gravePile);
RectTransform cardTransform = card.handCardView.cardTransform;
Vector2 userViewPosition = card.cardLogic.user.characterView.hudContainer.GetComponent<RectTransform>().position;
Vector2 userViewPosition = card.user.characterView.hudContainer.GetComponent<RectTransform>().position;
cardTransform.DOMove(userViewPosition, singleCardAnimationDuration).SetEase(Ease.Linear).Play();
cardTransform.DOScale(Vector3.zero, singleCardAnimationDuration).SetEase(Ease.Linear).OnComplete(() =>
{