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);
}));