Card爆改!

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

View File

@@ -6,11 +6,11 @@ using UnityEngine;
namespace Continentis.MainGame.Card
{
public partial class AttributeSubmodule : SubmoduleBase<CardLogicBase>
public partial class AttributeSubmodule : SubmoduleBase<CardInstance>
{
public AttributeGroup attributeGroup;
public AttributeSubmodule(CardLogicBase card) : base(card)
public AttributeSubmodule(CardInstance card) : base(card)
{
Initialize(card.cardData);
}

View File

@@ -5,11 +5,11 @@ using UnityEngine;
namespace Continentis.MainGame.Card
{
public partial class CombatBuffSubmodule : SubmoduleBase<CardLogicBase>
public partial class CombatBuffSubmodule : SubmoduleBase<CardInstance>
{
public List<CardCombatBuffBase> buffList;
public CombatBuffSubmodule(CardLogicBase owner) : base(owner)
public CombatBuffSubmodule(CardInstance owner) : base(owner)
{
buffList = new List<CardCombatBuffBase>();
}

View File

@@ -6,7 +6,7 @@ using UnityEngine;
namespace Continentis.MainGame.Card
{
public class ContentSubmodule : SubmoduleBase<CardLogicBase>
public class ContentSubmodule : SubmoduleBase<CardInstance>
{
public List<string> keywords;
@@ -22,7 +22,7 @@ namespace Continentis.MainGame.Card
/// </summary>
public bool dirtyMark;
public ContentSubmodule(CardLogicBase card) : base(card)
public ContentSubmodule(CardInstance card) : base(card)
{
keywords = card.cardData.keywords;
cardName = card.cardData.displayName.Localize();

View File

@@ -7,7 +7,7 @@ using UnityEngine.Events;
namespace Continentis.MainGame.Card
{
public partial class EventSubmodule : SubmoduleBase<CardLogicBase>
public partial class EventSubmodule : SubmoduleBase<CardInstance>
{
public UnityAction<CharacterBase> onTargeting; //选中目标时
public UnityAction onUntargeting; //取消选中目标时
@@ -27,11 +27,8 @@ namespace Continentis.MainGame.Card
public OrderedDictionary<string, PrioritizedCheckAndEffect> onInitiativeDiscard; //此卡牌被主动弃牌时如果读到任意一个true打断弃牌行为执行所有对应效果
public OrderedDictionary<string, PrioritizedAction> onExhaust; //此卡牌被消耗时
public EventSubmodule(CardLogicBase card) : base(card)
public EventSubmodule(CardInstance card) : base(card)
{
onTargeting += card.TargetingEffect;
onUntargeting = card.UntargetingEffect;
onCombatStart = new OrderedDictionary<string, PrioritizedAction>();
onCombatEnd = new OrderedDictionary<string, PrioritizedAction>();

View File

@@ -2,11 +2,11 @@ using UnityEngine;
namespace Continentis.MainGame.Card
{
public partial class PlaySubmodule : SubmoduleBase<CardLogicBase>
public partial class PlaySubmodule : SubmoduleBase<CardInstance>
{
public bool isDuringPlayEffect;
public PlaySubmodule(CardLogicBase card) : base(card)
public PlaySubmodule(CardInstance card) : base(card)
{
isDuringPlayEffect = false;
}

View File

@@ -3,14 +3,14 @@ using UnityEngine;
namespace Continentis.MainGame.Card
{
public class WeightSubmodule : SubmoduleBase<CardLogicBase>
public class WeightSubmodule : SubmoduleBase<CardInstance>
{
public bool forceUse;
public bool forceIgnore;
public float baseWeight;
public float currentWeight;
public WeightSubmodule(CardLogicBase owner) : base(owner)
public WeightSubmodule(CardInstance owner) : base(owner)
{
this.forceUse = false;
this.forceIgnore = false;