Update
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using Continentis.MainGame;
|
||||
using Continentis.MainGame.Character;
|
||||
using SLSFramework.General;
|
||||
@@ -22,42 +23,43 @@ namespace Continentis.Mods.Basic.Buffs
|
||||
}
|
||||
|
||||
this.contentSubmodule = new ContentSubmodule(this)
|
||||
.AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString())
|
||||
.AddParameterGetter("Count", () => roundFirstActionCountSubmodule.remainingCount.ToString())
|
||||
.AddParameterGetter("Target", () => target.data.displayName);//TODO: 以后增加角色的ContentSubmodule
|
||||
|
||||
this.iconSubmodule = new IconSubmodule(this).SetTextFunctions("Count");
|
||||
|
||||
this.roundCountSubmodule = new CountSubmodule(this, actionCount);
|
||||
|
||||
this.eventSubmodule = new EventSubmodule(this);
|
||||
this.roundFirstActionCountSubmodule = new CountSubmodule(this, actionCount);
|
||||
}
|
||||
|
||||
|
||||
public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
|
||||
{
|
||||
MainGameManager.Instance.basePrefabs.GenerateInfoText(contentSubmodule.displayName, attachedCharacter.characterView);
|
||||
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.");
|
||||
Debug.Log(
|
||||
$"Conflicted Protected buff found, with {conflictProtected.protectingSources.Count} protecting sources. Removing all.");
|
||||
conflictProtected.protectingSources.For(ps => ps.Remove());
|
||||
}
|
||||
|
||||
if (FindExistingSameBuff(out existingBuff))
|
||||
if (FindExistingSameBuffs(out List<Protecting> existingProtecting))
|
||||
{
|
||||
Debug.Log("Existing same buff found.");
|
||||
|
||||
Protecting existProtecting = existingBuff as Protecting;
|
||||
Debug.Log(existProtecting == null ? "Existing buff is not of type Protecting!" : "Existing Protecting buff found.");
|
||||
if (existProtecting.target == this.target)
|
||||
var sameProtecting = existingProtecting.Find(ep => ep.target == this.target);
|
||||
if (sameProtecting != null)
|
||||
{
|
||||
existProtecting.roundCountSubmodule.AddCount(this.roundCountSubmodule.remainingCount);
|
||||
existingBuff = sameProtecting;
|
||||
sameProtecting.roundFirstActionCountSubmodule.AddCount(this.roundFirstActionCountSubmodule.remainingCount);
|
||||
return false;
|
||||
}
|
||||
|
||||
existingBuff = null;
|
||||
return true; //独立处理,直接返回true
|
||||
}
|
||||
|
||||
|
||||
existingBuff = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -71,6 +73,7 @@ namespace Continentis.Mods.Basic.Buffs
|
||||
{
|
||||
base.OnBuffRemove();
|
||||
protectedBuff.protectingSources.Remove(this);
|
||||
Debug.Log($"Protecting buff removed. Remaining protecting sources: {protectedBuff.protectingSources.Count}");
|
||||
if (protectedBuff.protectingSources.Count == 0)
|
||||
{
|
||||
protectedBuff.Remove();
|
||||
|
||||
Reference in New Issue
Block a user