Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hxp

2019-06-27 a54fba3894b5d528bed16147f096b6a706a1fc0c

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

@@ -19,6 +19,7 @@
import ChConfig

import ChPyNetSendPack

import NetPackCommon

import PlayerBossReborn

import ShareDefine

import GameWorld

import GameLogic_CrossGrassland

@@ -113,7 +114,7 @@
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    

    otherCntRateList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 2)

    maxEventCnt = max([info[1] for info in otherCntRateList]) + 1  #最大可出现事件个数

    maxEventCnt = GetMaxEventCnt()  #最大可出现事件个数

    fairyDomainState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainState)  #是否寻访中  0未寻访 1寻访中 2任务标记可寻访

    if clientData.Type == 1:  #结束寻访

        if fairyDomainState != 1:

@@ -134,11 +135,11 @@
    if fairyDomainState == 1:

        GameWorld.DebugLog("    正在寻访仙域中！请先退出寻访")

        return

    
    if fairyDomainState != 2 and not PlayerActivity.AddDailyActionFinishCnt(curPlayer, dailyID):

        GameWorld.DebugLog("    寻访仙域次数不足！")

    costPoint = IpyGameDataPY.GetFuncCfg('ImmortalDomainActivePoint', 2)

    if not PlayerActivity.CostActivityPoint(curPlayer, costPoint, True):

        GameWorld.DebugLog("    寻访仙域需要活跃点不足！costPoint=%s"%costPoint)

        return

    


    #随机事件 重置事件状态

    visitCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainVisitCnt)

    appointIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog('FairyDomainAppoint', visitCnt + 1)

@@ -149,18 +150,18 @@
    else:

        fdEventTypeDict = {}

        #先随机独立事件

        singleEventRateDict = IpyGameDataPY.GetFuncCfg('ImmortalDomain')

        singleEventRateDict = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 1, {})

        for eventType, rate in singleEventRateDict.items():

            if GameWorld.CanHappen(rate):

                fdEventTypeDict[eventType] = 1

        


        otherCnt = GameWorld.GetResultByRandomList(otherCntRateList, 0)

        if otherCnt:

            otherEventRateList = copy.deepcopy(IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 3))

            unRepeatTypeList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 4)

            for _ in xrange(otherCnt):

                otherEventType = GameWorld.GetResultByRandomList(otherEventRateList, 0)

                if not otherEventType:

                otherEventType = GameWorld.GetResultByRandomList(otherEventRateList)

                if otherEventType is None:

                    continue

                if otherEventType in unRepeatTypeList:

                    for index, info in enumerate(otherEventRateList):

@@ -184,6 +185,12 @@
        #更新全服出现次数

        msgStr = str(fdEventIDList)

        GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'AddFairyDomainEvent', msgStr, len(msgStr))

    if not fdEventIDList:

        fdEventIDList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 5)

        GameWorld.Log('寻访仙域, 没有随机出事件,使用默认事件！！ playerLV=%s,visitCnt=%s,默认fdEventIDList=%s'%(curPlayer.GetLV(), visitCnt, fdEventIDList), curPlayer.GetID())

        if not fdEventIDList:

            return

    PlayerActivity.CostActivityPoint(curPlayer, costPoint)

    #奇遇事件 随机档位数据

    openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1

    for fdEventID in fdEventIDList:

@@ -195,16 +202,12 @@
            continue

        conditionList = ipyData.GetCondition()

        if not conditionList:

            fdEventIDList.remove(fdEventID)

            continue

        condition = random.choice(conditionList)

        index = conditionList.index(condition)

            index = 0

        else:

            condition = random.choice(conditionList)

            index = conditionList.index(condition)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FairyAdventuresData % fdEventID, ipyData.GetID() * 100 + index)

    
    if not fdEventIDList:

        GameWorld.Log('寻访仙域, 没有随机出事件！！')

        return

    


    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FairyDomainVisitCnt, min(visitCnt + 1, ChConfig.Def_UpperLimit_DWord))

    #设置事件

    for i in xrange(maxEventCnt):

