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

8
Assets/Scripts/MainGame/UI/CombatMainPage/CustomCardSelectionInterface.cs
View File

@@ -58,7 +58,7 @@ namespace Continentis.MainGame.UI
this.selectedCards = new List<CardInstance>();
foreach (CardInstance card in this.cardsToSelect)
{
Debug.Log($"Card to select: {card.cardLogic.contentSubmodule.cardName} from {card.cardLocation.pileName}");
Debug.Log($"Card to select: {card.contentSubmodule.cardName} from {card.cardLocation.pileName}");
CombatUIManager.Instance.combatMainPage.Pile(card.cardLocation.pileName).RemoveCard(card.handCardView);
card.handCardView.transform.SetParent(selectionContainer, false);
card.handCardView.transform.localScale = Vector3.one;
@@ -80,7 +80,7 @@ namespace Continentis.MainGame.UI
public void Select(HandCardView cardView)
{
if (selectedCards.Contains(cardView.cardInstance))
if (selectedCards.Contains(cardView.card))
{
return;
}
@@ -90,7 +90,7 @@ namespace Continentis.MainGame.UI
return;
}
selectedCards.Add(cardView.cardInstance);
selectedCards.Add(cardView.card);
cardView.EnableSelectShadow();
if (isForcedMaximum)
{
@@ -100,7 +100,7 @@ namespace Continentis.MainGame.UI
public void Deselect(HandCardView cardView)
{
selectedCards.Remove(cardView.cardInstance);
selectedCards.Remove(cardView.card);
cardView.DisableSelectShadow();
if (isForcedMaximum)
{

14
Assets/Scripts/MainGame/UI/CombatMainPage/HandCardSelectionInterface.cs
View File

@@ -80,19 +80,19 @@ namespace Continentis.MainGame.UI
return;
}
if (selectedCards.Contains(cardView.cardInstance))
if (selectedCards.Contains(cardView.card))
{
return;
}
if (!selectionCondition(cardView.cardInstance))
if (!selectionCondition(cardView.card))
{
return;
}
string pileName = cardView.cardInstance.cardLocation.pileName;
int index = cardView.cardInstance.deck.Pile(pileName).IndexOf(cardView.cardInstance);
selectedCards.Add(cardView.cardInstance);
string pileName = cardView.card.cardLocation.pileName;
int index = cardView.card.deck.Pile(pileName).IndexOf(cardView.card);
selectedCards.Add(cardView.card);
CombatUIManager.Instance.combatMainPage.Pile(pileName).RemoveCard(cardView);
cardView.transform.SetParent(selectionContainer, false);
@@ -105,9 +105,9 @@ namespace Continentis.MainGame.UI
public void Deselect(HandCardView cardView)
{
CardLocation location = cardView.cardInstance.cardLocation;
CardLocation location = cardView.card.cardLocation;
PileBase uiPile = CombatUIManager.Instance.combatMainPage.Pile(location.pileName);
selectedCards.Remove(cardView.cardInstance);
selectedCards.Remove(cardView.card);
uiPile.AddCard(cardView);
cardView.transform.SetParent(uiPile.rectTransform, false);
cardView.transform.SetSiblingIndex(location.index);

6
Assets/Scripts/MainGame/UI/CombatMainPage/TeamSwitchButton.cs
View File

@@ -45,10 +45,10 @@ namespace Continentis.MainGame.UI
{
CombatUIManager.Instance.combatMainPage.ClearAllCardViews();
CombatMainManager.Instance.characterController.playerTeam.deckSubmodule.SetUpHandCardViews();
CombatMainManager.Instance.characterController.playerTeam.deckSubmodule.GetAllCards().ForEach(c =>
CombatMainManager.Instance.characterController.playerTeam.deckSubmodule.GetAllCards().ForEach(card =>
{
c.user = CombatMainManager.Instance.currentCharacter;
c.cardLogic.RefreshCardAttributes();
card.user = CombatMainManager.Instance.currentCharacter;
card.RefreshCardAttributes();
});
}));