5372 聚魂副本小怪除了守卫的减速，其它BUFF都不让加

xdh

2018-12-29 a05669a41643cfef0dfb3736dcf903302fa30b31

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

@@ -64,13 +64,12 @@
import PlayerGameEvent

import EventReport

import PlayerTeHui

import GameLogic_XMZZ

import PlayerGatherSoul

import PlayerSuccess

import PlayerPet

import PlayerGreatMaster

import ItemControler

import GameFuncComm

import PlayerMergeEvent

import IpyGameDataPY

import PlayerRune

import GameLogic_DuJie

@@ -83,7 +82,9 @@
import PlayerFamilyTech

import PlayerCostRebate

import PlayerFairyCeremony

import PlayerCrossRealmPK

import FunctionNPCCommon

import CrossRealmPlayer

import ChNetSendPack

import PlayerState

import QuestCommon

@@ -230,7 +231,7 @@
#  @return 无返回值

def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]):

    # 如果是跨服服务器，则广播子服

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        sendMsg = str([country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo])

        GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'MergeWorldNotify',

                                                                  sendMsg, len(sendMsg))

@@ -353,7 +354,7 @@
        return

    

    # 跨服服务器不允许发送邮件

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        return

    

    itemCountDict = {}

@@ -1499,6 +1500,11 @@
        #RouteServer未初始化不允许切换地图, 缓存处理

        GameServerRefresh.Set_PlayerRouteServerInitOK_OnLeaveFB(curPlayer, 1)

        return

    
    GameWorld.Log("PlayerLeaveFB...", curPlayer.GetPlayerID())

    if GameWorld.IsCrossServer():

        CrossRealmPlayer.PlayerExitCrossServer(curPlayer)

        return



    #中立地图回到上一次非中立常规地图    

    if curPlayer.GetMapID() in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):

@@ -1559,72 +1565,6 @@


#---------------------------------------------------------------------



def ResetMergeFBPlayerCntInfo(resetMapID):

    # 重置跨服活动副本地图人数分配情况信息

    mapID = GameWorld.GetMap().GetMapID()

    if mapID != ChConfig.Def_MergeTransMapID:

        return

    GameWorld.Log("重置跨服活动副本地图人数分配情况信息: resetMapID=%s" % resetMapID)

    gameWorld = GameWorld.GetGameWorld()

    mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")

    for reqMapID, mapInfo in mergeFBPlayerCntDict.items():

        if resetMapID and resetMapID != reqMapID:

            continue

        for playerMapID in mapInfo[1]:

            playerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID)

            for num in xrange(1, 1 + playerCnt):

                playerID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num))

                gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num), 0) # 重置对应的玩家ID

                gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), 0) # 重置玩家ID对应的地图

            gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, 0) # 重置地图人数

    return



def __GetMergeFBPlayerMapID(curPlayer, reqMapID):

    # 获取玩家所分配的跨服活动地图ID

    # @param reqMapID: 可以是本服活动的地图ID标识； 也可以是指定的跨服活动地图ID, 如果是指定的地图ID也是直接返回

    
    mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")

    if reqMapID not in mergeFBPlayerCntDict:

        return reqMapID

    
    playerID = curPlayer.GetPlayerID()

    gameWorld = GameWorld.GetGameWorld()

    
    playerMapID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID))

    if playerMapID:

        GameWorld.DebugLog("已经有分配跨服活动地图，直接返回！playerMapID=%s" % (playerMapID), playerID)

        return playerMapID

    
    # 还没分配该玩家， 则开始选择分配的地图ID

    maxPlayerCnt, mapIDList = mergeFBPlayerCntDict[reqMapID]

    minPlayerCount = 0 # 最少的地图玩家人数

    minPlayerMapID = 0 # 最少人数的地图ID

    for mID in mapIDList:

        curMapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % mID)

        if curMapPlayerCnt < maxPlayerCnt:

            playerMapID = mID

            break

        
        # 保存最少人数的地图ID信息

        if not minPlayerCount or (minPlayerCount and curMapPlayerCnt < minPlayerCount):

            minPlayerCount = curMapPlayerCnt

            minPlayerMapID = mID

    
    # 如果没有人数未满的活动地图，则分配到人数较少的地图

    if not playerMapID:

        playerMapID = minPlayerMapID

        
    # 更新分配信息

    if playerMapID:

        mapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID) + 1

        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, mapPlayerCnt)

        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, mapPlayerCnt), playerID)

        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), playerMapID)

        GameWorld.Log("分配跨服活动玩家所属地图: plaeyrID=%s,reqMapID=%s,分配MapID=%s,mapPlayerCnt=%s" 
                      % (playerID, reqMapID, playerMapID, mapPlayerCnt))

        
    return playerMapID



##玩家进入副本

# @param curPlayer 玩家实例

# @param mapID 地图ID

@@ -1643,13 +1583,13 @@
    #        NotifyCode(curPlayer, 'jiazu_xyj_671654')

    #        return

        

    #跨服活动人数分流处理

    if GameWorld.IsMergeServer():

        reqMapID = mapID

        mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)

        if not mapID:

            GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)

            return

#    #跨服活动人数分流处理

#    if GameWorld.IsCrossServer():

#        reqMapID = mapID

#        mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)

#        if not mapID:

#            GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)

#            return

      

    #过滤封包地图ID

    if not GameWorld.GetMap().IsMapIDExist(mapID):

@@ -1774,6 +1714,12 @@
        if isNotify:

            NotifyCode(curPlayer, "SingleEnterPK", [mapID])

        return ShareDefine.EntFBAskRet_PKState

    
    ## 跨服PK匹配中

    if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer):

        if isNotify:

            NotifyCode(curPlayer, "CrossMatching8", [mapID])            
        return ShareDefine.EntFBAskRet_CrossPKMatching

    

    #===============================================================================================

    # # 这里不做状态限制，由前端处理，因为策划要根据界面来处理，同一传送功能有可能在不同界面

@@ -2846,12 +2792,7 @@
        SetPlayerCurrency(curPlayer, type_Price, curCurrency - price)

    else:

        GameWorld.Log("付费金钱异常 type_Price = %s" % (type_Price), curPlayer.GetPlayerID())

        return False   
    
    #添加跨服操作事件

    if costType in ChConfig.MergeServerCanCostType:

        eventInfo = [type_Price, price, costType, infoDict, quantity, costVIPGold]

        PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_PayMoney, eventInfo)

        return False

    

    #付款以后后续操作

    __PayMoneyAfter(curPlayer, type_Price, price, costType, infoDict, quantity, costVIPGold)

@@ -3652,10 +3593,6 @@
        #副本获得经验, 无论获得多少经验均需通知, 有些副本逻辑需要通过获得经验时机处理

        if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:

            FBLogic.OnGetExp(curPlayer, finalAddExp, expViewType)

        
        # 跨服中获得经验

        if finalAddExp and GameWorld.IsMergeServer():

            PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddExp, finalAddExp)

            

        return finalAddExp

    

@@ -4089,6 +4026,7 @@
        PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)

        PlayerEquipDecompose.RefreshEDAttr(curPlayer)

        PlayerDogz.RefreshDogzAttr(curPlayer)

        PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)

        self.RefreshAllState(isForce=True)

        GameWorld.DebugLog("End ReCalcAllState!!!")

        return

@@ -5707,6 +5645,10 @@
def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False)

def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()



## 跨服状态: 0-非跨服状态，1-跨服状态

def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()

def SetCrossRealmState(curPlayer, value): curPlayer.SetExAttr5(value, False, True)



## 铜钱点, 支持铜钱超20亿

def GetSilver(curPlayer): return curPlayer.GetExAttr6() * ChConfig.Def_PerPointValue + curPlayer.GetSilver()

def SetSilver(curPlayer, totalSilver):

@@ -5730,6 +5672,21 @@
##聊天气泡框

def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10()

def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)



## 玩家所属服务器组ID

def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()

def UpdPlayerServerGroupID(curPlayer):

    # 更新自己的服务器组ID, 跨服服务器不处理

    if GameWorld.IsCrossServer():

        return

    serverGroupID = GameWorld.GetServerGroupID()

    if not serverGroupID:

        return

    playerServerGroupID = curPlayer.GetExAttr13()

    if playerServerGroupID != serverGroupID:

        curPlayer.SetExAttr13(serverGroupID, False, True)

        GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID)

    return



##获得玩家威望值

def GetPrestige(curPlayer): return 0

@@ -5826,10 +5783,6 @@
    

    SetZhenQi(curPlayer, value)

    #EventReport.WriteEvent_add_zhenqi(curPlayer, eventName, eventData, addValue, value)



    if GameWorld.IsMergeServer():

        eventInfo = [addValue, eventName, eventData]

        PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddZhenQi, eventInfo)

    return True





@@ -5921,19 +5874,6 @@
def SetLongMaiLV(curPlayer, value):

    return

#---------------------------------------------------------------------------

## 设置玩家跨服预赛排位

#  @param curPlayer: 玩家实例

#  @param value: 威望值

#  @return: 
def SetMergeWarRank(curPlayer, value):

    return



    
## 获取玩家跨服预赛排位

#  @param curPlayer: 玩家实例

#  @return: 威望值

def GetMergeWarRank(curPlayer):

    return 0



##获取可免费开启的格子数

# @param curPlayer 玩家对象