xdh
2018-09-19 ffb34f87fe65c84cc9c204371cbbb3a2a0b43ec1
fix:3670 【后端】只有通过合成的双属性才能分解出魔符印融合石
4个文件已修改
15 ■■■■■ 已修改文件
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1232,6 +1232,7 @@
Def_IudetCreateItemLoginDay = 34  # 创建物品时的登录天数
Def_IudetLastOpenItemLoginDay = 36  # 上一次开启物品时的登录天数
Def_IudetRuneLV = 38  # 符印等级
Def_IudetRuneSource = 40  # 符印来源 老号0,默认1,合成2(主要用来区分是否合成获得)
Def_IudetWingProgressValue = 42 #羽翼精炼值
Def_IudetCreateTime = 44 # 时效物品的创建时间
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1017,7 +1017,8 @@
        eventName, isForceEvent, addDict = event
        isNeedRecord = isForceEvent or ItemNeedRecord(tagItem)
        if packIndex == ShareDefine.rptRune:
            setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV))
            runeSource = tagItem.GetUserAttr(ShareDefine.Def_IudetRuneSource) or 1
            setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV), source=runeSource)
        refreshPlaceList = []
        for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
@@ -1297,13 +1298,14 @@
        return True, itemIndex
    
#==============================================================================
# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第10位为是否锁定
def GetRuneItemKeyData(itemID, RuneLV, lockState=0):
# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第9位为来源(老号0,默认1,合成2),第10位为是否锁定
def GetRuneItemKeyData(itemID, RuneLV, lockState=0, source=1):
    lockState = 1 if lockState > 0 else 0
    return lockState * 1000000000 + min(RuneLV, 999) * 100000 + itemID
    return lockState * 1000000000 + source * 100000000 + min(RuneLV, 999) * 100000 + itemID
def GetRuneItemID(keyData): return keyData % 100000
def GetRuneItemPlusLV(keyData): return keyData % 100000000 / 100000
def GetRuneItemIsLock(keyData): return keyData / 1000000000
def GetRuneItemSource(keyData): return keyData % 1000000000 / 100000000
def IsRuneItemNeedRecord(curItem, plusLV):
    return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -422,7 +422,7 @@
                    decompose += decompose * addPer / ShareDefine.Def_MaxRateValue
                    
            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
            if ipyData:
            if ipyData and ItemControler.GetRuneItemSource(RuneData) in [0,2]:
                totalMJ += ipyData.GetNeedMJ()
            
@@ -568,6 +568,7 @@
    #给新物品
    curItem = ItemControler.GetOutPutItemObj(tagItemID)
    curItem.SetUserAttr(ShareDefine.Def_IudetRuneLV, tagItemLV)
    curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, 2)
    PlayerItemControler = ItemControler.PlayerItemControler(curPlayer)
    PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {}])
    return
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1232,6 +1232,7 @@
Def_IudetCreateItemLoginDay = 34  # 创建物品时的登录天数
Def_IudetLastOpenItemLoginDay = 36  # 上一次开启物品时的登录天数
Def_IudetRuneLV = 38  # 符印等级
Def_IudetRuneSource = 40  # 符印来源 老号0,默认1,合成2(主要用来区分是否合成获得)
Def_IudetWingProgressValue = 42 #羽翼精炼值
Def_IudetCreateTime = 44 # 时效物品的创建时间