8262 【主干】【后端】仙盟宴会及传功优化

hxp

2019-09-12 5619e084f4f0e33e30d92cfe5c9ab78c13243171

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

@@ -80,8 +80,13 @@
    

    recordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % campaignType)

    

    if value == recordData:

        GameWorld.DebugLog("    开服活动数据等于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s" 
                           % (campaignType, recordData, value), curPlayer.GetPlayerID())

        return

    
    if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower, 

                            ShareDefine.Def_Campaign_Type_RuneLV] and value <= recordData:

                            ShareDefine.Def_Campaign_Type_RuneLV, ShareDefine.Def_Campaign_Type_LingGen, ShareDefine.Def_Campaign_Type_StarLV] and value < recordData:

        GameWorld.DebugLog("    开服活动数据小于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s" 

                           % (campaignType, recordData, value), curPlayer.GetPlayerID())

        return

@@ -276,6 +281,8 @@
        order = queryResultList[i]

        billAwardInfo = None

        billRankAwardIpyList = IpyGameDataPY.GetIpyGameDataList("OSCBillRankAward", campaignType)

        if not billRankAwardIpyList:

            continue

        for billRankIpyData in billRankAwardIpyList:

            if (billRankIpyData.GetRankA() <= order <= billRankIpyData.GetRankB()) \

                or (not billRankIpyData.GetRankB() and billRankIpyData.GetRankA() == order):

@@ -332,7 +339,7 @@
        for itemInfo in giveItemList:

            itemID, itemCount = itemInfo[:2]

            isBind = itemInfo[2] if len(itemInfo) > 2 else 1

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                         event=[ChConfig.ItemGive_OpenServerCampaign, True, drDict])

    return



@@ -359,5 +366,11 @@
    NetPackCommon.SendFakePack(curPlayer, oscAwardListPack)

    return





def UpdOpenServerCampaignLingGenData(curPlayer):

    # 记录开服活动数据

    totalLingGen = curPlayer.GetFreePoint() + PlayerControl.GetMetal(curPlayer) + PlayerControl.GetWood(curPlayer) + \

                    PlayerControl.GetWater(curPlayer) + PlayerControl.GetFire(curPlayer) + PlayerControl.GetEarth(curPlayer)

    #GameWorld.DebugLog("总灵根: %s" % totalLingGen)

    UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LingGen, totalLingGen)

    return