From 9cc23ba064d9daf14a9085685f961b10d4f379f3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 17:15:23 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(召回系统)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 107588b..083c2fa 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -23,11 +23,9 @@
 import ChItem
 import ItemCommon
 import FBLogic
-import ReadChConfig
 import OperControlManager
 import Operate_EquipWash
 import ShareDefine
-import PyMapTable
 import ChPyNetSendPack
 import NetPackCommon
 import EventShell
@@ -35,8 +33,6 @@
 import PlayerWing
 import Operate_EquipStone
 import PassiveBuffEffMng
-import SkillCommon
-import PlayerMagicWeapon
 import time
 import json
 import FormulaControl
@@ -70,7 +66,7 @@
         return False
     playerItemControl = ItemControler.PlayerItemControler(curPlayer)
     
-    if curItem.GetIsBind():
+    if ItemControler.GetIsAuctionItem(curItem):
         GameWorld.DebugLog("拍品无法穿戴!")
         return False
     
@@ -400,7 +396,7 @@
     equipIndex = sendPack.GetEquipIndex()
     curEquip = roleEquipPack.GetAt(equipIndex)
     
-    if not ItemCommon.CheckItemCanUse(curEquip):
+    if not ItemCommon.CheckItemCanUse(curEquip) or ItemControler.GetIsAuctionItem(curEquip):
         return
     
     #FB禁止使用物品
@@ -834,7 +830,7 @@
 def CalcEquipSuiteAttr(curPlayer, suitCntDict, allAttrListSuit):
     if not suitCntDict:
         return
-    GameWorld.DebugLog('    suitCntDict=%s'%suitCntDict)
+    #GameWorld.DebugLog('    suitCntDict=%s'%suitCntDict)
     learnSkillList = []
     delSkillID = []
     skillManager = curPlayer.GetSkillManager()
@@ -1233,8 +1229,7 @@
     PlayerControl.NomalDictSetProperty(curPlayer, key, activeCnt)
     
     SyncAllEquipAttrActiveInfo(curPlayer, activeType)
-    if activeType == 0:
-        PlayerMagicWeapon.CalcMagicWeaponSoulAttr(curPlayer)
+    
     #注意: 需要传装备阶触发刷属性,暂屏蔽,功能修改时再处理
     #else:
     #    RefreshPlayerEquipAttribute(curPlayer)

--
Gitblit v1.8.0