文本显示和Command大修

Assets/Scripts/MainGame/Card/CardAssistanceFunctions.cs

@@ -131,6 +131,65 @@ namespace Continentis.MainGame.Card
             return GetFinalDamage(target, elementalTags, out _, out _, out _, out _);
         }
 
+        /// <summary>
+        /// 获取最终伤害
+        /// </summary>
+        /// <param name="elementalTags">元素标签，若为null则使用卡牌的元素标签</param>
+        public virtual int GetUserDamage(List<string> elementalTags = null)
+        {
+            return GetUserDamage(elementalTags, out _, out _, out _, out _);
+        }
+        
+        /// <summary>
+        /// 获取在没有指定目标时的最终伤害值
+        /// </summary>
+        protected virtual int GetUserDamage(List<string> elementalTags,
+            out float baseDamageAfterOffset, out float elementalMultiplier, out float magicMultiplier, out float finalMultiplier)
+        {
+            elementalTags ??= GetElementalKeywords();
+            
+            //----计算基础伤害增量----
+            int physicsOffset = 0;
+            if (HasKeyword("Physics") || HasKeyword("Slash") || HasKeyword("Prick") || HasKeyword("Strike"))
+            {
+                physicsOffset = user.GetAttribute("PhysicsDamageDealtOffset"); //物理伤害基础增量
+            }
+
+            int magicOffset = 0;
+            if (HasKeyword("Magic") || HasKeyword("Arcane") || HasKeyword("Sorcery"))
+            {
+                magicOffset = user.GetAttribute("MagicDamageDealtOffset"); //魔法伤害基础增量
+            }
+            
+            Debug.Log("Magic Offset: " + magicOffset);
+            
+            //----计算伤害因数----
+            
+            //计算元素伤害加成，注意，“物理Physics”也是一种元素，因此下方没有“通用物理伤害加成”的计算
+            elementalMultiplier = 1; 
+            foreach (string element in elementalTags)
+            {
+                elementalMultiplier *= user.GetRawAttribute(element + "DamageDealtMultiplier", 1);
+            }
+
+            //计算通用的魔法伤害加成
+            magicMultiplier = 1;
+            if (HasKeyword("Magic") || HasKeyword("Arcane") || HasKeyword("Sorcery"))
+            {
+                magicMultiplier = user.GetRawAttribute("MagicDamageDealtMultiplier", 1);
+            }
+            
+            //计算最终伤害加成
+            finalMultiplier = user.GetRawAttribute("FinalDamageDealtMultiplier", 1);
+
+            //----计算最终伤害----
+            baseDamageAfterOffset = attributeSubmodule.GetCurrentAttribute("Damage") + physicsOffset + magicOffset;
+            
+            float finalDamage = baseDamageAfterOffset * elementalMultiplier * magicMultiplier * finalMultiplier;
+
+            return Mathf.RoundToInt(finalDamage);
+        }
+
         protected virtual int GetFinalDamage(CharacterBase target, List<string> elementalTags,
             out float baseDamageAfterOffset, out float elementalMultiplier, out float magicMultiplier, out float finalMultiplier)
         {