From a82c6b75220814b4e498f536754a61d6b28d6de3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 一月 2019 20:58:15 +0800
Subject: [PATCH] 2899 【1.4.100】【1.5】跨服竞技积分超过65535报错
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 52a495c..22c8681 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
@@ -220,11 +220,12 @@
def PlayerLoginMergeServerSkillLogic(curPlayer, tick):
playerID = curPlayer.GetPlayerID()
- if not GameWorld.IsMergeServer():
+ if not GameWorld.IsCrossServer():
GameWorld.DebugLog("非跨服服务器上线不清除buff...", playerID)
return
- ClearBuffSkillTypeIDList = ReadChConfig.GetEvalChConfig("ClearBuffSkillTypeID")
+ #ClearBuffSkillTypeIDList = ReadChConfig.GetEvalChConfig("ClearBuffSkillTypeID")
+ ClearBuffSkillTypeIDList = []
# 跨服服务器上线清除增益/减益buff
GameWorld.Log("跨服服务器上线清除buff...", playerID)
clearBuffList = [] # 先汇总再清除，不然索引会变更
@@ -279,6 +280,15 @@
curSkill.SetRemainTime(0)
GameWorld.DebugLog(" SetRemainTime 0 skillName=%s,skillTypeID=%s"
% (curSkill.GetSkillName(), curSkill.GetSkillTypeID()), playerID)
+ return
+
+def ResetAllSkillCD(curPlayer):
+ skillManager = curPlayer.GetSkillManager()
+ for i in xrange(skillManager.GetSkillCount()):
+ skill = skillManager.GetSkillByIndex(i)
+ if skill.GetRemainTime() != 0:
+ skill.SetRemainTime(0)
+ skill.Sync_Skill()
return
## 刷新玩家所有技能的剩余时间(上线)
@@ -1222,6 +1232,9 @@
notifyLostValue = lostValue
curObjHP_BeforeAttack = GameObj.GetHP(curObj)
+ if curObjHP_BeforeAttack == 0:
+ # 没有血量不能再触发
+ return
if reduceHP :
lostValue = AttackCommon.CalcAtkProDef(buffOwner, curObj, lostValue, curSkill, tick)
--
Gitblit v1.8.0