From d2751c692ef6534e5f5690080d285d41e0080d68 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 10 九月 2018 21:17:43 +0800
Subject: [PATCH] 3224 【开发】boss技能cd重置和回血同步（技能CD及召唤兽只在boss重生或boss血量满血时才重置）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
index 6803e85..08ecc90 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -121,7 +121,8 @@
if mwID in IpyGameDataPY.GetFuncEvalCfg('UnblockTreasure'):
PlayerControl.NotifyCode(curPlayer, 'UnblockTreasure', [curPlayer.GetName(), mwID])
else:
- PlayerControl.WorldNotify(0, 'UnblockTreasure', [curPlayer.GetName(), mwID])
+ sysMark = IpyGameDataPY.GetFuncEvalCfg('UnblockTreasure', 2, {}).get(mwID, 'UnblockTreasure')
+ PlayerControl.WorldNotify(0, sysMark, [curPlayer.GetName(), mwID])
#任务
EventShell.EventRespons_OnActiveMagicWeapon(curPlayer, mwID)
@@ -667,6 +668,7 @@
elif curType == 2:
#穿戴三阶橙色1星或四阶紫色1星以上头盔
playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
+ SamboSpecialUnlock = IpyGameDataPY.GetFuncEvalCfg('SamboSpecialUnlock')
for equipIndex in xrange(playerEquip.GetCount()):
curEquip = playerEquip.GetAt(equipIndex)
if curEquip.IsEmpty():
@@ -674,7 +676,11 @@
curClassLV = ItemCommon.GetItemClassLV(curEquip)
itemColor = curEquip.GetItemColor()
itemQuality = curEquip.GetItemQuality()
+ itemID = curEquip.GetItemTypeID()
for classlv, color, star, place in conditionList:
+ if equipIndex is place and itemID in SamboSpecialUnlock:
+ cnt = 1
+ break
if equipIndex is place and curClassLV >= classlv and itemColor >= color and itemQuality >= star:
cnt = 1
break
--
Gitblit v1.8.0