4762 【后端】修复两个非好友玩家都没有仙盟时被视为同仙盟的bug；

hxp

2018-11-27 3d7d4a003455176e07b517068608a999796fdf6e

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py

@@ -27,6 +27,8 @@
import IpyGameDataPY

import PlayerSuccess

import PlayerMagicWeapon

import IPY_GameWorld

import OpenServerCampaign



g_runeLVExpDict = {}



@@ -34,6 +36,42 @@
# @param curPlayer 玩家

# @return None

def PlayerRuneLogin(curPlayer):

    if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource):

        GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource, 1)

        runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)

        for RuneNum in xrange(1, runeHoleCnt + 1):

            RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)

            if not RuneData:

                continue

            RuneItemID = ItemControler.GetRuneItemID(RuneData)

            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)

            if not ipyData:

                continue

            RuneSource = ItemControler.GetRuneItemSource(RuneData)

            if RuneSource != ChConfig.Item_Source_Compound:

                RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)

                RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)

                updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)

                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % RuneNum, updRuneData)

                GameWorld.Log('上线修复双属性符印来源 RuneNum=%s,oldRuneData=%s,updRuneData=%s'%(RuneNum, RuneData, updRuneData))

        packIndex = ShareDefine.rptRune

        for place in xrange(ItemCommon.GetVPackCnt(packIndex)):

            RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_VPackItem % (packIndex, place))

            if not RuneData:

                continue

            RuneItemID = ItemControler.GetRuneItemID(RuneData)

            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)

            if not ipyData:

                continue

            RuneSource = ItemControler.GetRuneItemSource(RuneData)

            if RuneSource != ChConfig.Item_Source_Compound:

                RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)

                RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)

                updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)

                ItemControler.SetVPackItemKeyData(curPlayer, ShareDefine.rptRune, place, updRuneData)

                GameWorld.Log('上线修复双属性符印来源 place=%s,oldRuneData=%s,updRuneData=%s'%(place, RuneData, updRuneData))

    
    
    DoUnlockRuneHole(curPlayer, False)

    Sync_RuneInfo(curPlayer)

    return

@@ -114,6 +152,32 @@
    runeMaxLV = runeMaxLVDict.get(itemColor, 0)

    return runeMaxLV



#// A5 13 解锁符印孔 #tagCMUnlockRuneHole

#

#struct    tagCMUnlockRuneHole

#{

#    tagHead        Head;

#    BYTE        HoleIndex; // 孔索引

#};

def OnUnlockRuneHole(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    holeIndex = clientData.HoleIndex

    runeUnlockDict = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 2, {})

    if holeIndex not in runeUnlockDict:

        return

    runeOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)

    if runeOpenState & pow(2, holeIndex):

        return

    if curPlayer.GetLV() < IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 3, {}).get(holeIndex, 0):

        return

    costMoney = runeUnlockDict[holeIndex]

    if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney, ChConfig.Def_Cost_RuneHole, {'holeIndex':holeIndex}):

        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_HoleOpenState, runeOpenState |pow(2, holeIndex))

    Sync_RuneInfo(curPlayer)

    PlayerControl.WorldNotify(0, 'RuneSpecialHoleGet', [curPlayer.GetName(), costMoney])

    return



def DoUnlockRuneHole(curPlayer, isSycn=True):

    # 解锁符印孔, 符印塔过关时调用

    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")

@@ -158,9 +222,8 @@
            or (srcBackpack == ShareDefine.rptRune and desBackPack == ShareDefine.rptTempSwap)):

        return False

    

    
    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")

    maxRuneHole = len(runeUnlockList)



    maxRuneHole = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)

    # 穿

    if desBackPack == ShareDefine.rptTempSwap:

        desRuneNum = destIndex + 1

@@ -278,6 +341,7 @@
    RuneItemID = ItemControler.GetRuneItemID(RuneData)

    RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)

    RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)

    RuneSource = ItemControler.GetRuneItemSource(RuneData)

    itemData = GameWorld.GetGameData().GetItemByTypeID(RuneItemID)

    if not itemData:

        return

@@ -295,7 +359,7 @@
        return



    

    updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV + 1, RuneIsLock)

    updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV + 1, RuneIsLock, RuneSource)

    if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Rune, plusCost):

        curRuneMoney = PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_Rune)

        GameWorld.DebugLog("符印精华点不足，无法升级!placeType=%s,placeIndex=%s,itemID=%s,plusLV=%s,plusCost=%s,curRuneMoney=%s" 

@@ -325,8 +389,8 @@
    #清掉#镶嵌X枚X品质符印的成就信息

    PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_InlayRune)

    totalLV = 0

    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")

    for holeNum in xrange(1, len(runeUnlockList) + 1):

    runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)

    for holeNum in xrange(1, runeHoleCnt + 1):

        runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)

        if not runeData:

            continue

@@ -339,6 +403,8 @@
        totalLV += runeItemPlusLV

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_InlayRune, 1, [itemColor])

    PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_RuneLvUp, totalLV)

    # 开服活动数据

    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)

    return



#// A5 66 符印分解 #tagCMRuneDecompose

@@ -396,7 +462,7 @@
                    decompose += decompose * addPer / ShareDefine.Def_MaxRateValue

                    

            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)

            if ipyData:

            if ipyData and ItemControler.GetRuneItemSource(RuneData) in [ChConfig.Rune_Source_Unkown,ChConfig.Item_Source_Compound]:

                totalMJ += ipyData.GetNeedMJ()

            



@@ -498,19 +564,19 @@
        GameWorld.DebugLog('    符印合成 材料不对 tagItemID=%s, materialsIDList=%s, needItemIDList=%s'%(tagItemID,materialsIDList,needItemIDList))

        return

    

    needMJ = ipyData.GetNeedMJ()

    infoDict = {"TagItemID":tagItemID}

    if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, needMJ, ChConfig.Def_Cost_ItemProduce, infoDict):

        return

    
    if 0 not in packList:

        #如果没有背包的材料要判断格子数

        emptySpace = ItemCommon.GetItemPackSpace(curPlayer, ShareDefine.rptRune, 1)

        if emptySpace < 1:

            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [ShareDefine.rptRune])

            GameWorld.DebugLog('    符印合成 背包格子数量不足1个')

            return 

    
    
        
    needMJ = ipyData.GetNeedMJ()

    infoDict = {"TagItemID":tagItemID}

    if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, needMJ, ChConfig.Def_Cost_ItemProduce, infoDict):

        return

     
    totalPoint = 0

    for itemID in materialsIDList:

        decompose = 0

@@ -542,16 +608,18 @@
    #给新物品

    curItem = ItemControler.GetOutPutItemObj(tagItemID)

    curItem.SetUserAttr(ShareDefine.Def_IudetRuneLV, tagItemLV)

    curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, ChConfig.Item_Source_Compound)

    PlayerItemControler = ItemControler.PlayerItemControler(curPlayer)

    PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {}])

    PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {'indexList1':indexList1,'indexList2':indexList2}])

    curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitRuneCompound, 1)

    return





## 刷符印属性

def RefreshRuneAttr(curPlayer):

    allAttrList = [{} for _ in range(4)]

    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")

    for holeNum in xrange(1, len(runeUnlockList) + 1):

    runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)

    for holeNum in xrange(1, runeHoleCnt + 1):

        runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)

        if not runeData:

            continue

@@ -574,14 +642,14 @@


## 同步客户端

def Sync_RuneInfo(curPlayer):

    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")

    if not runeUnlockList:

    runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)

    if not runeHoleCnt:

        return

    RuneInfoPack = ChPyNetSendPack.tagMCRuneInfo()

    RuneInfoPack.Clear()

    RuneInfoPack.RuneHoleOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)

    RuneInfoPack.RuneDataList = []

    for RuneNum in xrange(1, len(runeUnlockList) + 1):

    for RuneNum in xrange(1, runeHoleCnt + 1):

        RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)

        RuneInfoPack.RuneDataList.append(RuneData)

    RuneInfoPack.Count = len(RuneInfoPack.RuneDataList)