继续
This commit is contained in:
@@ -15,14 +15,14 @@ namespace Continentis.MainGame.Character
|
||||
|
||||
foreach (string cardDataID in data.initialDeckRef)
|
||||
{
|
||||
ModManager.GetData<CardData>(cardDataID).GenerateCardInstance(this, initialPile);
|
||||
CardInstance.GenerateCardInstance(ModManager.GetData<CardData>(cardDataID), this, initialPile);
|
||||
}
|
||||
|
||||
foreach (EquipmentBase equipment in equipmentSubmodule.currentEquipments)
|
||||
{
|
||||
foreach (string cardDataID in equipment.equipmentData.belongingCardDataRefs)
|
||||
{
|
||||
ModManager.GetData<CardData>(cardDataID).GenerateCardInstance(this, initialPile);
|
||||
CardInstance.GenerateCardInstance(ModManager.GetData<CardData>(cardDataID), this, initialPile);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -224,16 +224,24 @@ namespace Continentis.MainGame.Character
|
||||
/// <summary>
|
||||
/// 添加格挡(格挡每回合结束后会清空)
|
||||
/// </summary>
|
||||
public void AddBlock(int baseBlock, CharacterBase target = null)
|
||||
public void AddBlock(int baseBlock, bool applyOffsetAndModifier = true, CharacterBase target = null)
|
||||
{
|
||||
int baseBlockAfterOffset = baseBlock + GetAttribute("BlockGainOffset");
|
||||
int finalBlock = Mathf.RoundToInt(baseBlockAfterOffset * GetRawAttribute("BlockGainMultiplier", 1));
|
||||
|
||||
target ??= this;
|
||||
target.ModifyAttribute("Block", finalBlock);
|
||||
|
||||
if (!applyOffsetAndModifier)
|
||||
{
|
||||
target.ModifyAttribute("Block", baseBlock);
|
||||
}
|
||||
else
|
||||
{
|
||||
int baseBlockAfterOffset = baseBlock + GetAttribute("BlockGainOffset");
|
||||
int finalBlock = Mathf.RoundToInt(baseBlockAfterOffset * GetRawAttribute("BlockGainMultiplier", 1));
|
||||
target.ModifyAttribute("Block", finalBlock);
|
||||
}
|
||||
|
||||
target.characterView.hudContainer.UpdateAllHUD();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 添加闪避(闪避在回合结束后或被击中后清空)
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user