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-10-31 10:02:30 -04:00
parent 5d09ef7b53
commit ee1d3d9c0a
179 changed files with 3239 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Mods/Basic/Characters/CombatBuffs/General/Bleed.cs
View File

@@ -21,14 +21,14 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onActionStart.Add("Bleed", new EventUnit(OnActionStart));
this.eventSubmodule.onGetAttacked.Add("Bleed", new EventUnit<AttackResult>(OnGetAttacked));
this.eventSubmodule.onActionStart.Add("Bleed", new PrioritizedAction(OnActionStart));
this.eventSubmodule.onGetAttacked.Add("Bleed", new PrioritizedAction<AttackResult>(OnGetAttacked));
}
private void OnGetAttacked(AttackResult result)
{
int stackAmount = unitedStackSubmodule.stackAmount;
result.attacker.Attack(attachedCharacter, stackAmount, true);
result.attacker.Attack(attachedCharacter, stackAmount, false, true);
}
private void OnActionStart()

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Blind.cs
View File

@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Buffs
if (FindExistingSameBuff(out existingBuff))
{
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule.stackAmount);
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule);
existingBuff.actionCountSubmodule.AddRemainingCount(this.actionCountSubmodule.remainingCount);
int remainingCount = existingBuff.actionCountSubmodule.remainingCount;

6
Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs
View File

@@ -21,8 +21,8 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onActionStart.Add("Burn", new EventUnit(OnActionStart));
this.eventSubmodule.onAfterPlayCard.Add("Burn", new EventUnit<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
this.eventSubmodule.onActionStart.Add("Burn", new PrioritizedAction(OnActionStart));
this.eventSubmodule.onAfterPlayCard.Add("Burn", new PrioritizedAction<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
@@ -46,7 +46,7 @@ namespace Continentis.Mods.Basic.Buffs
private void OnAfterPlayCard(CardInstance card, List<CharacterBase> targets)
{
sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true);
sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, false, true);
}
}
}

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Buffs
{
Initialize(BuffType.Positive, BuffDispelLevel.Strong);
this.contentSubmodule = new ContentSubmodule(this, false)
this.contentSubmodule = new ContentSubmodule(this)
.AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString());
this.iconSubmodule = new IconSubmodule(this);

4
Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs
View File

@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onActionStart.Add("Corrosion", new EventUnit(OnActionStart));
this.eventSubmodule.onActionStart.Add("Corrosion", new PrioritizedAction(OnActionStart));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
@@ -38,7 +38,7 @@ namespace Continentis.Mods.Basic.Buffs
private void OnActionStart()
{
sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true);
sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, false, true);
unitedStackSubmodule.ReduceStack(1);
iconSubmodule.Update();
}

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Freeze.cs
View File

@@ -30,7 +30,7 @@ namespace Continentis.Mods.Basic.Buffs
if (FindExistingSameBuff(out existingBuff))
{
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule.stackAmount);
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule);
existingBuff.actionCountSubmodule.AddRemainingCount(this.actionCountSubmodule.remainingCount);
return false;
}

11
Assets/Mods/Basic/Characters/CombatBuffs/General/Protected.cs
View File

