From f59c80a64aa99e451082cce8d338ce1faa53b00a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 26 三月 2019 20:05:58 +0800
Subject: [PATCH] 6374 新版无绑玉,原先绑玉再仙玉的扣法改成 扣仙玉

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py |   26 ++++++--------------------
 1 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 6b14a22..afc30f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -54,19 +54,6 @@
 import random
 import GameObj
 
-# 可吞噬的装备位
-Def_EatItem_EquipPlace = [
-    ShareDefine.retWeapon,      #1 主手
-    ShareDefine.retWeapon2,     #2 副手
-    ShareDefine.retHat,         #3 帽子
-    ShareDefine.retClothes,     #4 衣服
-    ShareDefine.retBelt,        #5 腰带
-    ShareDefine.retTrousers,    #6 裤子
-    ShareDefine.retShoes,       #7 鞋子
-    ShareDefine.retNeck,        #8 项链
-
-]
-
 Def_EatSpace = 5    # 低于X格自动吞噬
 
 
@@ -477,10 +464,10 @@
         # 满了不再给物品
         return
     
-    dropIDCountDict, dropIDBindDict, money = {}, {}, 0
+    dropIDCountDict, auctionIDList, money = {}, [], 0
     dropRet = NPCCommon.GetNPCDropInfoTJG(curPlayer, curPlayer.GetMapID(), npcID, killCnt)
     if dropRet:
-        dropIDCountDict, dropIDBindDict, money = dropRet
+        dropIDCountDict, auctionIDList, money = dropRet
     # 1. 出售为铜钱 2.放入背包 3.满则不继续给物品
     for itemID, dropCount in dropIDCountDict.items():
         if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
@@ -490,8 +477,7 @@
         if not curItemData:
             continue
         
-        # 掉落绑定, 默认绑定
-        isDropBind = dropIDBindDict.get(itemID, 1)
+        isAuctionItem = itemID in auctionIDList
         itemControl = ItemControler.PlayerItemControler(curPlayer)
         
         ## 装备物品 白蓝直接换算铜钱
@@ -503,7 +489,7 @@
         ## 装备一件件给
         if ItemCommon.GetIsEquip(curItemData):
             for _ in xrange(dropCount):
-                curItem = ItemControler.GetOutPutItemObj(itemID, 1, isDropBind)
+                curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem)
                 if not curItem:
                     continue
                 if not itemControl.PutInItem(IPY_GameWorld.rptItem, curItem, event=[ChConfig.ItemGive_TJGDropItem, False, {}]):
@@ -512,7 +498,7 @@
                 #记录紫橙装数量用于通知
                 NoteEquip(curPlayer, curItemData.GetItemColor())
         else:
-            curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isDropBind)
+            curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem)
             if not curItem:
                 continue
             
@@ -537,7 +523,7 @@
     
     equipScores = {}
     equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
-    for i in Def_EatItem_EquipPlace:
+    for i in ChConfig.EquipPlace_Base:
         equipItem = equipPack.GetAt(i)
         if not equipItem or equipItem.IsEmpty():
             continue

--
Gitblit v1.8.0