SnxxServerCode.git

			@@ -257,7 +257,7 @@
			FBLogic.OnFBPickUpItem(curPlayer, singItem, tick)

			equipInfo = [singItem.GetEquipPlace(), ItemCommon.GetItemClassLV(singItem), singItem.GetItemColor(),
			singItem.GetItemQuality(), singItem.GetUserData()]
			singItem.GetSuiteID(), singItem.GetUserData()]
			if not itemControl.PutInItem(packIndex, singItem, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":dropItemNPCID}]):
			#物品不能放入
			#PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packIndex])
			@@ -543,7 +543,7 @@
			# @remarks
			def CheckPlayerUseItemSelf(curPlayer, curItem, tick):
			#----------------------检查非法物品属性
			if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
			if not ItemCommon.CheckItemCanUse(curItem):
			PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_644055")
			return False

			@@ -703,6 +703,7 @@
			ChConfig.Def_ItemType_AddExp:"Item_AddExp", # 给经验道具
			ChConfig.Def_ItemType_GiveMoney:"Item_GiveMoney", # 给人物金钱
			ChConfig.Def_ItemType_AddLimitBuff:"Item_Add_LimitingBuff", # 给限时buff物品
			ChConfig.Def_ItemType_AddLimitBuff2:"Item_Add_LimitingBuff", # 给限时buff物品
			ChConfig.Def_ItemType_AddExpBuff:"Item_Add_LimitingBuff", # 给限时buff物品
			ChConfig.Def_ItemType_ResetAttrPoint:"Item_ResetAttrPoint", #单个属性点重置
			ChConfig.Def_ItemType_AddCrossRealmPKCnt:"Item_AddCrossRealmPKCnt" #增加跨服PK次数
			@@ -725,7 +726,7 @@
			ChConfig.Def_Effect_ItemGiveWeekPartyPoint:"Item_WeekPartyPoint", # 增加活动巡礼积分
			ChConfig.Def_Effect_ItemGiveWeekPartyPoint1:"Item_WeekPartyPoint", # 增加活动巡礼积分
			ChConfig.Def_Effect_AddRealmExpRate:"Item_AddRealmExpRate", # 增加聚灵效率
			#ChConfig.Def_Effect_AddPrestige:"Item_AddPrestige", # 给人物威望
			ChConfig.Def_Effect_TouchMission:"Item_TouchMission", # 触发任务接口
			#ChConfig.Def_Effect_FamilyImpeach:"Item_FamilyImpeach", # 弹劾符
			#ChConfig.Def_Effect_ClothesCoatSkin:"Item_ClothesCoatSkin", #激活时装皮肤
			#ChConfig.Def_Effect_AddOfficialExp:"Item_AddOfficialExp", # 增加爵位经验
			@@ -1053,7 +1054,7 @@
			curItem = curPack.GetAt(itemIndex)

			#物品不存在
			if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
			if not ItemCommon.CheckItemCanUse(curItem):
			return

			#检查物品可否丢弃
			@@ -1524,12 +1525,6 @@
			GameWorld.DebugLog(" 物品无法使用！")
			return

			# 使用拍品
			if ItemControler.GetIsAuctionItem(curItem):
			GameWorld.DebugLog("玩家使用拍品: itemID=%s" % (curItem.GetItemTypeID()), curPlayer.GetPlayerID())
			ItemControler.SetIsAuctionItem(curItem, False, curPlayer)
			return

			if useCnt <= 0:
			useCnt = curItem.GetCount()
			GameWorld.DebugLog(" 没指定使用个数，默认使用全部=%s" % useCnt)
			@@ -1938,14 +1933,27 @@
			for i in xrange(len(equipData.legendAttrIDList)):
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrID, equipData.legendAttrIDList[i])
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValue, equipData.legendAttrValueList[i])

			#绝版属性
			if equipData.OutOfPrintAttrIDList and equipData.OutOfPrintAttrValueList:
			curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID)
			curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue)
			for i in xrange(len(equipData.OutOfPrintAttrIDList)):
			curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID, equipData.OutOfPrintAttrIDList[i])
			curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue, equipData.OutOfPrintAttrValueList[i])
			# 传奇属性 - 神
			if equipData.legendAttrIDListShen and equipData.legendAttrValueListShen:
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrIDShen)
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrValueShen)
			for i in xrange(len(equipData.legendAttrIDListShen)):
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrIDShen, equipData.legendAttrIDListShen[i])
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValueShen, equipData.legendAttrValueListShen[i])
			# 传奇属性 - 仙
			if equipData.legendAttrIDListXian and equipData.legendAttrValueListXian:
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrIDXian)
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrValueXian)
			for i in xrange(len(equipData.legendAttrIDListXian)):
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrIDXian, equipData.legendAttrIDListXian[i])
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValueXian, equipData.legendAttrValueListXian[i])
			# 传奇属性 - 极
			if equipData.legendAttrIDListJi and equipData.legendAttrValueListJi:
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrIDJi)
			curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrValueJi)
			for i in xrange(len(equipData.legendAttrIDListJi)):
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrIDJi, equipData.legendAttrIDListJi[i])
			curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValueJi, equipData.legendAttrValueListJi[i])

			ItemCommon.MakeEquipGS(curItem)
			return