From ed98029a88cd89702980ac7c40b711afddc5aeb2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十一月 2025 14:44:59 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/Skill/SkillBase.cs | 407 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 319 insertions(+), 88 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 43eb4e1..be236e3 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -17,24 +17,27 @@
189f / 255f);
protected SkillEffect skillEffect;
- protected HB427_tagSCUseSkill tagUseSkillAttack;
+ public HB427_tagSCUseSkill tagUseSkillAttack;
public SkillConfig skillConfig;
protected bool isFinished = false;
protected BattleField battleField = null; // 鎴樺満
protected RectTransform targetNode = null; // 鐩爣鑺傜偣
- protected BattleObject caster = null; // 鏂芥硶鑰�
+ public BattleObject caster = null; // 鏂芥硶鑰�
protected List<GameNetPackBasic> packList;
protected List<SkillRecordAction> otherSkillActionList = new List<SkillRecordAction>();
protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
protected bool moveFinished = false;
- public int fromSkillId;
+ public SkillBase fromSkill;
public bool isPlay = false;
private float MoveSpeed = 750f;
private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
private Dictionary<int, HB422_tagMCTurnFightObjDead> tempDeadPackList = new Dictionary<int, HB422_tagMCTurnFightObjDead>();
+
+ protected List<HB428_tagSCBuffRefresh> buffCollections = new List<HB428_tagSCBuffRefresh>();
+
// 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
@@ -150,7 +153,7 @@
if (hintConfig != null)
{
- caster.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true);
+ caster.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
// Debug.Break();
}
}
@@ -161,6 +164,7 @@
// 鏍规嵁閲婃斁妯″紡鎵ц鐩稿簲閫昏緫
switch (skillConfig.castMode)
{
+ case SkillCastMode.None:
case SkillCastMode.Self:
CastImpl(OnAttackFinish);
break;
@@ -215,7 +219,7 @@
return;
}
- int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(this, caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
@@ -335,14 +339,24 @@
public void OnSkillStart()
{
HandleDead();
- skillEffect = SkillEffectFactory.CreateSkillEffect(caster, skillConfig, tagUseSkillAttack);
+
+ skillEffect = SkillEffectFactory.CreateSkillEffect(this, caster, skillConfig, tagUseSkillAttack);
skillEffect.Play(OnHitTargets);
foreach (var subSkillPack in tagUseSkillAttack.subSkillList)
{
SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, new List<GameNetPackBasic>() { subSkillPack });
+ recordAction.fromSkill = this;
otherSkillActionList.Add(recordAction);
battleField.recordPlayer.ImmediatelyPlay(recordAction);
}
+ foreach (var subCombinePack in tagUseSkillAttack.subSkillCombinePackList)
+ {
+ SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, subCombinePack.packList);
+ recordAction.fromSkill = this;
+ otherSkillActionList.Add(recordAction);
+ battleField.recordPlayer.ImmediatelyPlay(recordAction);
+ }
+
isPlay = true;
}
@@ -370,6 +384,7 @@
// 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
public virtual void OnFinalFrameEnd()
{
+
skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
}
@@ -384,18 +399,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();
@@ -412,11 +427,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)
{
@@ -428,40 +455,202 @@
}
}
- // 澶勭悊鍗曚釜鐩爣琚懡涓細搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+ // 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)
{
- List<int> damageDivide = new List<int>();
- if (_hitIndex == 0 && skillConfig.DamageDivide.Length <= 0)
+ // 璁＄畻鎬讳激瀹冲拰鍒嗘浼ゅ鍒楄〃
+ long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+ List<long> damageList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalDamage);
+
+ long totalSuckHp = suckHp;
+ List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalSuckHp);
+
+ long totalReflectHp = hurt.BounceHP;
+ List<long> reflectHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalReflectHp);
+
+ // 璁＄畻褰撳墠杩欎竴鍑荤殑鍚勯」鏁板��
+ long currentHitDamage = 0;
+ foreach (long dmg in damageList)
{
- damageDivide.Add(10000);
+ currentHitDamage += dmg;
+ }
+
+ long currentHitSuckHp = 0;
+ foreach (long suck in suckHpList)
+ {
+ currentHitSuckHp += suck;
+ }
+
+ long currentHitReflectHp = 0;
+ foreach (long reflect in reflectHpList)
+ {
+ currentHitReflectHp += reflect;
+ }
+
+ // ============ 绗簩姝�:鑾峰彇鐩爣褰撳墠鐘舵�� ============
+ long fromHp = target.teamHero.curHp;
+ long maxHp = target.teamHero.maxHp;
+ long fromShieldValue = target.buffMgr.GetShieldValue();
+
+ // 鍒ゆ柇鏄不鐤楄繕鏄激瀹�
+ bool isHealing = BattleUtility.IsHealing(hurt);
+
+ // ============ 绗笁姝�:璁＄畻鐩爣琛�閲忓拰鎶ょ浘鍙樺寲 ============
+ long toHp;
+ long toShieldValue;
+
+ if (isHealing)
+ {
+ // 娌荤枟閫昏緫锛氱洿鎺ュ姞琛�锛屾姢鐩句笉鍙�
+ toHp = Math.Min(maxHp, fromHp + currentHitDamage);
+ toShieldValue = fromShieldValue;
}
else
{
- if (skillConfig.DamageDivide.Length <= _hitIndex)
+ // 浼ゅ閫昏緫锛氬厛鎵ｆ姢鐩撅紝鎶ょ浘涓嶈冻鍐嶆墸琛�
+ if (fromShieldValue >= currentHitDamage)
{
- Debug.LogError("鎶�鑳戒激瀹冲垎甯冮厤缃敊璇� skillId: " + skillConfig.SkillID + " hitIndex: " + _hitIndex);
- damageDivide.Add(10000);
+ // 鎶ょ浘瓒冲鎵垮彈鎵�鏈変激瀹�
+ toShieldValue = fromShieldValue - currentHitDamage;
+ toHp = fromHp;
}
else
{
- damageDivide = skillConfig.DamageDivide[_hitIndex].ToList();
+ // 鎶ょ浘涓嶈冻锛屽厛鎵ｅ畬鎶ょ浘锛屽墿浣欎激瀹虫墸琛�
+ long remainingDamage = currentHitDamage - fromShieldValue;
+ toShieldValue = 0;
+ toHp = Math.Max(0, fromHp - remainingDamage);
}
}
- // 浼ゅ鍒嗗竷璁＄畻鍜屽簲鐢�
- long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
- List<long> damageList = BattleUtility.DivideDamageToList(damageDivide.ToArray(), totalDamage);
+ // ============ 绗洓姝�:鏇存柊鐩爣瀹為檯琛�閲� ============
+ target.teamHero.curHp = toHp;
- // 鑾峰彇涓存椂鏁版嵁骞跺簲鐢ㄤ激瀹�
+ // ============ 绗簲姝�:璁＄畻骞舵洿鏂版柦娉曡�呰閲忓彉鍖� ============
+ long casterFromHp = caster.teamHero.curHp;
+ long casterMaxHp = caster.teamHero.maxHp;
+ long casterToHp = casterFromHp;
+
+ // 澶勭悊鍚歌
+ if (currentHitSuckHp > 0)
+ {
+ casterToHp = Math.Min(casterMaxHp, casterToHp + currentHitSuckHp);
+ }
+
+ // 澶勭悊鍙嶄激(鏂芥硶鑰呭彈鍒颁激瀹�)
+ if (currentHitReflectHp > 0)
+ {
+ long casterShieldValue = caster.buffMgr.GetShieldValue();
+ if (casterShieldValue >= currentHitReflectHp)
+ {
+ // 鏂芥硶鑰呮姢鐩捐冻澶�,琛�閲忎笉鍙�
+ }
+ else
+ {
+ // 鏂芥硶鑰呮姢鐩句笉瓒�,鎵ｈ
+ long remainingReflect = currentHitReflectHp - casterShieldValue;
+ casterToHp = Math.Max(0, casterToHp - remainingReflect);
+ }
+ }
+
+ // 鏇存柊鏂芥硶鑰呰閲�
+ caster.teamHero.curHp = casterToHp;
+
+#if UNITY_EDITOR
+ BattleDebug.LogError(
+ (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ�� ") +
+ $"鏀诲嚮鑰�: {caster.teamHero.name}\n" +
+ $"鐩爣: {target.teamHero.name}\n" +
+ $"鎶�鑳�: {skillConfig.SkillName} (绗瑊_hitIndex}鍑�)\n" +
+ $"浼ゅ: {currentHitDamage} (鎬讳激瀹�: {totalDamage})\n" +
+ $"鍚歌: {currentHitSuckHp}\n" +
+ $"鍙嶄激: {currentHitReflectHp}\n" +
+ $"鐩爣鎶ょ浘鍙樺寲: {fromShieldValue} -> {toShieldValue}\n" +
+ $"鐩爣琛�閲忓彉鍖�: {fromHp} -> {toHp}\n" +
+ $"鏂芥硶鑰呰閲忓彉鍖�: {casterFromHp} -> {casterToHp}\n"
+ );
+#endif
+
+ // ============ 绗叚姝�:鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
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);
- // 澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋�
- caster.SuckHp(hurt.SuckHP, skillConfig);
- caster.HurtByReflect(hurt.BounceHP, skillConfig);
+ // ============ 绗竷姝�:鍙傛暟鎵撳寘骞惰皟鐢ㄧ洰鏍嘓urt ============
+ BattleHurtParam hurtParam = new BattleHurtParam()
+ {
+ casterObj = caster,
+ hurtObj = target,
+ damageList = damageList,
+ suckHpList = suckHpList, // 鐢ㄤ簬casterDamageList椋樺瓧
+ reflectHpList = reflectHpList, // 鐢ㄤ簬casterDamageList椋樺瓧
+ fromHp = fromHp,
+ toHp = toHp,
+ maxHp = maxHp,
+ fromShieldValue = fromShieldValue,
+ toShieldValue = toShieldValue,
+ battleDrops = battleDrops,
+ hurt = hurt,
+ hitIndex = _hitIndex,
+ deadPack = deadPack,
+ skillConfig = skillConfig
+ };
+
+ target.Hurt(hurtParam);
+ }
+
+ // 澶勭悊HP鍒锋柊鍖咃紙绠�鍖栭�昏緫锛�
+ private void HandleRefreshHP()
+ {
+ // 鏌ユ壘HP鍒锋柊鍖�
+ HB419_tagSCObjHPRefresh refreshPack = BattleUtility.FindObjHPRefreshPack(packList);
+
+ if (refreshPack != null)
+ {
+ // 鍒嗗彂HP鍒锋柊鍖�
+ PackageRegedit.Distribute(refreshPack);
+ packList.Remove(refreshPack);
+ }
}
// 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
@@ -579,8 +768,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);
@@ -694,7 +883,7 @@
if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
{
var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
+ otherSkillAction.fromSkill = this;
otherSkillAction.ForceFinish();
}
else
@@ -712,76 +901,118 @@
// 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
// try
// {
- while (true)
+ while (true)
+ {
+ // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null && !skillEffect.IsFinished())
+ return;
+
+ if (skillEffect != null)
{
- // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
- if (skillEffect != null && !skillEffect.IsFinished())
- return;
-
- if (skillEffect != null)
+ skillEffect = null;
+ continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
+ }
+
+ // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+ if (otherSkillActionList.Count > 0)
+ {
+ bool hasFinishedAction = false;
+ for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
{
- skillEffect = null;
+ var action = otherSkillActionList[i];
+ if (action.IsFinished())
+ {
+ otherSkillActionList.RemoveAt(i);
+ hasFinishedAction = true;
+ }
+ }
+ if (hasFinishedAction)
+ {
continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
}
-
- // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
- if (otherSkillActionList.Count > 0)
- {
- bool hasFinishedAction = false;
- for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
- {
- var action = otherSkillActionList[i];
- if (action.IsFinished())
- {
- otherSkillActionList.RemoveAt(i);
- hasFinishedAction = true;
- }
- }
- if (hasFinishedAction)
- {
- continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
- }
- return;
- }
-
- break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ return;
}
- // 澶勭悊鍓╀綑鍖�
- while (packList.Count > 0)
- {
- var pack = packList[0];
- packList.RemoveAt(0);
+ break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ }
- if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
- var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
- otherSkillActionList.Add(otherSkillAction);
- return;
- }
-
- if (pack is CustomB421ActionPack actionPack)
- {
- actionPack.Distribute();
- }
- else
- {
- PackageRegedit.Distribute(pack);
- }
- }
- // }
- // catch (Exception ex)
- // {
- // Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
- // // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
- // isFinished = true;
- // throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
- // }
+ // 澶勭悊鍓╀綑鍖�
+ if (!ResolvePackList())
+ {
+ return;
+ }
+ // }
+ // catch (Exception ex)
+ // {
+ // Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
+ // // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
+ // isFinished = true;
+ // throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
+ // }
isFinished = true;
}
+
+ protected virtual bool ResolvePackList()
+ {
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
+
+ if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+ {
+ BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+ var otherSkillAction = combinePack.CreateSkillAction();
+ otherSkillAction.fromSkill = this;
+ otherSkillActionList.Add(otherSkillAction);
+ return false;
+ }
+ else if (pack is HB428_tagSCBuffRefresh buffRefresh)
+ {
+ // 浠庢壘鍒扮涓�涓狧B428寮�濮� 鎵惧嚭杩炵画鐨凥B428_tagSCBuffRefresh鍖� 濡傛灉鎵惧埌涓�涓狟428鍚� 涔嬪悗纰板埌闈濰B428鍖呭氨鍋滄
+ buffCollections.Add(buffRefresh);
+ while (packList.Count > 0)
+ {
+ var nextPack = packList[0];
+ if (nextPack is HB428_tagSCBuffRefresh nextBuffRefresh)
+ {
+ buffCollections.Add(nextBuffRefresh);
+ packList.RemoveAt(0);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ // 鍚屾椂鍒锋柊鎵�鏈夊璞＄殑buff锛屼笉鍒嗙粍
+ foreach (var buff in buffCollections)
+ {
+ BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buff.ObjID);
+ if (battleObj != null)
+ {
+ battleObj.buffMgr.RefreshBuff(buff, true);
+ }
+ }
+
+ // 娓呯┖宸插鐞嗙殑buff闆嗗悎
+ buffCollections.Clear();
+ continue;
+ }
+
+ if (pack is CustomB421ActionPack actionPack)
+ {
+ actionPack.Distribute();
+ }
+ else
+ {
+ PackageRegedit.Distribute(pack);
+ }
+ }
+
+ return true;
+ }
// 娣诲姞娓呯悊鏂规硶锛氶槻姝㈠唴瀛樻硠婕�
public virtual void Cleanup()
--
Gitblit v1.8.0