From 9040765fce1fa447db48cccad0b40df5de67b6b1 Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期五, 14 六月 2019 14:33:04 +0800 Subject: [PATCH] 7273 【2.0】【后端】活跃令兑换支持青鸾之羽 --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py index 74471cf..326e94d 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py @@ -958,6 +958,7 @@ eatItemIDList = clientData.ItemIDList givePoint = 0 #分解得到活跃令 familyDonateDict = IpyGameDataPY.GetFuncEvalCfg('FamilyDonate', 1, {}) + familyDonateSpecialDict = IpyGameDataPY.GetFuncEvalCfg('FamilyDonate', 2, {}) itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem) for i, index in enumerate(eatIndexList): eatItem = itemPack.GetAt(index) @@ -974,14 +975,17 @@ if eatItem.GetEndureReduceType(): GameWorld.DebugLog("有时效耐久物品,无法兑换!itemIndex=%s" % index) continue - if not ItemCommon.CheckItemIsEquip(eatItem): - GameWorld.DebugLog("非装备,无法兑换!itemIndex=%s" % index) - continue - itemColor = eatItem.GetItemColor() - if str(itemColor) not in familyDonateDict: - continue - isSuite = eatItem.GetSuiteID() - addPoint = familyDonateDict[str(itemColor)][1 if isSuite else 0] + if eatItemID in familyDonateSpecialDict: + addPoint = familyDonateSpecialDict[eatItemID] + else: + if not ItemCommon.CheckItemIsEquip(eatItem): + GameWorld.DebugLog("非装备,无法兑换!itemIndex=%s" % index) + continue + itemColor = eatItem.GetItemColor() + if str(itemColor) not in familyDonateDict: + continue + isSuite = eatItem.GetSuiteID() + addPoint = familyDonateDict[str(itemColor)][1 if isSuite else 0] givePoint += addPoint ItemCommon.DelItem(curPlayer, eatItem, 1, True, ChConfig.ItemDel_ZhuXianDecompose, {'addPoint':addPoint}, True) -- Gitblit v1.8.0