From 7016d72ee1ae6ef22e88d299437dbb45f2e24352 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 09 五月 2019 19:33:58 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 符印功能产出 属性减少指定技能组CD    功能配置 SkillCD

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py              |    8 +++++---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py |    6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index d7dee9c..8d0ac40 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -1095,9 +1095,6 @@
         PlayerGameEvent.TakeoffFishermanEquipment(curPlayer)
     #切地图要清除的buff
     __CheckClearBuffOnMapChange(curPlayer, tick)
-    #上线和切地图加有限无敌Buff
-    if curPlayer.GetLV() > 50:
-        SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_LimitSuperBuff, tick)
             
     #刷新玩家的视野
     if not GameWorld.IsCrossServer() and PlayerControl.GetCrossMapID(curPlayer):
@@ -1448,6 +1445,11 @@
     #if not __CheckGMCanLoadMapOK(curPlayer):
     #    return
     
+    #上线和切地图加有限无敌Buff, 移到切换地图成功,太早发包客户端不显示
+    if curPlayer.GetLV() > 50:
+        SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_LimitSuperBuff, tick)
+    
+    
     #检测账号是否锁定
     if not __CheckForbidLogin(curPlayer):
         return
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 2fb69b6..6bdb52f 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
@@ -33,6 +33,7 @@
 import ShareDefine
 import GameObj
 import PassiveBuffEffMng
+import IpyGameDataPY
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -98,6 +99,11 @@
     curSkill.SetLastUseTick(tick)
     coolDownTime = curSkill.GetCoolDownTime()
     remainTime = coolDownTime
+    
+    skillTypeID = curSkill.GetSkillTypeID()
+    if atkObj and skillTypeID in IpyGameDataPY.GetFuncEvalCfg("SkillCD", 1):
+        reduceSkillCDPer += PlayerControl.GetTheFBSkillsCD(atkObj)
+        
     if isPassiveSkill(curSkill):
         if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
             # 天赋有减CD效果

--
Gitblit v1.8.0