From f27986d2eb32e3d2598d15b91c88479797ce5c72 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 13 三月 2019 17:48:37 +0800
Subject: [PATCH] 6328 【后端】优化代码eval - 二进制流 不能直接输出
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 af21d9c..767157b 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")
@@ -1835,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()])
@@ -1878,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()
@@ -2719,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
@@ -3428,7 +3438,7 @@
return curSkill.GetExAttr2()
-# 只有在指定地图才能生效的buff效果
+# 只有在指定地图才能生效的buff效果，或者指定地图可被动触发
def GetAttrMapID(curSkill):
return curSkill.GetExAttr3()
--
Gitblit v1.8.0