From 2d3a60767d0cd69c8dec97e39937bcd0c667be1c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 12 十一月 2025 18:54:57 +0800
Subject: [PATCH] 125 战斗 血条&护盾1护盾2表现
---
Main/System/Battle/Define/BattleDmgInfo.cs | 96 ++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 71 deletions(-)
diff --git a/Main/System/Battle/Define/BattleDmgInfo.cs b/Main/System/Battle/Define/BattleDmgInfo.cs
index 42ba730..d709ae5 100644
--- a/Main/System/Battle/Define/BattleDmgInfo.cs
+++ b/Main/System/Battle/Define/BattleDmgInfo.cs
@@ -265,12 +265,6 @@
public List<long> damageList;
public List<long> suckHpList;
public List<long> reflectHpList;
-
- public long fromShieldValue;
- public long toShieldValue;
- public long fromHp;
- public long toHp;
-
public BattleDrops battleDrops;
public HB427_tagSCUseSkill.tagSCUseSkillHurt hurt;
public int hitIndex;
@@ -278,75 +272,35 @@
public SkillConfig skillConfig;
public long maxHp;
- #region Shield Value Calculations
+ // 鎶ょ浘鍊肩殑鍙樺寲搴旇浠庢姢鐩�2寮�濮嬪彉鍖� 涔熷氨鏄 濡傛灉鎶ょ浘2鏈夊�� 鍒欎粠鎶ょ浘2寮�濮嬪彉鍖� 鍚﹀垯浠庢姢鐩�1寮�濮嬪彉鍖�
+ // 鍐嶈�冭檻鎶ょ浘1 濡傛灉鎶ょ浘1鏈夊�� 鍒欎粠鎶ょ浘1寮�濮嬪彉鍖� 鍚﹀垯娌℃湁鎶ょ浘鍙樺寲
+ // 浣嗘槸鍏跺疄鍙互浠庢�昏閲忎笅鎵� 涔熷氨鏄
+ // from鎶ょ浘鍊� + from琛�閲� = 琛ㄧ幇鐨勫紑濮�
+ // to鎶ょ浘鍊� + to琛�閲� = 琛ㄧ幇鐨勭粨鏉�
+ // 杩欐牱灏变笉闇�瑕佸尯鍒嗘姢鐩�1鍜屾姢鐩�2浜� 鍙鍦ㄨ〃鐜颁笂鍋氬ソ灏辫
- public long MaxSheildValue
+ public long fromShieldValue;
+ public long toShieldValue;
+
+ public long fromHp;
+
+ public long toHp;
+
+ // 鏈鎶ょ浘鎶垫秷鍓嶇殑浼ゅ
+ public long totalDamage
{
get
{
- return hurtObj == null ? 0 : hurtObj.teamHero.maxHp;
+ long total = 0;
+ if (damageList != null)
+ {
+ foreach (var dmg in damageList)
+ {
+ total += dmg;
+ }
+ }
+
+ return total;
}
}
-
- public long phase1FromShieldValue
- {
- get
- {
- if (fromShieldValue > 0)
- {
- return Mathf.Min((int)fromShieldValue, (int)MaxSheildValue);
- }
- else
- {
- return 0;
- }
- }
- }
-
- public long phase1ToShieldValue
- {
- get
- {
- if (toShieldValue > 0)
- {
- return Mathf.Min((int)toShieldValue, (int)MaxSheildValue);
- }
- else
- {
- return 0;
- }
- }
- }
-
- public long phase2FromShieldValue
- {
- get
- {
- if (fromShieldValue > MaxSheildValue)
- {
- return fromShieldValue - MaxSheildValue;
- }
- else
- {
- return 0;
- }
- }
- }
-
- public long phase2ToShieldValue
- {
- get
- {
- if (toShieldValue > MaxSheildValue)
- {
- return toShieldValue - MaxSheildValue;
- }
- else
- {
- return 0;
- }
- }
- }
-
- #endregion
}
\ No newline at end of file
--
Gitblit v1.8.0