6516 【后端】【2.0】战斗公式增加系数

hch

2019-04-18 af2657f5a44d42580f9d2ebcd590118727a11728

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py

@@ -37,7 +37,6 @@
import PlayerBillboard

import PlayerExam

import PlayerControl

import PlayerRecall

import PlayerFamilyAction

import PlayerUniversalGameRec

import PlayerFamily

@@ -48,12 +47,12 @@
import PlayerFB

import UpdatePlayerName

import PlayerFamilyBoss

import PlayerManorWar

import GameWorldBoss

import GameWorldFamilyWar

#import PlayerFamilyTech

import PlayerFamilyRedPacket

import PlayerFBHelpBattle

import PlayerHorsePetBoss

#import PlayerFamilyStore

import PlayerFamilySWRH

import GameWorldProcess

@@ -513,6 +512,21 @@
        PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)

        return

    

    if callName == "DynamicLineMapOpen":

        realMapID, copyMapID = eval(resultName)

        PlayerFB.OnCrossDynamicLineOpen(realMapID, copyMapID)

        return

    
    if callName == "DynamicLineMapClose":

        realMapID, copyMapID, funcLineDataCache = eval(resultName)

        PlayerFB.OnCrossDynamicLineClose(realMapID, copyMapID, funcLineDataCache)

        return

    
    if callName == "DynamicLineMapInitOK":

        realMapID, copyMapCount = eval(resultName)

        PlayerFB.OnCrossDynamicMapReset(realMapID, copyMapCount)

        return

    
    if callName == "CommMapServerInitOK":

        dataMapID, lineID, realMapID, copyMapID = eval(resultName)

        PyGameData.g_commMapLineInfo[(dataMapID, lineID)] = (realMapID, copyMapID)

@@ -544,11 +558,6 @@
        msg, msgList = eval(resultName)

        

        PlayerControl.TeamNotify(teamID, msg, msgList)

        return

    
    if callName == 'ReveiveRecallAward':

        #召回奖励领取情况

        PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)

        return

    

    if callName == "NotifyTruckDestroy":

@@ -657,16 +666,6 @@
                

        return

    

    # 领地争夺战拔旗消耗

    if callName =="ManorWarGetFlagCost":

        PlayerManorWar.ManorWarGetFlagCost(eval(resultName))

        return

    
    # 领地争夺战获胜战盟

    if callName =="ManorWarWinner":

        PlayerManorWar.DoMapServerManorWarWinner(eval(resultName))

        return

    
    # 战盟副本boss开始、被击杀

    if callName =="FamilyBossFBState":

        PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)

@@ -709,16 +708,6 @@
    # 全局击杀数统计

    if callName =="GlobalKillCount":

        GameWorldProcess.UpdGlobalKillCount(eval(resultName))

        return

    
    # 新手指导员天数

    if callName =="FreshmanGuiderDay":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        if not curPlayer:

            return

        
        guiderDay = eval(resultName)[0]

        PlayerControl.SetFreshmanGuiderDay(curPlayer, guiderDay)

        return

    

    #生成仙盟红包

@@ -844,6 +833,10 @@
    if callName =="AllFamilyBossOver":

        PlayerFamilyBoss.AllFamilyBossKilled()

        return

    #骑宠BOSS结束

    if callName =="HorsePetBossOver":

        PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))

        return

    

#---return分割线-----------------------------------------------------------------



@@ -888,10 +881,6 @@
            return

        resultName = '%s' % ret

        

    if callName == 'SendInviteCode':

        #邀请码验证回复

        resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())

    
    if callName == 'OpenServerCampaignAward':

        #可否领取开服活动奖励

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

@@ -920,14 +909,6 @@
#        if not curPlayer:

#            return

#        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)

     
    # 玩家天梯奖励

    if callName == "HighLadderReward":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        import HighLadder

        needResult, resultName = HighLadder.MapServer_HighLadderReward(curPlayer, eval(resultName))

        if not needResult:

            return

        

    srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)