3039 【主干】【1.6】合服定制活动期间资源找回异常

hxp

2019-03-01 0d2578daffd3b32fb0fa05e7dd92e88aa2d92ffa

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py

@@ -31,7 +31,7 @@
import PlayerFamily

import PlayerActivity

import PlayerSuccess

import PlayerMagicWeapon

import GameFuncComm

import PyGameData

import PlayerVip

import GameObj

@@ -66,6 +66,10 @@
Help_isHelp = 'isHelp' #本次是否是助战

Help_helpCount = 'helpCount' #该副本今日已助战次数

Help_relation = 'relation' #该副本关系加成信息 [优先关系, 总加成]

Help_robotJob = 'robotJob' #机器人职业 {"ObjID":job, ...}

Help_isAuto = 'isAuto' #是否自动召唤

Help_hasRefreshBoss = 'hasRefreshBoss' #是否已刷新boss

Help_gsItemInfo = 'gsItemInfo' #聚魂副本物品信息 {"波数":[[{"ItemID":101, "ItemCount":10}]]}



#副本结算信息通用key

Over_dataMapID = 'dataMapID' #数据地图ID

@@ -90,6 +94,7 @@
Over_enterLV = 'enterLV' #进入时等级

Over_leaderID = 'leaderID' #渡劫玩家ID

Over_xianyuanCoin = 'xianyuanCoin' #获得仙缘币信息 [获得仙缘币数, 没有获得的原因] 原因： 1-达到助战次数上限，2-达到每日获得仙缘币上限

Over_helpPlayer = 'helpPlayer' #助战玩家信息 {"玩家ID":{玩家信息key:value, ...}, ...}



#副本行为

(

@@ -371,6 +376,17 @@
    gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMaxLV, maxLV)

    GameWorld.Log("NPC成长动态等级变更: isLeave=%s,totalLV=%s,playerCnt=%s,averageLV=%s,maxLV=%s" 

                  % (isLeave, totalLV, playerCnt, averageLV, maxLV), playerID)

    # 上古战场特殊处理

    if mapID == ChConfig.Def_FBMapID_ElderBattlefield:

        lineID = GameWorld.GetGameWorld().GetPropertyID() - 1

        fbLineIpyData = GetFBLineIpyData(mapID, lineID)

        lvLimitMin = 0 if not fbLineIpyData else fbLineIpyData.GetLVLimitMin()

        robotLVDiff = IpyGameDataPY.GetFuncCfg("ElderBattlefieldCfg", 5)

        robotLVMin, robotLVMax = averageLV - robotLVDiff, averageLV

        robotLVMin = max(lvLimitMin, robotLVMin)

        gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMaxLV, robotLVMax)

        gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMinLV, robotLVMin)

        GameWorld.Log("    更新上古机器人等级范围: lineID=%s,robotLVDiff=%s,robotLV=(%s~%s)" % (lineID, robotLVDiff, robotLVMin, robotLVMax))

    return True



def UpdFBLineNPCStrengthenPlayerCnt(playerID, isLeave):

@@ -614,7 +630,7 @@
#---------------------------------------------------------------------

def SyncDynamicBarrierState(barrierPointList, state, curPlayer=None):

    '''同步动态障碍物是否有效性

    @param barrierPointList: 障碍物点列表 [[aPosX,aPosY,bPosX,bPosY], [aPosX,aPosY,bPosX,bPosY], ...]

    @param barrierPointList: 障碍物点列表 [[aPosX,aPosY,bPosX,bPosY,angle可选], [aPosX,aPosY,bPosX,bPosY,angle可选], ...]

    @param state: 是否有效

    @param curPlayer: 指定通知目标玩家，为None时广播本地图所有玩家

    '''

@@ -622,12 +638,15 @@
    barrierStatePack.Clear()

    barrierStatePack.State = state

    barrierStatePack.BarrierList = []

    for aPosX, aPosY, bPosX, bPosY in barrierPointList:

    for posInfo in barrierPointList:

        aPosX, aPosY, bPosX, bPosY = posInfo[:4]

        angle = posInfo[4] if len(posInfo) > 4 else 0

        barrier = ChPyNetSendPack.tagMCDynamicBarrier()

        barrier.APosX = aPosX

        barrier.APosY = aPosY

        barrier.BPosX = bPosX

        barrier.BPosY = bPosY

        barrier.Angle = angle

        barrierStatePack.BarrierList.append(barrier)

    barrierStatePack.Count = len(barrierStatePack.BarrierList)

    if curPlayer:

@@ -1675,6 +1694,13 @@
            newEnterCnt = max(0, dayTimes - (maxCnt - enterCnt))

            PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, newEnterCnt)

            GameWorld.DebugLog("        特殊副本已进入次数更新: newEnterCnt=%s" % newEnterCnt)

        elif mapID == ChConfig.Def_FBMapID_ZhuXianBoss:

            if GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_ZhuXianBoss):

                curCnt = min(maxCnt - enterCnt + IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg'), IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg', 2))

                if curCnt > dayTimes:

                    PlayerControl.NomalDictSetProperty(curPlayer, itemAddCntKey, curCnt - dayTimes)

                elif curCnt < dayTimes:

                    PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, dayTimes - curCnt)

            

        mapIDInfo.append(mapID)

        

@@ -1740,6 +1766,9 @@
    if mapID == ChConfig.Def_FBMapID_SealDemon and maxDayTimes and maxCnt - enterCnt >= maxDayTimes:

        GameWorld.DebugLog('当前次数已满，无需购买。。')

        return

    if mapID == ChConfig.Def_FBMapID_ZhuXianBoss and maxCnt - enterCnt >= IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg', 2):

        return

    
    if hasBuyCnt >= canBuyCnt:

        GameWorld.DebugLog("购买次数已经用完mapID=%s"%mapID)

        return