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

hch

2018-12-26 f78b5c4fb02a016c43398f512a302b8c24d62698

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py

@@ -1483,7 +1483,7 @@
def CrossServerMsg_PKMatchResult(vsRoomDict):

    ## 跨服PK匹配结果

    curServerGroupID = GameWorld.GetServerGroupID()

    actionType = ShareDefine.Def_MergeAction_MergePK

    actionType = ShareDefine.Def_CrossAction_PK

    mapPosList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKMatch", 5)

    GameWorld.Log("=== 收到PK匹配结果处理  === curServerGroupID=%s" % curServerGroupID)

    if not mapPosList: