From 78f005e3fe86b6033255b37b03061cb491812dcb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 15:07:35 +0800
Subject: [PATCH] 2936 【1.5.100】诛仙塔挑战失败也会给予奖励并扣除次数

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 bd403bc..b69e8ad 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")
@@ -888,6 +889,7 @@
     Def_Attack_DelayTick = 5000
     # tick 误差过大则过滤
     if abs(clientTick - tick) > Def_Attack_DelayTick:
+        curPlayer.Sync_ClientTick()
         GameWorld.DebugLog("tick 误差过大则过滤 > 5000")
         return False
     
@@ -1834,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()])
@@ -1877,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()
     
@@ -2718,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
         

--
Gitblit v1.8.0