@@ -221,6 +224,8 @@
    #֪ͨ

    NotifyVisitFairyDomainInfo(curPlayer, fdEventIDList)

    NotifyFairyAdventuresInfo(curPlayer)



    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_FairyDomain, 1)

    return





@@ -228,8 +233,7 @@
    GameWorld.DebugLog("EndFairyDomain", curPlayer.GetID())

    ##结束寻访

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FairyDomainState, 0)

    otherCntRateList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 2)

    maxEventCnt = max([info[1] for info in otherCntRateList]) + 1  #最大可出现事件个数

    maxEventCnt = GetMaxEventCnt()  #最大可出现事件个数

    for i in xrange(maxEventCnt):

        fdEventID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainEventID % i)

        if fdEventID:

@@ -344,8 +348,7 @@
def NotifyVisitFairyDomainInfo(curPlayer, fdEventList=None, isAll=1):

    if not fdEventList:

        syncFDEventList = []

        otherCntRateList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 2)

        maxEventCnt = max([info[1] for info in otherCntRateList]) + 1  #最大可出现事件个数

        maxEventCnt = GetMaxEventCnt()  #最大可出现事件个数

        for i in xrange(maxEventCnt):

            fdEventID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainEventID % i)

            if fdEventID:

@@ -368,6 +371,11 @@
    NetPackCommon.SendFakePack(curPlayer, packData)

    return



def GetMaxEventCnt():

    # 最大可出现事件个数

    otherCntRateList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 2)

    maxEventCnt = max([info[1] for info in otherCntRateList]) + len(IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain'))

    return maxEventCnt



###=========================奇遇===============================

def NotifyFairyAdventuresInfo(curPlayer):

@@ -376,8 +384,7 @@


    packData = ChPyNetSendPack.tagMCFairyAdventuresInfo()

    packData.InfoList = []

    otherCntRateList = IpyGameDataPY.GetFuncEvalCfg('ImmortalDomain', 2)

    maxEventCnt = max([info[1] for info in otherCntRateList]) + 1  #最大可出现事件个数

    maxEventCnt = GetMaxEventCnt()  #最大可出现事件个数

    for i in xrange(maxEventCnt):

        fdEventID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainEventID % i)

        if fdEventID not in AdventuresTypeList:

@@ -441,15 +448,14 @@
                gearAwardList = ipyData.GetGearAward()

                if not gearAwardList:

                    return

                itemRateList = gearAwardList[index] if index < len(gearAwardList) else gearAwardList[-1]

                itemRateList = ItemCommon.GetWeightItemListByAlchemyDiffLV(curPlayer, itemRateList, 1)

                giveItemList = [GameWorld.GetResultByWeightList(itemRateList)]

                giveItemList = []

                itemRandomList = gearAwardList[index] if index < len(gearAwardList) else gearAwardList[-1]

                for itemRateList in itemRandomList:

                    itemRateList = ItemCommon.GetWeightItemListByAlchemyDiffLV(curPlayer, itemRateList, 0)

                    giveItemList.append(GameWorld.GetResultByWeightList(itemRateList))

            else:

                giveItemList = [ipyData.GetBasicAward()]

                
        ItemControler.GivePlayerItemOrMail(curPlayer, giveItemList)

        for itemInfo in giveItemList:

            NPCCommon.SendVirtualItemDrop(curPlayer, itemInfo[0], 0, 0, '')

        NPCCommon.DoGiveItemByVirtualDrop(curPlayer, giveItemList, 0)

        msgDict = {FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(giveItemList)}

        FBCommon.Notify_FB_Over(curPlayer, msgDict)

        GameWorld.DebugLog('缥缈奇遇领奖 msgDict=%s, fdeventID=%s' % (msgDict, fdeventID))