From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 15 三月 2019 19:54:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py index ed846a0..97c2873 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py @@ -42,7 +42,6 @@ import PlayerRune import Operate_EquipStone import Operate_EquipWash -import Operate_EquipSuitCompose import PlayerFeastRedPacket import PlayerDogz import QuestCommon @@ -565,9 +564,9 @@ classLV = ItemCommon.GetItemClassLV(curEquip) if equipIndex not in [ShareDefine.retWing,ShareDefine.retGuard1,ShareDefine.retGuard2,ShareDefine.retHorse]: DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_EquipColorItem, 1, [classLV, itemColor]) - if equipIndex in ChConfig.BaseEquipPlace_Weapon: + if equipIndex in ChConfig.EquipPlace_BaseWeapon: DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_EquipWeapon, 1, [itemColor, itemQuality, classLV]) - elif equipIndex in ChConfig.BaseEquipPlace_Armor: + elif equipIndex in ChConfig.EquipPlace_BaseArmor: DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_EquipArmor, 1, [itemColor, itemQuality, classLV]) elif equipIndex == ShareDefine.retWing: @@ -1012,8 +1011,7 @@ # 给物品 if isGiveItem: for itemID, itemCnt in itemDict.items(): - isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, - [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True) + isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere]) #给钱 for moneyType, value in succData.moneyDict.items(): -- Gitblit v1.8.0