@@ -15,6 +15,10 @@ namespace Continentis.Mods.Basic.Buffs
{
Initialize(BuffType.Neutral, BuffDispelLevel.DeathOnly, 100);
this.protectingSources = new List<Protecting>();
this.statusSubmodule = new StatusSubmodule(this, StatusType.Protected);
this.contentSubmodule = new ContentSubmodule(this);//TODO: 以后增加角色的ContentSubmodule
this.iconSubmodule = new IconSubmodule(this).SetTextFunctions();
@@ -36,6 +40,13 @@ namespace Continentis.Mods.Basic.Buffs
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (attachedCharacter.combatBuffSubmodule.TryGetBuffs(out List<Protecting> conflictProtectings))
{
//如果目标正在保护其他角色时，被保护，则应当将目标的所有Protecting Buff移除，以防止冲突.
Debug.Log($"Conflicted Protecting buffs found, count: {conflictProtectings.Count}. Removing all.");
conflictProtectings.For(cp => cp.Remove());
}
if (FindExistingSameBuff(out existingBuff))
{

16
Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs
View File

@@ -1,5 +1,6 @@
using Continentis.MainGame;
using Continentis.MainGame.Character;
using SLSFramework.General;
using UnityEngine;
namespace Continentis.Mods.Basic.Buffs
@@ -34,6 +35,14 @@ namespace Continentis.Mods.Basic.Buffs
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (attachedCharacter.combatBuffSubmodule.TryGetBuff(out Protected conflictProtected))
{
//如果目标已经有Protected Buff，则应当将其移除，以防止冲突.
//使用移除所有保护者的方式来移除。
Debug.Log($"Conflicted Protected buff found, with {conflictProtected.protectingSources.Count} protecting sources. Removing all.");
conflictProtected.protectingSources.For(ps => ps.Remove());
}
if (FindExistingSameBuff(out existingBuff))
{
@@ -46,13 +55,12 @@ namespace Continentis.Mods.Basic.Buffs
existProtecting.roundCountSubmodule.AddCount(this.roundCountSubmodule.remainingCount);
return false;
}
this.protectedBuff ??= target.combatBuffSubmodule.GetBuff<Protected>();
this.protectedBuff.protectingSources.Add(this);
return true; //独立处理，直接返回true
}
Debug.Log("No existing same buff found.");
this.protectedBuff ??= target.combatBuffSubmodule.GetBuff<Protected>();
this.protectedBuff.protectingSources.Add(this);
Debug.Log(protectedBuff.protectingSources.Count);
return true;
}

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Resonance.cs
View File

