From 37e044190ad9c4cd98e3ecc42762379676bd6c23 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 四月 2019 11:44:18 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
index d4824e2..1350bb9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
@@ -552,10 +552,14 @@
if not useSkill or useSkill.GetSkillTypeID() == 0:
break
+ useSkillTypeID = useSkill.GetSkillTypeID()
# 找到可学习的技能
- learnSkillID = useSkill.GetSkillTypeID() + skillLV
+ learnSkillID = useSkillTypeID + skillLV
findSkill = GameWorld.GetGameData().GetSkillBySkillID(learnSkillID)
if not findSkill:
+ continue
+ if findSkill.GetSkillTypeID() != useSkillTypeID:
+ # 不是同一个技能
continue
learnSkillIDList.append(learnSkillID)
@@ -1291,6 +1295,8 @@
# 已广播的不重复
GameObj.SetHP(curObj, remainHP, not view)
+ AttackCommon.WriteHurtLog(buffOwner, curObj, curSkill, lostValue, hurtType, "持续掉血")
+
if view:
#广播伤血类型
AttackCommon.ChangeHPView(curObj, buffOwner, skillTypeID, notifyLostValue, hurtType)
@@ -1305,6 +1311,7 @@
AttackCommon.DoLogic_ObjDead(None, curObj, curSkill, tick)
return
+
#NPC需要手动添加伤血和仇恨, 因为无调用DoAttack
if curObjType == IPY_GameWorld.gotNPC:
@@ -1681,11 +1688,13 @@
return True
buffSkill = curObjBuff.GetSkill()
- buffSkillLV = buffSkill.GetSkillLV()
- #已存在更强大的效果
- if buffSkillLV > curSkillLV:
- return
+ #buff根据情况可以叠加低级，或者低级覆盖高级
+# buffSkillLV = buffSkill.GetSkillLV()
+#
+# #已存在更强大的效果
+# if buffSkillLV > curSkillLV:
+# return
if not buffSkill.GetLastTime():
#GameWorld.DebugLog("无时间限制buff，只要存在buff，则无需重复添加")
--
Gitblit v1.8.0