From acb8a30b1ced26763bfbb3b910e1a3522622652d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 六月 2019 22:43:53 +0800
Subject: [PATCH] 860312 烈焰战神 特殊特效 8 新增 经验飘字
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 3 ++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 5 +++--
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 3 ++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 7 +++++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 23fd2b4..78e8124 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -274,7 +274,8 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
-) = range(0, 8)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效
+) = range(0, 9)
#物品相关操作类型
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index a5dc5b4..75f9138 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -5022,9 +5022,10 @@
addSkillID = 0
if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
+
#设定人物获得经验
playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID)
+ playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
self.__KillNPCFuncEx(curPlayer, curNPC, curPlayer.GetPlayerID(), False)
@@ -5239,7 +5240,7 @@
if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID)
+ playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
return
#---------------------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index d44df4f..a34383f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -3836,14 +3836,17 @@
if expViewType == ShareDefine.Def_ViewExpType_KillNPC:
exp_rate = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)
superRate = PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(curPlayer, None, None, ChConfig.TriggerType_AddExpRate)
+ if superRate:
+ # 龙凤镯 经验
+ expViewType = ShareDefine.Def_ViewExpType_KillNPCSuper
if addSkillID == ChConfig.Def_SkillID_LXHY_AddExpRate:
addSkill = GameWorld.GetGameData().GetSkillBySkillID(addSkillID)
hasEffect = SkillCommon.GetSkillEffectByEffectID(addSkill, ChConfig.Def_Skill_Effect_AddExpRate)
if hasEffect:
+ #烈焰战神 经验
superRate += hasEffect.GetEffectValue(0)
+ expViewType = ShareDefine.Def_ViewExpType_LYZS
exp_rate += superRate
- if superRate:
- expViewType = ShareDefine.Def_ViewExpType_KillNPCSuper
elif expViewType in [ShareDefine.Def_ViewExpType_GameEvent, ShareDefine.Def_ViewExpType_Sit]:
exp_rate = curPlayer.GetGameEventExpRate()
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 23fd2b4..78e8124 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -274,7 +274,8 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
-) = range(0, 8)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效
+) = range(0, 9)
#物品相关操作类型
--
Gitblit v1.8.0