xdh
2019-05-28 69dc81f34df6887f26cbde4fad3fab687573f5b7
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py
@@ -196,7 +196,7 @@
    Sync_AttrFruitEatCnt(curPlayer, [itemID])
    
    # 增加属性
    attrIDList = __AddFruitAttr(curPlayer, itemID, funcIndex, addValue)
    __AddFruitAttr(curPlayer, itemID, funcIndex, addValue)
    
    # 刷新属性
    __RefreshAttr(curPlayer, funcIndex)
@@ -408,7 +408,7 @@
    
    #[属性索引, 是否基础属性,(非)线性]
    attrInfo = ChConfig.ItemEffect_AttrDict.get(effPerID, [])
    if attrInfo == []:
    if attrInfo is []:
        return
    
    addAttrList = attrInfo[0]
@@ -433,12 +433,12 @@
#  @param curPlayer 
#  @param fruitItemID 
#  @return None
def Sync_AttrFruitEatCnt(curPlayer, fruitItemIDList=[]):
def Sync_AttrFruitEatCnt(curPlayer, fruitItemIDList=None):
    
    eatPack = ChPyNetSendPack.tagMCAttrFruitEatCntList()
    eatPack.Clear()
    eatPack.EatCntList = []
    if fruitItemIDList == []:
    if fruitItemIDList is None:
        itemidList = []
        ipyDataMgr = IpyGameDataPY.IPY_Data()
        maxCnt = ipyDataMgr.GetAttrFruitCount()
@@ -458,7 +458,8 @@
        eatCntPack.Clear()
        eatCntPack.ItemID = fruitItemID
        eatCntPack.EatCnt = curPlayer.NomalDictGetProperty(eatCntKey)
        eatCntPack.AddItemCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitAddItemCnt % fruitItemID)
        eatCntPack.ItemAddCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitAddItemCnt % fruitItemID)
        eatCntPack.ItemBreakCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitItemBreakCnt % fruitItemID)
        eatPack.EatCntList.append(eatCntPack)
    
    eatPack.count = len(eatPack.EatCntList)
@@ -516,11 +517,7 @@
            maxEatCnt = maxEatCntDict[order]
            break
    addItemUseCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitAddItemCnt % itemID)
    if addItemUseCnt:
        addItemInfo = ipyData.GetAddItemInfo()
        if addItemInfo:
            singleItemCnt, singleAddCnt = addItemInfo[1:]
            maxEatCnt += (addItemUseCnt/singleItemCnt*singleAddCnt)
    maxEatCnt += addItemUseCnt
    return maxEatCnt
@@ -537,19 +534,30 @@
    ipyData = GetAttrFruitIpyData(itemID)
    if not ipyData:
        return
    addItemInfo = ipyData.GetAddItemInfo()
    if not addItemInfo:
    addItemInfoList = ipyData.GetAddItemInfo()
    if not addItemInfoList:
        return
    addItemUseCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitAddItemCnt % itemID)
    needItemID, singleItemCnt, singleAddCnt = addItemInfo
    if addItemUseCnt + singleItemCnt> ChConfig.Def_UpperLimit_DWord:
    itemBreakCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitItemBreakCnt % itemID)
    itemAddUseCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AttrFruitAddItemCnt % itemID)
    needUseCnt = canUpCnt = 0
    for breakCnt, useCnt, upCnt in addItemInfoList:
        if itemBreakCnt >= breakCnt:
            continue
        needUseCnt, canUpCnt = useCnt, upCnt
        break
    if not needUseCnt:
        return
    needItemID = IpyGameDataPY.GetFuncCfg('AlchemyOverLimit')
    if itemAddUseCnt + canUpCnt> ChConfig.Def_UpperLimit_DWord:
        return
    itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
    enough, indexList, hasBind, lackCnt = ItemCommon.GetItem_FromPack_ByID_ExEx(needItemID, itemPack, singleItemCnt)
    enough, indexList, hasBind, lackCnt = ItemCommon.GetItem_FromPack_ByID_ExEx(needItemID, itemPack, needUseCnt)
    if not enough:
        return
    ItemCommon.ReduceItem(curPlayer, itemPack, indexList, singleItemCnt, False, "AddFruitUseLimit")
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AttrFruitAddItemCnt % itemID, addItemUseCnt+singleItemCnt)
    ItemCommon.ReduceItem(curPlayer, itemPack, indexList, needUseCnt, False, "AddFruitUseLimit")
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AttrFruitAddItemCnt % itemID, itemAddUseCnt+canUpCnt)
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AttrFruitItemBreakCnt % itemID,
                                       itemBreakCnt + 1)
    Sync_AttrFruitEatCnt(curPlayer, [itemID])
    return