From c9a0511e06d6ae2d83fc5554ee40a6a40dbd283d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 11 十一月 2025 20:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/Skill/SkillBase.cs | 183 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 22 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 3a768c0..0caf1c4 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -390,18 +390,18 @@
List<BattleObject> targetList = battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack);
List<BattleObject> highlightList = new List<BattleObject>(targetList) { caster };
List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();
-
+
// 淇锛氫娇鐢℉ashSet浼樺寲鎬ц兘锛岄伩鍏嶉噸澶嶈缃�
var targetSet = new HashSet<BattleObject>(targetList);
var highlightSet = new HashSet<BattleObject>(highlightList);
-
+
caster.heroInfoBar.SetActive(false);
foreach (BattleObject bo in allList)
{
bool isHighlight = highlightSet.Contains(bo);
bool isTarget = targetSet.Contains(bo);
-
+
if (isHighlight)
{
bo.layerMgr.SetFront();
@@ -418,11 +418,23 @@
// battleField.battleRootNode.SetSortingOrder();
}
+ protected long suckHp = 0;
+
// 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
{
+ // 閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
+ HandleRefreshHP();
+
+ suckHp = 0;
+
foreach (var hurt in hitList)
{
+ suckHp += hurt.SuckHP;
+ }
+
+ foreach (var hurt in hitList)
+ {
BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
if (target == null)
{
@@ -433,6 +445,46 @@
OnHitEachTarget(_hitIndex, target, hurt);
}
}
+
+ // protected void RecoveryHp(long suckHp, int _hitIndex)
+ // {
+ // // long suckHp = hurt.SuckHP;
+
+ // if (suckHp <= 0)
+ // {
+ // return;
+ // }
+
+ // List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, suckHp);
+
+ // long currentHitSuckHp = 0;
+ // foreach (long suck in suckHpList)
+ // {
+ // currentHitSuckHp += suck;
+ // }
+
+ // long fromHp = caster.teamHero.curHp;
+ // long toHp = caster.teamHero.curHp + currentHitSuckHp;
+
+ // // 鍙傛暟鎵撳寘
+ // BattleHurtParam hurtParam = new BattleHurtParam()
+ // {
+ // casterObj = caster,
+ // hurtObj = null,
+ // damageList = new List<long>(),
+ // suckHpList = suckHpList,
+ // reflectHpList = new List<long>(),
+ // fromHp = fromHp,
+ // toHp = toHp,
+ // battleDrops = null,
+ // hurt = null,
+ // hitIndex = _hitIndex,
+ // deadPack = null,
+ // skillConfig = skillConfig
+ // };
+
+ // caster.Hurt(hurtParam);
+ // }
// 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
@@ -458,11 +510,26 @@
// 璁＄畻鎬讳激瀹冲拰鍒嗘浼ゅ鍒楄〃
long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
- List<long> damageList = BattleUtility.DivideDamageToList(damageDivide.ToArray(), totalDamage);
+ List<long> damageList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalDamage);
+
+ long totalSuckHp = suckHp;
+ List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalSuckHp);
+
// ============ 绗簩姝�:鍒锋柊瀹為檯琛�閲� ============
long fromHp = target.teamHero.curHp;
+
+
+ // ============澶勭悊鍙嶄激 ===============
+ // 涔熻鎸夋瘡涓�鍑诲钩鍧囩畻 鏈�鍚庤琛ラ綈浼ゅ
+
+ long reflectHp = hurt.BounceHP;
+
+
+ List<long> reflectHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, reflectHp);
+ // long currentSuckHp = suckHp / tagUseSkillAttack.HurtCount;
+
// 璁＄畻褰撳墠杩欎竴鍑荤殑瀹為檯浼ゅ(鎵�鏈夊垎娈典激瀹充箣鍜�)
long currentHitDamage = 0;
foreach (long dmg in damageList)
@@ -470,44 +537,116 @@
currentHitDamage += dmg;
}
- long toHp = Math.Max(0, fromHp - currentHitDamage);
+
+
+ long currentHitReflectHp = 0;
+ foreach (long reflect in reflectHpList)
+ {
+ currentHitReflectHp += reflect;
+ }
+
+ long shieldValue = target.buffMgr.GetShieldValue();
+
+ long remainSheild = shieldValue - currentHitDamage;
+
+ long toShieldValue = Math.Max(0, shieldValue - currentHitDamage);
+
+ long shieldRecieveDamage = shieldValue - toShieldValue;
+
+ // if (shieldValue > 0 && remainSheild >= 0)
+ // {
+ // currentHitDamage = 0;
+ // target.buffMgr.ReduceShieldValue(currentHitDamage);
+ // }
+ // else if (shieldValue > 0 && remainSheild < 0)
+ // {
+ // currentHitDamage = Math.Abs(remainSheild);
+ // target.buffMgr.ClearShield();
+ // }
+
+ long toHp = fromHp; //Math.Max(0, fromHp - currentHitDamage);
+
+
+ // 鍒ゆ柇鏄不鐤楄繕鏄激瀹�
+ bool isHealing = ((hurt.AttackTypes & (int)ServerDamageType.Recovery) != 0 ||
+ (hurt.AttackTypes & (int)ServerDamageType.DamageReverse) != 0) &&
+ (hurt.AttackTypes & (int)ServerDamageType.Damage) == 0 &&
+ (hurt.AttackTypes & (int)ServerDamageType.Realdamage) == 0 &&
+ (hurt.AttackTypes & (int)ServerDamageType.SuckHpReverse) == 0 &&
+ (hurt.AttackTypes & (int)ServerDamageType.SelfHarm) == 0;
+
+ if (isHealing)
+ {
+ // 娌荤枟閫昏緫锛氱洿鎺ュ姞琛�锛屼笉鑰冭檻鎶ょ浘
+ toHp = Math.Min(target.teamHero.maxHp, fromHp + currentHitDamage);
+ }
+ else
+ {
+ // 浼ゅ閫昏緫锛氬厛鎵ｆ姢鐩撅紝鍐嶆墸琛�
+ if (remainSheild < 0)
+ {
+ // 鐩捐鎵撶牬
+ toHp = Math.Max(0, fromHp + remainSheild);
+ }
+ }
+
// 鏇存柊鐩爣琛�閲�
target.teamHero.curHp = toHp;
-
+
#if UNITY_EDITOR
BattleDebug.LogError(
- (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ��") + "\n" +
+ (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ�� ") +
$"鏀诲嚮鑰�: {caster.teamHero.name}\n" +
$"鐩爣: {target.teamHero.name}\n" +
$"鎶�鑳�: {skillConfig.SkillName} (绗瑊_hitIndex}鍑�)\n" +
- $"浼ゅ: {currentHitDamage} (鎬讳激瀹�: {totalDamage})\n" +
- $"琛�閲忓彉鍖�: {fromHp} -> {toHp}"
+ $"浼ゅ: {currentHitDamage} 瀹為檯鍙楀埌浼ゅ: {fromHp-toHp} (鎬讳激瀹�: {totalDamage})\n" +
+ $"鎵夸激鍓嶆姢鐩惧��: {shieldValue}\n" +
+ $"鎵夸激鍚庢姢鐩惧��: {toShieldValue}\n" +
+ $"鎶ょ浘鎵垮彈浼ゅ: {shieldRecieveDamage}\n" +
+ $"鍙嶄激: {currentHitReflectHp}\n" +
+ $"琛�閲忓彉鍖�: {fromHp} -> {toHp}\n" +
+ $"鎶�鑳藉寘閲岀殑琛�閲忔槸: {GeneralDefine.GetFactValue(hurt.CurHP, hurt.CurHPEx)}\n"
);
#endif
+
- // 鍙湪鏈�鍚庝竴鍑绘椂鍚屾HP鍒锋柊鍖�
bool isLastHit = _hitIndex >= skillConfig.DamageDivide.Length - 1;
- if (isLastHit)
- {
- HandleRefreshHP(hurt);
- }
// ============ 绗笁姝�:鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
int objID = (int)target.ObjID;
tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
- // ============ 绗洓姝�:鎵ц琛ㄧ幇(椋樺瓧銆佸姩鐢荤瓑) ============
- target.Hurt(damageList, totalDamage, hurt, skillConfig, _hitIndex, battleDrops, deadPack, fromHp, toHp);
- // ============ 绗簲姝�:澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋� ============
- caster.SuckHp(hurt.SuckHP, skillConfig);
- caster.HurtByReflect(hurt.BounceHP, skillConfig);
+ // 鍙傛暟鎵撳寘
+ BattleHurtParam hurtParam = new BattleHurtParam()
+ {
+ casterObj = caster,
+ hurtObj = target,
+ damageList = damageList,
+ suckHpList = suckHpList, //suckHpList,
+ reflectHpList = reflectHpList,
+ fromHp = fromHp,
+ toHp = toHp,
+ maxHp = target.teamHero.maxHp,
+ fromShieldValue = shieldValue,
+ toShieldValue = toShieldValue,
+ battleDrops = battleDrops,
+ hurt = hurt,
+ hitIndex = _hitIndex,
+ deadPack = deadPack,
+ skillConfig = skillConfig
+ };
+
+ // ============ 绗洓姝�:鎵ц琛ㄧ幇(椋樺瓧銆佸姩鐢荤瓑) ============
+ target.Hurt(hurtParam);
+
+
}
// 澶勭悊HP鍒锋柊鍖咃紙绠�鍖栭�昏緫锛�
- private void HandleRefreshHP(HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
+ private void HandleRefreshHP()
{
// 鏌ユ壘HP鍒锋柊鍖�
HB419_tagSCObjHPRefresh refreshPack = BattleUtility.FindObjHPRefreshPack(packList);
@@ -635,8 +774,8 @@
long assignExp = avgExp + (i < remain ? 1 : 0);
var newPack = new HB405_tagMCAddExp
{
- Exp = (uint)(assignExp % 100000000),
- ExpPoint = (uint)(assignExp / 100000000),
+ Exp = (uint)(assignExp % Constants.ExpPointValue),
+ ExpPoint = (uint)(assignExp / Constants.ExpPointValue),
Source = expPack.Source
};
expAssign[i].Add(newPack);
--
Gitblit v1.8.0