diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs index fdd8d1e2..c9981f9a 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs @@ -1,5 +1,6 @@ using Continentis.MainGame.Card; using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; using SLSFramework.General; using System.Collections.Generic; @@ -7,9 +8,28 @@ namespace Continentis.Mods.Basic.Cards { public class Backstab : CardLogicBase { + private int _sharpnessCount = 0; protected override List PlayEffect(List targetList) { - return base.PlayEffect(targetList); + CommandGroup mainGroup = TargetListCommandGroup( targetList, + new Cmd_PlayAnimation(user.characterView, "Attack"), + new Cmd_PlaySFX("SFX_Basic_SwordStrike"), + new Cmd_SpawnVFX("VFX_Basic_RedImpact"), + new Cmd_ParamFunction(target => + { + _sharpnessCount = 0; + if (user.combatBuffSubmodule.HasBuff()) + { + _sharpnessCount = user.combatBuffSubmodule.GetBuff().unitedStackSubmodule.stackAmount; + } + user.Attack(target, GetFinalDamage(target)); + }), + new Cmd_ParamFunction(target => + { + CreateCharacterBuff(_sharpnessCount).Apply(user, user, this); + })); + + return new List { mainGroup }; } } } diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs index d1c04769..da7cabed 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs @@ -16,11 +16,6 @@ namespace Continentis.Mods.Basic.Cards new Cmd_SpawnVFX("VFX_Basic_RedImpact"), new Cmd_ParamFunction(target => { - var extraDamage = 0; - if (target.combatBuffSubmodule.HasBuff()) - { - extraDamage = target.combatBuffSubmodule.GetBuff().unitedStackSubmodule.stackAmount; - } user.Attack(target, GetFinalDamage(target)); })); diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv index 79ab19b2..8b805aa4 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv @@ -17,7 +17,7 @@ Card_Basic_BladeOfFear_DisplayName,Blade of Fear,怖刃,,,,, Card_Basic_BladeOfFear_FunctionText,Test Description,造成$Attribute("Damage")点伤害。\n获得$Attribute("BuffStack")层$Keyword("Basic_Sharpness")。,,,,, Card_Basic_AmbushStance_DisplayName,Ambush Stance,伺机待发,,,,, Card_Basic_AmbushStance_FunctionText,Test Description,每当你打出一张牌,获得$Attribute("BuffStack")层$Keyword("Basic_Sharpness")。,,,,, -Card_Basic_Backstab_DisplayName,Backstab,背刺(TODO),,,,, -Card_Basic_Backstab_FunctionText,Test Description,TODO,,,,, +Card_Basic_Backstab_DisplayName,Backstab,背刺,,,,, +Card_Basic_Backstab_FunctionText,Test Description,造成$Attribute("Damage")点伤害。\n返还这张牌使用的$Keyword("Basic_Sharpness")层数。,,,,, Card_Basic_FlashTerror_DisplayName,FlashTerror,快速威吓(TODO),,,,, Card_Basic_FlashTerror_FunctionText,Test Description,TODO,,,,, diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png index 33e3c855..1b9c1d27 100644 Binary files a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png and b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png differ diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta index 7bb07e0c..df1542c8 100644 --- a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta +++ b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c126886acf6535418c51c5e2c67347a +guid: 7e7ad12f4b02f7e419cff05235ea8fe6 labels: - UnityAI TextureImporter: