From a02d7379e60b7b3fe0ae8d1ada4cf86fc4d0a1be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 11 九月 2020 14:27:11 +0800
Subject: [PATCH] 1111 媒体卡固定码支持按appid配置；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
index b71feb3..c2a7477 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
@@ -384,8 +384,8 @@
## 获取合成莲台碎片个数
decCountTotal = 0
decItemIDList = [curItem.GetItemTypeID()]
- for i in xrange(curItem.GetUserAttrCount(ShareDefine.Def_IudetAddSkillItemID)):
- itemID = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetAddSkillItemID, i)
+ for i in xrange(curItem.GetUserAttrCount(ShareDefine.Def_IudetLiantaiItemID)):
+ itemID = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetLiantaiItemID, i)
if itemID not in decItemIDList:
decItemIDList.append(itemID)
liantaiDecomposeIDCountDict = IpyGameDataPY.GetFuncEvalCfg("ComposeLiantai", 3, {})
@@ -403,8 +403,8 @@
# 所有合成的莲台ID
if curItemID not in liantaiComposeAllItemIDList:
liantaiComposeAllItemIDList.append(curItemID)
- for i in xrange(curItem.GetUserAttrCount(ShareDefine.Def_IudetAddSkillItemID)):
- itemID = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetAddSkillItemID, i)
+ for i in xrange(curItem.GetUserAttrCount(ShareDefine.Def_IudetLiantaiItemID)):
+ itemID = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetLiantaiItemID, i)
if itemID not in liantaiComposeAllItemIDList:
liantaiComposeAllItemIDList.append(itemID)
@@ -676,7 +676,7 @@
return incRateItemCostList, expireTime
def __CheckItemCanUseCompound(playerID, index, curItem):
- if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
+ if not ItemCommon.CheckItemCanUse(curItem):
GameWorld.DebugLog("该物品不可使用!无法合成! index=%s" % (index), playerID)
return
@@ -762,9 +762,14 @@
# 莲台属性
if liantaiInfo:
if liantaiComposeAllItemIDList:
- curSingleItem.ClearUserAttr(ShareDefine.Def_IudetAddSkillItemID)
+ curSingleItem.ClearUserAttr(ShareDefine.Def_IudetLiantaiItemID)
for liantaiItemID in liantaiComposeAllItemIDList:
- curSingleItem.AddUserAttr(ShareDefine.Def_IudetAddSkillItemID, liantaiItemID)
+ curSingleItem.AddUserAttr(ShareDefine.Def_IudetLiantaiItemID, liantaiItemID)
+
+ if liantaiComposeSkillIDList:
+ curSingleItem.ClearUserAttr(ShareDefine.Def_IudetAddSkillID)
+ for skillID in liantaiComposeSkillIDList:
+ curSingleItem.AddUserAttr(ShareDefine.Def_IudetAddSkillID, skillID)
if liantaiLegendAttrList:
curSingleItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrID)
@@ -836,7 +841,7 @@
return
curEquip = itemPack.GetAt(decompoundItemIndex)
- if not ItemCommon.CheckItemCanUse(curEquip) or ItemControler.GetIsAuctionItem(curEquip):
+ if not ItemCommon.CheckItemCanUse(curEquip):
return
attrCount = curEquip.GetUserAttrCount(ShareDefine.Def_IudetItemDecompound)
--
Gitblit v1.8.0