6273 【后端】【1.6】七日巡礼和节日巡礼增加祈愿条件

xdh

2019-02-22 516f33feb5fe68e90f4d9497b74d67ed52c1cfde

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py

@@ -329,12 +329,7 @@
    level = curStoneEff.GetEffectValue(1)

    upgradeStoneID = curStoneEff.GetEffectValue(2)

    

    stoneTypeItemIDDict = IpyGameDataPY.GetFuncEvalCfg("GemUpCostFormula", 1)

    GameWorld.DebugLog("stoneEffType=%s,stoneTypeItemIDDict=%s,level=%s,upgradeStoneID=%s" 
                       % (stoneEffType, stoneTypeItemIDDict, level, upgradeStoneID))

    if stoneEffType not in stoneTypeItemIDDict:

        return

    stoneTypeItemID = stoneTypeItemIDDict[stoneEffType]

    GameWorld.DebugLog("stoneEffType=%s,level=%s,upgradeStoneID=%s" % (stoneEffType, level, upgradeStoneID))

    

    if not upgradeStoneID:

        GameWorld.Log("该宝石已是最大级,不能升级！stoneIndex=%s,stoneItemID=%s,curEffID=%s,upgradeStoneID=%s"

@@ -344,6 +339,10 @@
    if not needCount:

        return

    if upWay == 0: #仙玉

        stoneTypeItemIDDict = IpyGameDataPY.GetFuncEvalCfg("GemUpCostFormula", 1)

        if stoneEffType not in stoneTypeItemIDDict:

            return

        stoneTypeItemID = stoneTypeItemIDDict[stoneEffType]

        unitPrice = ItemCommon.GetShopItemPrice(stoneTypeItemID, IPY_GameWorld.TYPE_Price_Gold_Money)

        if not unitPrice:

            return

@@ -357,7 +356,7 @@
            return

    else:

        #同级宝石

        costItemIndexList, bindCnt, unBindCnt = ItemCommon.GetPackItemBindStateIndexInfo(curPlayer, stoneItemID)

        costItemIndexList, bindCnt, unBindCnt = ItemCommon.GetPackItemBindStateIndexInfo(curPlayer, stoneItemID, packType=stonePackType)

        if bindCnt + unBindCnt < needCount-1:

            GameWorld.DebugLog("同级宝石不足 %s!" % (needCount-1))

            return