From 217627970593db2f63ddb62d6c3d4c5e787871fe Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 三月 2019 20:43:11 +0800
Subject: [PATCH] 6385 【后端】【2.0】五行灵根开发

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index 2984c64..7581367 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -46,6 +46,7 @@
 import SkillShell
 import FBCommon
 import IpyGameDataPY
+import EquipZhuXian
 #---------------------------------------------------------------------
 GameWorld.ImportAll("Script\\Skill\\" , "GameSkills")
 GameWorld.ImportAll("Script\\Skill\\" , "GameBuffs")
@@ -247,7 +248,8 @@
     #还在冷却时间内无法释放
     if SkillCommon.RefreshSkillRemainTime(playerSkill, tick) != 0:
         PlayerControl.NotifyCode(curPlayer, "UseSkillCDLimit")
-        AttackFailNotify(curPlayer, curSkill, ChConfig.SkillFail_CD)
+        #AttackFailNotify(curPlayer, curSkill, ChConfig.SkillFail_CD)
+        playerSkill.Sync_Skill()
         return False
 
     #5:检查玩家的魔法值是否够用这个技能
@@ -887,6 +889,7 @@
     Def_Attack_DelayTick = 5000
     # tick 误差过大则过滤
     if abs(clientTick - tick) > Def_Attack_DelayTick:
+        curPlayer.Sync_ClientTick()
         GameWorld.DebugLog("tick 误差过大则过滤 > 5000")
         return False
     
@@ -1063,6 +1066,7 @@
 def AttackFailNotify(curPlayer, curSkill, reason=0):
     sendPack = ChPyNetSendPack.tagMCAttackFail()
     sendPack.SkillID = curSkill.GetSkillID()
+    sendPack.Reason = reason
     NetPackCommon.SendFakePack(curPlayer, sendPack)
 #--------------------------玩家使用技能
 #===============================================================================
@@ -1832,8 +1836,11 @@
     
     #升级技能CD直接冷却
     curSkill.SetRemainTime(0)
+    learnSkillNotifyDict = IpyGameDataPY.GetFuncEvalCfg("SPSkillType", 3, {})
     if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill:
         PlayerControl.WorldNotify(0, 'GetMountSkill', [curPlayer.GetName(), curSkillID])
+    elif skillTypeID in learnSkillNotifyDict:
+        PlayerControl.WorldNotify(0, learnSkillNotifyDict[skillTypeID], [curPlayer.GetName(), curSkillID])        
     else:
         #通知技能已升级成功 GeRen_admin_31379
         PlayerControl.NotifyCode(curPlayer, "GeRen_admin_31379", [curSkillID, curSkill.GetSkillLV()])
@@ -1875,6 +1882,11 @@
     if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
         if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):
             return False
+    #诛仙技能学习判断
+    #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_ZhuXian:
+    #    if not EquipZhuXian.CheckLearnZhuXianSkill(curPlayer, curSkillTypeID):
+    #        return False
+        
     #经验检测
     skillLvUpNeedExp = upSkill.GetLVUpCostExp()
     
@@ -2716,7 +2728,8 @@
         if curPlayerSkill.GetFuncType() not in [ChConfig.Def_SkillFuncType_FbSkill,
                                             ChConfig.Def_SkillFuncType_FbSPSkill,
                                             ChConfig.Def_SkillFuncType_GiftSkill,
-                                            ChConfig.Def_SkillFuncType_GWSkill]:
+                                            ChConfig.Def_SkillFuncType_GWSkill,
+                                            ChConfig.Def_SkillFuncType_ZhuXian]:
             # 根据技能情况调整
             continue
         
@@ -3425,7 +3438,7 @@
     
     return curSkill.GetExAttr2()
 
-# 只有在指定地图才能生效的buff效果
+# 只有在指定地图才能生效的buff效果,或者指定地图可被动触发
 def GetAttrMapID(curSkill):
     return curSkill.GetExAttr3()
 

--
Gitblit v1.8.0