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

意图初步

Browse Source
This commit is contained in:
SoulliesOfficial
2025-11-15 09:08:36 -05:00
parent 9a8eadef24
commit 85bbe2431c
33 changed files with 508 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/MainGame/Card/CardData/CardData.cs
View File

@@ -43,7 +43,7 @@ namespace Continentis.MainGame.Card
public string functionText;
public string cardDescription;
[Header("Intention")] public float baseWeight = 1f;
[Header("Intention")] public float baseWeight = 0f;
[Header("Attributes")] [Tooltip("可变属性，这个属性会自动设置BaseAttr进入Original，设置Attr，BaseAttrOffset=0，以及DisplayAttr进入Current")]
public SerializableDictionary<string, float> variableAttributes = new SerializableDictionary<string, float>();

8
Assets/Scripts/MainGame/Card/CardInstance.cs
View File

@@ -12,9 +12,11 @@ namespace Continentis.MainGame.Card
[Header("References")]
public DeckSubmodule deck;
//public string currentPileName;
public ICardOwner owner;
public CharacterBase user;
public CombatTeam team;
public CombatTeam usingTeam;
public CardLogicBase cardLogic;
public CardLocation cardLocation;
public HandCardView handCardView;
@@ -29,11 +31,11 @@ namespace Continentis.MainGame.Card
this.user = owner as CharacterBase;
if (this.owner is CombatTeam team)
{
this.team = team;
this.usingTeam = team;
}
else if (this.owner is CharacterBase character)
{
this.team = character.team;
this.usingTeam = character.team;
}
this.deck = owner.deckSubmodule;

4
Assets/Scripts/MainGame/Card/CardLogicBase.cs
View File

@@ -19,7 +19,7 @@ namespace Continentis.MainGame.Card
public ICardOwner owner => cardInstance.owner;
public CharacterBase user => cardInstance.user;
public CombatTeam team => cardInstance.team;
public CombatTeam UsingTeam => cardInstance.usingTeam;
public HandCardView handCardView => cardInstance.handCardView;
public IntentionCardView intentionCardView => cardInstance.intentionCardView;
@@ -173,7 +173,7 @@ namespace Continentis.MainGame.Card
{
protected CardLogicBase card;
protected CharacterBase user => card.user;
protected CombatTeam team => card.team;
protected CombatTeam team => card.UsingTeam;
public virtual void Initialize(CardLogicBase card)
{

6
Assets/Scripts/MainGame/Card/CardMainFunctions.cs
View File

@@ -176,6 +176,7 @@ namespace Continentis.MainGame.Card
}
cardInstance.user = user ?? CombatMainManager.Instance.currentCharacter;
cardInstance.user.recordSubmodule.RecordCardPlay(cardInstance);
if (!willCheckBeforePlay || CheckBeforePlay())
{
@@ -212,7 +213,10 @@ namespace Continentis.MainGame.Card
});
AfterPlayEffect(targetList);
playSubmodule.isDuringPlayEffect = false;
handCardView.isDuringPlaying = false;
if (handCardView != null)
{
handCardView.isDuringPlaying = false;
}
}));
return true;
}

5
Assets/Scripts/MainGame/Card/CardSubmodules/WeightSubmodule.cs
View File

@@ -17,5 +17,10 @@ namespace Continentis.MainGame.Card
this.baseWeight = owner.cardData.baseWeight;
this.currentWeight = baseWeight;
}
public void RefreshCurrentWeight()
{
this.currentWeight = baseWeight;
}
}
}