From 608bd56472d25fcbccb572df24a71eab836e1fe7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 21 五月 2019 17:23:15 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 1090减速受符文影响

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py         |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py                  |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1090.py |   18 ++++++++++++++++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1315.py |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.py        |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.py        |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.py        |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.py        |    2 +-
 9 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index a84f3fe..763e3db 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -437,7 +437,7 @@
         if not callFunc:
             continue
         
-        callFunc(curObj, addBuff, curEffect, tick)
+        callFunc(curObj, addBuff, curEffect, tick, buffOwner)
     
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1090.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1090.py
index 952ed5a..9c71126 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1090.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1090.py
@@ -16,6 +16,7 @@
 import SkillCommon
 import GameWorld
 import ChConfig
+import PlayerControl
 
 def ProcessBuff(defender, curBuff, curEffect, processBuffTick, tick):
     buffOwner = SkillCommon.GetBuffOwner(curBuff)
@@ -33,7 +34,7 @@
 def OnCalcBuffEx(defender, curEffect, calcDict, curBuff):
     
     attrType = curEffect.GetEffectValue(1)
-    value = curEffect.GetEffectValue(2)
+    value = curEffect.GetEffectValue(2) + curBuff.GetValue2()
     calcDict[attrType] = calcDict.get(attrType, 0) - value
         
     return 
@@ -43,4 +44,17 @@
 #  @return None
 #  @remarks 函数详细说明.  
 def GetCalcType():
-    return ChConfig.TYPE_NoLinear
\ No newline at end of file
+    return ChConfig.TYPE_NoLinear
+
+## 添加BUFF后的逻辑
+#  @param None
+#  @return None
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
+    if not buffOwner:
+        return
+    if curEffect.GetEffectValue(1) != ChConfig.TYPE_Calc_AttrSpeed:
+        return
+    
+    addBuff.SetValue2(PlayerControl.GetSubSpeedPer(buffOwner))
+    return
+
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
index 3f81376..920a8a5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
@@ -96,7 +96,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     Attack(curObj, addBuff, tick)   #立即执行一次攻击
     if GameObj.GetHP(curObj) != 0:
         addBuff.SetProcessInterval(tick)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1315.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1315.py
index 9f2d85a..2aefd69 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1315.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1315.py
@@ -48,7 +48,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     Attack(curObj, addBuff, curEffect, tick)   #立即执行一次攻击
     if GameObj.GetHP(curObj) != 0:
         addBuff.SetProcessInterval(tick)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.py
index 2804ae7..c46c82f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.py
@@ -41,7 +41,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     curObj.SetPlayerNameColor(IPY_GameWorld.pncGray)
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.py
index 1943d40..b0c3ff0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.py
@@ -40,7 +40,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     curObj.SetPlayerNameColor(IPY_GameWorld.pncRed)
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.py
index a99e146..0949052 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.py
@@ -39,7 +39,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     curObj.SetPlayerNameColor(IPY_GameWorld.pncGray)
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.py
index 81fe579..e021870 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.py
@@ -27,7 +27,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     stateType = curEffect.GetEffectValue(0)
     GameObj.SetPyPlayerState(curObj, stateType, 1)
     
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
index bc55b14..b86755b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
@@ -23,7 +23,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     # SetValue1用于当前吸收值
     addBuff.SetValue(GameObj.GetMaxHP(curObj)*curEffect.GetEffectValue(0)/ChConfig.Def_MaxRateValue) # 吸收上限
     return

--
Gitblit v1.8.0