From f6aaf59a776481f03817a1534b72f765164ef75e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 31 八月 2018 11:34:33 +0800
Subject: [PATCH] 0 删除旧版本技能增强代码
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py | 2
/dev/null | 381 ------------------------------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 12 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 15 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py | 3
5 files changed, 1 insertions(+), 412 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 46eefa4..26c9c8e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4292,21 +4292,6 @@
TriggerType_OneDamage, # 伤害降低到1点 49
) = range(1, 50)
-#增强类型定义，参考SkillBoosts下的SkillBoost_文件
-BoostType_HappenRate = 4 # 触发几率特殊处理 - 增强
-WeakenType_HappenRate = 104 # 触发几率特殊处理 - 减弱
-
-#MapConfig表中的索引定义-----------------------------------------------------------
-# 表SkillBoostEffDropRate 中的 列表索引定义
-(
-Def_SkillBoostTable_SkillTypeID,
-Def_SkillBoostTable_BoostType,
-Def_SkillBoostTable_SkillEffectID,
-Def_SkillBoostTable_ParentSkillTypeID, # 相对Def_SkillBoostTable_SkillTypeID的父技能如召唤
-Def_SkillBoostTable_MinValue,
-Def_SkillBoostTable_MaxValue,
-Def_SkillBoostTable_NotifyValue,
-) = range(7)
# NPC功能类型定义
Def_NPCFuncType_Goblin = 70 # 盗宝哥布林
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
index b486d54..3c5acc9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
@@ -21,7 +21,6 @@
import BaseAttack
import IPY_GameWorld
import ItemControler
-import SkillDataBoost
import GameObj
import SkillCommon
@@ -119,8 +118,6 @@
summonNPC.SetVisible(True)
summonNPC.SetCanAttack(False)
- #SkillDataBoost.SetSummonNPCSkillBoost(curPlayer, summonNPC, curSkill)
-
return True
def DoLogic_NPC_UseSkill_SummonNPC(curNPC, curSkill, summonNPCID, tagRoundPosX, tagRoundPosY, tick):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
index b852b8c..f894fb4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -26,7 +26,6 @@
import GameWorld
import ChConfig
import IpyGameDataPY
-#import SkillBoosts
import SkillCommon
import BuffSkill
import SkillShell
@@ -43,7 +42,6 @@
import PetControl
import QuestCommon
-#GameWorld.ImportAll("Script\\Skill\\", "SkillBoosts")
GameWorld.ImportAll("Script\\Skill\\", "PassiveBuff")
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.py
deleted file mode 100644
index 8d5d1f2..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_1
-#
-# @todo: 技能伤害增加
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#---------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-import SkillCommon
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
-
- effect = SkillCommon.GetSkillEffectByEffectID(skillData, effectID)
- if effect is None:
- return
-
- effect.AddEffectValue(0, value)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.py
deleted file mode 100644
index 8e3d1c6..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_2
-#
-# @todo: 减少冷却时间
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
- skillData.ReduceCoolDownTime(value)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.py
deleted file mode 100644
index e770947..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_3
-#
-# @todo: 持续时间延长
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
- skillData.AddLastTime(value)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.py
deleted file mode 100644
index 01e8835..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_5
-#
-# @todo: BUFF效果增强值 释放时不需要通过effectValue计算的
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-import SkillCommon
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
-
- skillData.AddBuffValueEff(effectID, value)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.py
deleted file mode 100644
index a02ef19..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_6
-#
-# @todo: BUFF效果增强A值
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-import SkillCommon
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
-
- effect = SkillCommon.GetSkillEffectByEffectID(skillData, effectID)
- if effect is None:
- return
-
- effect.AddEffectValue(0, value)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.py
deleted file mode 100644
index 53eee85..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillBoost_7
-#
-# @todo: BUFF效果增强B值
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------
-"""Version = 2013-10-31 14:45"""
-
-import SkillCommon
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
-
- effect = SkillCommon.GetSkillEffectByEffectID(skillData, effectID)
- if effect is None:
- return
-
- effect.AddEffectValue(1, value)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.py
deleted file mode 100644
index a180317..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-# @todo: 技能伤害增加1010和1009效果
-#
-# @author: Alee
-# @date 2017-12-7 下午04:48:02
-# @version 1.0
-#
-# @note: 主技能攻击类受其他技能效果4000的影响
-#
-#---------------------------------------------------------------------
-
-import SkillCommon
-import ChConfig
-import GameWorld
-
-
-## 技能增强效果改变技能数据
-# @param skillData 主释放技能 passiveEffect影响的被动效果
-# @return None
-def OnCalcSkillAttr(skillData, passiveEffect):
-
- #
- skillType = skillData.GetSkillType()
- if skillType == ChConfig.Def_SkillType_Atk:
- # 直接的攻击类技能改变效果值
- effect = SkillCommon.GetSkillEffectByEffectID(skillData, ChConfig.Def_Skill_Effect_Attack)
- if effect:
- effect.AddEffectValue(0, passiveEffect.GetEffectValue(1))
-
- effect = SkillCommon.GetSkillEffectByEffectID(skillData, ChConfig.Def_Skill_Effect_AttackReplace)
- if effect:
- effect.AddEffectValue(0, passiveEffect.GetEffectValue(1))
-
- return True
-
- elif skillType == ChConfig.Def_SkillType_LstPlsBuffAtk:
- # buffvalue第一个用于存储次数，第二个用于存储增加伤害值百分比
- skillData.AddBuffValueEx(1, passiveEffect.GetEffectValue(1))
-
- return True
-
- return False
-
-# 概率触发
-def CheckHappen(skillData, passiveEffect):
- skillType = skillData.GetSkillType()
- if skillType not in [ChConfig.Def_SkillType_Atk, ChConfig.Def_SkillType_LstPlsBuffAtk]:
- return False
-
- if not GameWorld.CanHappen(passiveEffect.GetEffectValue(2)):
- return False
- return True
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.py
deleted file mode 100644
index 2b597ea..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Skill.SkillBoosts.SkillWeaken_103
-#
-# @todo:持续时间减少
-# @author hxp
-# @date 2016-11-16
-# @version 1.0
-#
-# 详细描述: 持续时间减少
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2016-11-16 15:30"""
-#-------------------------------------------------------------------------------
-
-
-## 技能增强效果改变技能数据
-# @param value 增强值
-# @return None
-def OnCalcSkillValue(skillData, effectID, value):
- skillData.DecLastTime(value)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.py
+++ /dev/null
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.py
deleted file mode 100644
index a3faf60..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.py
+++ /dev/null
@@ -1,381 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package SkillDataBoost
-#
-# @todo: 技能增强效果功能
-# @author Alee
-# @date 2013-10-31 14:45
-# @version 1.3
-#
-# 详细描述:
-# @change: "2013-11-01 14:45" Alee 修正NPC增强特效
-# @change: "2015-03-05 14:30" hxp 增加被动buff增强效果
-# @change: "2016-11-16 15:30" hxp 增加被动buff衰弱效果
-#---------------------------------------------------------------------
-#"""Version = 2016-11-16 15:30"""
-#---------------------------------------------------------------------
-
-import PassiveBuffEffMng
-import IPY_GameWorld
-import PySkillManager
-import ChConfig
-import ItemControler
-import SkillCommon
-import SkillBoosts
-import GameWorld
-import BuffSkill
-#导入
-GameWorld.ImportAll("Script\\Skill\\", "SkillBoosts")
-
-# 计算列表索引
-#[技能ID， 增强类型，技能效果ID，父技能（如召唤），数值]
-(
-Def_SkillTypeID, # 技能ID
-Def_BoostType, # 增强类型
-Def_SkillEffectID, # 技能效果ID
-Def_ParentSkillTypeID, # 父技能（如召唤）
-Def_BoostValue, # 数值
-) = range(5)
-
-# 计算减弱列表索引
-#[技能ID， 减弱类型，技能效果ID，父技能（如召唤），针对的buff状态值, 数值]
-(
-Def_WeakSkillTypeID, # 减弱的技能ID
-Def_WeakType, # 减弱类型
-Def_WeakSkillEffectID, # 技能效果ID
-Def_WeakParentSkillTypeID, # 父技能（如召唤）
-Def_WeakBuffState, # 针对的技能buff状态值
-Def_WeakValue, # 数值
-) = range(6)
-
-
-##技能增强改变skilldata结构
-# @param isEnhanceSkill 是否附加技能
-# @return skilldata
-def ChangeSkillData(attacker, defender, skillData, isEnhanceSkill):
- # 处理攻击方增强
- #skillData = __BoostSkillData(attacker, skillData, isEnhanceSkill)
- # 处理防守方减弱
- #skillData = __WeakenSkillData(defender, skillData, isEnhanceSkill)
- return skillData
-
-def __BoostSkillData(attacker, skillData, isEnhanceSkill):
- # 技能增强处理
- atkObjType = attacker.GetGameObjType()
- skillBoostList = []
-
- # 找到增强队列
- if atkObjType == IPY_GameWorld.gotNPC:
- if attacker.GetDictByKey(ChConfig.Def_SummonBoost_Count) == 0:
- #技能未增强
- return skillData
-
- #NPC 这边要建立列表
- skillBoostList = GetNPCSkillBoostList(attacker)
-
- elif atkObjType == IPY_GameWorld.gotPlayer:
-
- #被动buff增强
- passiveBuffBoostList = []#PassiveBuffEffMng.GetPassiveSkillBoostList(attacker)
- skillBoostList.extend(passiveBuffBoostList)
-
- if skillBoostList == []:
- #没有增强效果队列退出
- return skillData
-
- skillTypeID = skillData.GetSkillTypeID()
- needBoost = False
- for tmpList in skillBoostList:
- if skillTypeID == tmpList[Def_SkillTypeID] \
- and tmpList[Def_BoostType] != ChConfig.BoostType_HappenRate:
- needBoost = True
- break
-
- if not needBoost:
- #该技能不在增强效果中退出
- return skillData
-
- # 触发技能和主动技能需分开处理，否则数据错乱
- if isEnhanceSkill:
- PySkillManager.Py_SkillDataTrigger.CopySkillData(skillData)
- skillData = PySkillManager.Py_SkillDataTrigger
- else:
- PySkillManager.Py_SkillData.CopySkillData(skillData)
- skillData = PySkillManager.Py_SkillData
-
- #有对应增强效果的处理
- for skillBoostInfo in skillBoostList:
- if skillTypeID != skillBoostInfo[Def_SkillTypeID]:
- continue
-
- pyName = "SkillBoost_%s"%skillBoostInfo[Def_BoostType]
- callFunc = GameWorld.GetExecFunc(SkillBoosts, "%s.OnCalcSkillValue"%pyName)
-
- if callFunc is None:
- continue
-
- callFunc(skillData, skillBoostInfo[Def_SkillEffectID], skillBoostInfo[Def_BoostValue])
- return skillData
-
-def __WeakenSkillData(defender, skillData, isEnhanceSkill):
- # 技能减弱处理
-
- if not defender:
- return skillData
-
- objType = defender.GetGameObjType()
- skillWeakenList = []
-
- # 找到减弱队列
- if objType == IPY_GameWorld.gotPlayer:
- #被动buff减弱
- passiveBuffWeakenList = []#PassiveBuffEffMng.GetPassiveSkillWeakenList(defender)
- skillWeakenList.extend(passiveBuffWeakenList)
-
- if skillWeakenList == []:
- #没有减弱效果队列退出
- return skillData
-
- skillTypeID = skillData.GetSkillTypeID()
- needWeaken = False
- for tmpList in skillWeakenList:
- if tmpList[Def_WeakType] == ChConfig.WeakenType_HappenRate:
- continue
- if skillTypeID == tmpList[Def_WeakSkillTypeID] or tmpList[Def_WeakSkillTypeID] == 0:
- needWeaken = True
- break
-
- if not needWeaken:
- #该技能不在减弱效果中退出
- return skillData
-
- # 触发技能和主动技能需分开处理，否则数据错乱
- if not isinstance(skillData, PySkillManager.PySkillData):
- if isEnhanceSkill:
- PySkillManager.Py_SkillDataTrigger.CopySkillData(skillData)
- skillData = PySkillManager.Py_SkillDataTrigger
- else:
- PySkillManager.Py_SkillData.CopySkillData(skillData)
- skillData = PySkillManager.Py_SkillData
-
- curBuffStateType = None
-
- #有对应增强效果的处理
- for skillWeakenInfo in skillWeakenList:
- # 为0时针对所有技能
- if skillWeakenInfo[Def_WeakSkillTypeID] > 0 and skillTypeID != skillWeakenInfo[Def_WeakSkillTypeID]:
- continue
-
- weakBuffState = skillWeakenInfo[Def_WeakBuffState]
- if weakBuffState > 0:
- if curBuffStateType is None:
- curBuffStateType = SkillCommon.GetBuffStateType(skillData)
- if not curBuffStateType:
- # 该buff无buff类型，针对的buff无效
- continue
- if not weakBuffState & pow(2, curBuffStateType):
- # 该buff类型不是所针对的buff, 无效
- continue
-
- pyName = "SkillWeaken_%s" % skillWeakenInfo[Def_WeakType]
- callFunc = GameWorld.GetExecFunc(SkillBoosts, "%s.OnCalcSkillValue"%pyName)
-
- if callFunc is None:
- continue
-
- callFunc(skillData, skillWeakenInfo[Def_WeakSkillEffectID], skillWeakenInfo[Def_WeakValue])
- return skillData
-
-## 召唤兽效果增强逻辑
-# @param None
-# @return None
-def SetSummonNPCSkillBoost(curPlayer, summonNPC, curSkill):
- #召唤前清空
- summonNPC.SetDict(ChConfig.Def_SummonBoost_Count, 0)
-
- skillBoostList = []
-# #玩家需判定武器
-# itemControl = ItemControler.PlayerItemControler(curPlayer)
-# skillBoostList = itemControl.GetSkillBoostList()
-
- #被动buff增强
- passiveBuffBoostList = []#PassiveBuffEffMng.GetPassiveSkillBoostList(curPlayer)
- skillBoostList.extend(passiveBuffBoostList)
-
- skillTypeID = curSkill.GetSkillTypeID()
-
- summonSkillBoostList = []
- for tmpList in skillBoostList:
- # 如果主技能有多个可以考虑改成子列表
- if skillTypeID == tmpList[Def_ParentSkillTypeID]:
- summonSkillBoostList.append(tmpList)
-
- if summonSkillBoostList == []:
- return
-
- summonNPC.SetDict(ChConfig.Def_SummonBoost_Count, len(summonSkillBoostList))
- # 如果列表过长可以考虑记录技能增强索引和数值，其他值由表取
- for i, tmpList in enumerate(summonSkillBoostList):
- summonNPC.SetDict(ChConfig.Def_SummonBoost_SkillTypeID%i, tmpList[Def_SkillTypeID])
- summonNPC.SetDict(ChConfig.Def_SummonBoost_BoostType%i, tmpList[Def_BoostType])
- summonNPC.SetDict(ChConfig.Def_SummonBoost_EffectID%i, tmpList[Def_SkillEffectID])
- summonNPC.SetDict(ChConfig.Def_SummonBoost_ParentID%i, 0) # 子技能不再记录
- summonNPC.SetDict(ChConfig.Def_SummonBoost_Value%i, tmpList[Def_BoostValue])
-
- return
-
-
-## 存储NPC（召唤）技能增强效果
-# @param None
-# @return None
-def GetNPCSkillBoostList(curNPC):
- skillBoostList = []
- for i in xrange(curNPC.GetDictByKey(ChConfig.Def_SummonBoost_Count)):
- skillBoostList.append([curNPC.GetDictByKey(ChConfig.Def_SummonBoost_SkillTypeID%i),
- curNPC.GetDictByKey(ChConfig.Def_SummonBoost_BoostType%i),
- curNPC.GetDictByKey(ChConfig.Def_SummonBoost_EffectID%i),
- curNPC.GetDictByKey(ChConfig.Def_SummonBoost_ParentID%i),
- curNPC.GetDictByKey(ChConfig.Def_SummonBoost_Value%i)])
-
- return skillBoostList
-
-
-## 通过技能增强效果类型找出自身的增强效果值
-# @param boostType 增强类型
-# @return 增强值
-def GetSkillBoostValeByType(attacker, skillData, boostType):
- atkObjType = attacker.GetGameObjType()
- skillBoostList = []
-
- # 找到增强队列
- if atkObjType == IPY_GameWorld.gotNPC:
- if attacker.GetDictByKey(ChConfig.Def_SummonBoost_Count) == 0:
- #技能未增强
- return 0
-
- #NPC 这边要建立列表
- skillBoostList = GetNPCSkillBoostList(attacker)
-
- elif atkObjType == IPY_GameWorld.gotPlayer:
-# #玩家需判定武器
-# itemControl = ItemControler.PlayerItemControler(attacker)
-# skillBoostList = itemControl.GetSkillBoostList()
-
- #被动buff增强
- passiveBuffBoostList = []#PassiveBuffEffMng.GetPassiveSkillBoostList(attacker)
- skillBoostList.extend(passiveBuffBoostList)
-
- if skillBoostList == []:
- #没有增强效果队列退出
- return 0
-
- skillTypeID = skillData.GetSkillTypeID()
-
- addValue = 0
- for tmpList in skillBoostList:
- if skillTypeID == tmpList[Def_SkillTypeID] and tmpList[Def_BoostType] == boostType:
- addValue += tmpList[Def_BoostValue]
-
- return addValue
-
-## 通过技能减弱效果类型找出自身的减弱效果值
-# @return 减弱效果值
-def GetSkillWeakenValeByType(curPlayer, skillData, weakType):
- if not curPlayer:
- return 0
- objType = curPlayer.GetGameObjType()
- skillWeakList = []
-
- if objType == IPY_GameWorld.gotPlayer:
- #被动buff
- passiveBuffWeakList = []#PassiveBuffEffMng.GetPassiveSkillWeakenList(curPlayer)
- skillWeakList.extend(passiveBuffWeakList)
-
- if skillWeakList == []:
- return 0
-
- skillTypeID = skillData.GetSkillTypeID()
-
- weakValue = 0
- curBuffStateType = None
- for tmpList in skillWeakList:
- # 为0时针对所有技能
- if tmpList[Def_WeakSkillTypeID] > 0 and skillTypeID != tmpList[Def_WeakSkillTypeID]:
- continue
-
- if tmpList[Def_WeakType] != weakType:
- continue
-
- weakBuffState = tmpList[Def_WeakBuffState]
- if weakBuffState > 0:
- if curBuffStateType is None:
- curBuffStateType = SkillCommon.GetBuffStateType(skillData)
- if not curBuffStateType:
- # 该buff无buff类型，针对的buff无效
- continue
- if not weakBuffState & pow(2, curBuffStateType):
- # 该buff类型不是所针对的buff, 无效
- continue
-
- weakValue += tmpList[Def_WeakValue]
-
- return weakValue
-
-
-## 通过效果ID获得技能增强效果添加的BUFF增强值
-# @param None
-# @return None
-def GetBuffValueByEffectID(curSkill, effectID):
- boostBuffValue = 0
- if hasattr(curSkill, 'GetBuffValueByEffectID'):
- boostBuffValue = getattr(curSkill, 'GetBuffValueByEffectID')(effectID)
-
- return boostBuffValue
-
-## 通过效果ID获得技能增强效果添加的BUFF增强值
-# @param None
-# @return None
-def GetBuffValueDict(curSkill, effectID):
- tmpDict = {}
- if hasattr(curSkill, 'GetBuffValueDict'):
- tmpDict = getattr(curSkill, 'GetBuffValueDict')()
-
- return tmpDict
-
-#===============================================================================
-#
-# def AffectedSkillData(attacker, skillData, isEnhanceSkill):
-# # 技能增强处理
-# atkObjType = attacker.GetGameObjType()
-#
-# if atkObjType != IPY_GameWorld.gotPlayer:
-# return skillData
-#
-# passiveEff = PassiveBuffEffMng.GetPassiveEffManager().GetPassiveEff(attacker)
-# if not passiveEff:
-# return skillData
-# #影响技能的BUFF
-# buffAffectInfo = passiveEff.GetChangeBuff_StartSkill(skillData.GetSkillID())
-# if not buffAffectInfo:
-# return skillData
-#
-# # 触发技能和主动技能需分开处理，否则数据错乱
-# if isEnhanceSkill:
-# PySkillManager.Py_SkillDataTrigger.CopySkillData(skillData)
-# skillData = PySkillManager.Py_SkillDataTrigger
-# else:
-# PySkillManager.Py_SkillData.CopySkillData(skillData)
-# skillData = PySkillManager.Py_SkillData
-#
-# #改变主动技能
-# passiveEff.CalcChangeBuff_StartSkill(attacker, skillData, buffAffectInfo)
-#
-# return skillData
-#===============================================================================
-
-
-
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 5dc1f5b..d38337f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -32,7 +32,6 @@
import ReadChConfig
import DataRecordPack
import ChItem
-import SkillDataBoost
import PlayerActivity
import ShareDefine
import PlayerGodWeapon
@@ -2993,14 +2992,6 @@
# @return 概率
def GetSkillOfSeriesHitRate(attacker, defender, exSkill):
baseRate = exSkill.GetHappenRate()
- #===========================================================================
- # addRate = SkillDataBoost.GetSkillBoostValeByType(attacker, exSkill, ChConfig.BoostType_HappenRate)
- # weakRate = 0
- # if defender:
- # weakRate = SkillDataBoost.GetSkillWeakenValeByType(defender, exSkill, ChConfig.WeakenType_HappenRate)
- # hitRate = max(0, baseRate + addRate - weakRate)
- #===========================================================================
- #GameWorld.DebugLog("触发几率: base=%s,add=%s,weak=%s, hitRate=%s" % (baseRate, addRate, weakRate, hitRate))
return baseRate
##检查触发技能的使用条件
@@ -3124,7 +3115,6 @@
tagRoundPosX = attacker.GetPosX()
tagRoundPosY = attacker.GetPosY()
- #curSkill = SkillDataBoost.ChangeSkillData(attacker, defender, curSkill, isEnhanceSkill)
#这个技能是Buff
if SkillCommon.IsBuff(curSkill):
@@ -3241,7 +3231,7 @@
moduleSuffix = GetBuffModuleSuffix(curEffect)
- changeBuffValueDict = {}#SkillDataBoost.GetBuffValueDict(curSkill, effectID)
+ changeBuffValueDict = {}
#是否是持续性技能
if curSkill.GetSkillType() in ChConfig.Def_LstBuff_List:
--
Gitblit v1.8.0