@@ -8,8 +8,6 @@ namespace Continentis.Mods.Basic.Buffs
{
public sealed class Resonance : CharacterCombatBuffBase, IBuffExtension_IntegerRange
{
public Func<string> GetDescription { get; set; }
public Resonance(int stack)
{
Initialize(BuffType.Positive, BuffDispelLevel.Strong);

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Withstand.cs
View File

@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onActionEnd.Add("Withstand", new EventUnit(() =>
this.eventSubmodule.onActionEnd.Add("Withstand", new PrioritizedAction(() =>
{
attachedCharacter.AddBlock(this.unitedStackSubmodule.stackAmount, false);
}));

45
Assets/Mods/Basic/Characters/CombatBuffs/Knight/EstablishFormation.cs Normal file
View File

@@ -0,0 +1,45 @@
using Continentis.MainGame;
using Continentis.MainGame.Character;
using SLSFramework.General;
using UnityEngine;
namespace Continentis.Mods.Basic.Buffs
{
public class EstablishFormation : CharacterCombatBuffBase
{
public EstablishFormation(int stack, int count)
{
Initialize(BuffType.Positive, BuffDispelLevel.Basic);
this.contentSubmodule = new ContentSubmodule(this)
.AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString())
.AddParameterGetter("Count", () => actionCountSubmodule.remainingCount.ToString());
this.iconSubmodule = new IconSubmodule(this);
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.actionCountSubmodule = new CountSubmodule(this, count);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onGetAttacked.Add("EstablishFormation", new PrioritizedAction<AttackResult>(atkResult =>
{
attachedCharacter.Attack(atkResult.attacker, unitedStackSubmodule.stackAmount, false, true);
}));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (FindExistingSameBuff(out existingBuff))
{
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule);
existingBuff.actionCountSubmodule.PickHigherCount(this.actionCountSubmodule);
return false;
}
return true;
}
}
}

2
Assets/Mods/Basic/Characters/CombatBuffs/Knight/EstablishFormation.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ac01d8c37325ef84c919257c58ddb968

4
Assets/Mods/Basic/Characters/CombatBuffs/Knight/GuardianAura.cs
View File

@@ -20,7 +20,7 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onActionStart.Add("GuardianAura", new EventUnit(() =>
this.eventSubmodule.onActionStart.Add("GuardianAura", new PrioritizedAction(() =>
{
CombatMainManager.Instance.characterController.playerHeroes.ForEach(hero =>
{
@@ -35,7 +35,7 @@ namespace Continentis.Mods.Basic.Buffs
if (FocusingCheck(out existingBuff))
{
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule.stackAmount);
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule);
return false;
}

8
Assets/Mods/Basic/Characters/CombatBuffs/Mage.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 43d48e5f456693a4ca5fad27c40fda7c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

38
Assets/Mods/Basic/Characters/CombatBuffs/Mage/ConcentratedSpellcasting.cs Normal file
View File

@@ -0,0 +1,38 @@
using Continentis.MainGame;
using Continentis.MainGame.Character;
using UnityEngine;
namespace Continentis.Mods.Basic.Buffs
{
public class ConcentratedSpellcasting : CharacterCombatBuffBase
{
public ConcentratedSpellcasting(int stack)
{
Initialize(BuffType.Focusing, BuffDispelLevel.Strong);
this.contentSubmodule = new ContentSubmodule(this)
.AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString());
this.iconSubmodule = new IconSubmodule(this);
this.unitedStackSubmodule = new UnitedStackSubmodule(this, true, -1, stack, true);
this.generalAttributeSubmodule = new GeneralAttributeSubmodule(this);
this.generalAttributeSubmodule.numericChange.Add("MagicDamageDealtOffset", stack);
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (FocusingCheck(out existingBuff))
{
existingBuff.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule);
return false;
}
return true;
}
}
}

2
Assets/Mods/Basic/Characters/CombatBuffs/Mage/ConcentratedSpellcasting.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 661b4fa4f14f5bf4da76a750f3738e1d

52
Assets/Mods/Basic/Characters/CombatBuffs/Mage/FlameInscription.cs Normal file
View File

@@ -0,0 +1,52 @@
using System.Collections.Generic;
using Continentis.MainGame;
using Continentis.MainGame.Card;
using Continentis.MainGame.Character;
using Continentis.MainGame.Combat;
using SLSFramework.General;
using UnityEngine;
namespace Continentis.Mods.Basic.Buffs
{
public class FlameInscription : CharacterCombatBuffBase
{
public FlameInscription(int stack)
{
Initialize(BuffType.Positive, BuffDispelLevel.Strong);
this.contentSubmodule = new ContentSubmodule(this)
.AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString());
this.iconSubmodule = new IconSubmodule(this);
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onAfterPlayCard.Add("FlameInscription",
new PrioritizedAction<CardInstance, List<CharacterBase>>((card, targets) =>
{
if (card.cardLogic.contentSubmodule.cardType == CardType.Attack && card.cardLogic.HasKeyword("Magic"))
{
List<CharacterBase> enemies = CombatMainManager.Instance.characterController.GetAllEnemies(attachedCharacter);
foreach (CharacterBase enemy in enemies)
{
CreateCharacterBuff<Burn>(unitedStackSubmodule.stackAmount).Apply(enemy, attachedCharacter);
}
}
}));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (FindExistingSameBuff(out existingBuff))
{
existingBuff.unitedStackSubmodule.AddStack(this.unitedStackSubmodule.stackAmount);
return false;
}
return true;
}
}
}

2
Assets/Mods/Basic/Characters/CombatBuffs/Mage/FlameInscription.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 30a2988fc4787c14b860f6b235d44fac

41
Assets/Mods/Basic/Characters/CombatBuffs/Mage/Haste.cs Normal file
View File

@@ -0,0 +1,41 @@
using Continentis.MainGame;
using Continentis.MainGame.Card;
using Continentis.MainGame.Character;
using Continentis.MainGame.Combat;
using SLSFramework.General;
using SLSFramework.UModAssistance;
using UnityEngine;
namespace Continentis.Mods.Basic.Buffs
{
public class Haste : CharacterCombatBuffBase
{
public Haste()
{
Initialize(BuffType.Focusing, BuffDispelLevel.Strong);
this.contentSubmodule = new ContentSubmodule(this);
this.iconSubmodule = new IconSubmodule(this);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onRoundEnd.Add("Haste", new PrioritizedAction(() =>
{
CardData whimsyData = ModManager.GetData<CardData>("CardData_Basic_Whimsy");
CardInstance.GenerateCardInstance(whimsyData, attachedCharacter.team, "Hand");
}));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
{
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
if (FocusingCheck(out existingBuff))
{
return false;
}
return true;
}
}
}

2
Assets/Mods/Basic/Characters/CombatBuffs/Mage/Haste.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f8f47dd84ab44ef4582075fdfe83f23b

2
Assets/Mods/Basic/Characters/CombatBuffs/MarshalOfTheUnderworld/Basic_Hellfire.cs
View File

@@ -21,7 +21,7 @@ namespace Continentis.Mods.Basic.Buffs
this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
this.eventSubmodule = new EventSubmodule(this);
this.eventSubmodule.onAfterPlayCard.Add("Basic_Hellfire", new EventUnit<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
this.eventSubmodule.onAfterPlayCard.Add("Basic_Hellfire", new PrioritizedAction<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
}
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)

7
Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset
View File

@@ -201,14 +201,15 @@ MonoBehaviour:
derivativeCardDataRefs: []
derivativeCharacterDataRefs: []
initialDeckRef:
- CardData_Basic_Whimsy
- CardData_Basic_Rouse
- CardData_Basic_Tactic
- CardData_Basic_Cover
- CardData_Basic_OathOfCourage
- CardData_Basic_BattlefieldExperience
- CardData_Basic_BodyAsShield
- CardData_Basic_EchoOfHonor
- CardData_Basic_IronWall
- CardData_Basic_FirmBelief
- CardData_Basic_UtmostStrike
- CardData_Basic_DivineSmite
- CardData_Basic_EstablishFormation
hudDataRefs:
- HUDData_Basic_Default

29
Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Mage.asset
View File

@@ -25,31 +25,31 @@ MonoBehaviour:
coreAttributes:
dictionaryList:
- Key: Level
Value: 0
Value: 12
index: 0
isKeyDuplicated: 0
- Key: Strength
Value: 0
Value: 12
index: 1
isKeyDuplicated: 0
- Key: Agility
Value: 0
Value: 12
index: 2
isKeyDuplicated: 0
- Key: Intelligence
Value: 0
Value: 18
index: 3
isKeyDuplicated: 0
- Key: Physique
Value: 0
Value: 12
index: 4
isKeyDuplicated: 0
- Key: Perception
Value: 0
Value: 18
index: 5
isKeyDuplicated: 0
- Key: Charisma
Value: 0
Value: 18
index: 6
isKeyDuplicated: 0
dividerPosProp: 0.5
@@ -179,6 +179,10 @@ MonoBehaviour:
Value: 0
index: 30
isKeyDuplicated: 0
- Key: MaximumFocusingBuffAmount
Value: 1
index: 31
isKeyDuplicated: 0
dividerPosProp: 0.5
runtimeGeneralAttributes:
dictionaryList:
@@ -201,6 +205,15 @@ MonoBehaviour:
derivativeCardDataRefs: []
derivativeCharacterDataRefs: []
initialDeckRef:
- CardData_Basic_HolyWaterPreparation
- CardData_Basic_Haste
- CardData_Basic_FarSighted
- CardData_Basic_FlameInscription
- CardData_Basic_ArcaneMissiles
- CardData_Basic_ConcentratedSpellcasting
- CardData_Basic_FireBall
- CardData_Basic_Scorch
- CardData_Basic_ElectricClaw
- CardData_Basic_IdentifyWeakness
- CardData_Basic_WitchcraftRay
hudDataRefs:
- HUDData_Basic_Default