66 【公会】基础主体-服务端（优化游戏服及跨服启动、通讯逻辑；服务器类型增加跨服中心、跨服事件、时间管理；跨服玩家在线状态、基础信息、玩家资源增减管...

hxp

6 天以前 01a0e539b786ae0f1c46646874502367f5410aca

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py

@@ -29,7 +29,6 @@
import GameWorld

import PlayerLLMJ

import PlayerPrestigeSys

import CrossServerPackLogic

import DataRecordPack

import PlayerSuccess

import IpyGameDataPY

@@ -45,6 +44,7 @@
import TurnBuff

import FBCommon

import CommFunc

import CrossMsg

import FBLogic



import random

@@ -1279,17 +1279,17 @@
            isMultiMap = True

            

    if isMultiMap:

        CrossServerPackLogic.SendBattleRequest(reqInfo, guid, mapID, funcLineID, reqPlayerID)

        CrossMsg.SendBattleRequest(reqInfo, guid, mapID, funcLineID, reqPlayerID)

    else:

        SSMsg_BattleRequest(reqInfo, fromServerID)

        S2B_BattleRequest(reqInfo, fromServerID)

    return



def SSMsg_BattleRequest(reqInfo, fromServerID, msgType=""):

def S2B_BattleRequest(reqInfo, fromServerID, msgType=""):

    ## 请求执行战斗，由本地图或其他服务器地图分配过来的战斗请求

    guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo

    if msgType:

        GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s" 
                      % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)

    #if msgType:

    #    GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s" 
    #                  % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)

        

    if npcLineupIDList:

        turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)

@@ -1308,20 +1308,20 @@
    

    # 本地图自己处理的

    if fromServerID == GameWorld.GetGameWorld().GetServerID():

        SSMsg_BattleResult(retInfo, fromServerID)

        B2S_BattleResult(retInfo, fromServerID)

        

    # 其他服务器地图请求的，发送战斗结果回去

    else:

        CrossServerPackLogic.SendBattleResult(retInfo, fromServerID, guid, mapID, funcLineID, reqPlayerID)

        CrossMsg.SendBattleResult(retInfo, fromServerID, guid, mapID, funcLineID, reqPlayerID)

    return



def SSMsg_BattleResult(retInfo, fromServerID, msgType=""):

def B2S_BattleResult(retInfo, fromServerID, msgType=""):

    ## 收到战斗结果信息

    

    guid, mapID, funcLineID, reqPlayerID, winFaction, statMsg, dateStr, reqData = retInfo

    if msgType:

        GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s" 
                      % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)

    #if msgType:

    #    GameWorld.Log("OnServerReceiveMsg => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s" 
    #                  % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)

        

    curPlayer = None

    if reqPlayerID: