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

hch

2019-04-18 af2657f5a44d42580f9d2ebcd590118727a11728

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

@@ -37,25 +37,23 @@
import PlayerBillboard

import PlayerExam

import PlayerControl

import PlayerRecall

import PlayerFamilyAction

import PlayerUniversalGameRec

import PlayerFamily

import GameWorldOpenServerCampaign

import ShareDefine

import GameDataRecord

import GameWorldShopItem

import PlayerCompensation

import PlayerFB

import UpdatePlayerName

import PlayerFamilyBoss

import PlayerManorWar

import GameWorldBoss

import GameWorldFamilyWar

#import PlayerFamilyTech

import PlayerFamilyRedPacket

import PlayerFBHelpBattle

import PlayerFamilyStore

import PlayerHorsePetBoss

#import PlayerFamilyStore

import PlayerFamilySWRH

import GameWorldProcess

import PlayerLVAward

@@ -73,6 +71,7 @@
import CrossRealmPK

import ChPyNetSendPack

import NetPackCommon

import AuctionHouse



import time

import datetime

@@ -484,10 +483,10 @@
    resultName = pack.GetResultName()                       #[queryid, 人气值， 物品ID]

    

    if callName == "SendMail":

        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail = eval(resultName)

        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource = eval(resultName)

        limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))

        limitTime = limitTime.split(".")[0]

        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail)

        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail, moneySource=moneySource)

        return

    

    if callName == "SendMailBatch":

@@ -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)

@@ -530,14 +544,6 @@
        PlayerFamily.MapServer_PyAddFamilyInfoValue(curPlayer, eval(resultName))

        return

    

    if callName == 'UpdRechargeRankBillboard':     #地图服务器更新玩家通知特惠累计充值排行榜

        PlayerBillboard.MapServer_UpdateRechargeRankBillboard(eval(resultName))

        return

    
    if callName == 'UpdCostRankBillboard':     #地图服务器更新玩家通知特惠累计消费排行榜

        PlayerBillboard.MapServer_UpdateCostRankBillboard(eval(resultName))

        return

    
    if callName == 'UpdateTotalRechargeBillboard':    #地图服务器更新玩家充值总数排行榜

        PlayerBillboard.MapServer_UpdateTotalRechargeBillboard(eval(resultName))

        return

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

        

        PlayerControl.TeamNotify(teamID, msg, msgList)

        return

    
    if callName == 'ReveiveRecallAward':

        #召回奖励领取情况

        PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)

        return

    

    if callName == "NotifyTruckDestroy":

@@ -665,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)

@@ -719,22 +710,6 @@
        GameWorldProcess.UpdGlobalKillCount(eval(resultName))

        return

    

    # 自定义商店全服限购次数清空

    if callName =="ShopItemClearBuyCnt":

        shopID = eval(resultName)[0]

        GameWorldShopItem.DoShopItemClearBuyCnt(shopID)

        return

    
    # 新手指导员天数

    if callName =="FreshmanGuiderDay":

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

        if not curPlayer:

            return

        
        guiderDay = eval(resultName)[0]

        PlayerControl.SetFreshmanGuiderDay(curPlayer, guiderDay)

        return

    
    #生成仙盟红包

    if callName == "MapServer_CreatRedPacket":

        PlayerFamilyRedPacket.MapServer_CreatRedPacket(eval(resultName))

@@ -761,6 +736,10 @@
    if callName =="DuJieFBOver":

        PlayerDuJie.DoDuJieFBOver(eval(resultName))

        return

    #境界提升全服buff

    if callName =="RealmUpAddBuff":

        PlayerDuJie.DoRealmUpAddBuff(resultName)

        return

    

    # 组队副本队长请求进入询问结果

    if callName == "EnterFBTeamAsk":

@@ -778,6 +757,16 @@
        if not curPlayer:

            return

        PlayerBourse.OnGivePlayerBourseGainsResult(curPlayer, eval(resultName))

        return

    
    # 拍卖行

    if callName == "AuctionHouse":

        curPlayer = None

        if srcPlayerID:

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

            if not curPlayer:

                return

        AuctionHouse.MapServer_AuctionHouseLogic(curPlayer, eval(resultName), tick)

        return

    

    if callName == "TeamMemFuncData":

@@ -840,6 +829,14 @@
    if callName =="AddBossRebornPoint":

        GameWorldBoss.AddBossRebornPoint(eval(resultName))

        return

    #多仙盟BOSS结束

    if callName =="AllFamilyBossOver":

        PlayerFamilyBoss.AllFamilyBossKilled()

        return

    #骑宠BOSS结束

    if callName =="HorsePetBossOver":

        PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))

        return

    

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



@@ -884,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)

@@ -910,25 +903,12 @@
            return

        resultName = '%s' % ret

        

    # 战盟仓库

    if callName == "FamilyStore":

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

        if not curPlayer:

            return

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

    
    # 自定义商店物品

    if callName == "ShopItem":

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

        resultName = '%s' % GameWorldShopItem.DoShopItemQueryResult(curPlayer, eval(resultName))

     
    # 玩家天梯奖励

    if callName == "HighLadderReward":

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

        import HighLadder

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

        if not needResult:

            return

#    # 战盟仓库

#    if callName == "FamilyStore":

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

#        if not curPlayer:

#            return

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

        

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