Add: 骑宠争夺增加参与奖玩家活动参与奖（活动结束结算或boss都被击杀）； Add：增加参与修行点（摸到boss就算）； Fix：修复历史击杀仙盟...

hxp

2018-08-30 31f67df8aa49922e9f9d307702f18d29596d15c8

Add: 骑宠争夺增加参与奖玩家活动参与奖（活动结束结算或boss都被击杀）；
Add：增加参与修行点（摸到boss就算）；
Fix：修复历史击杀仙盟名显示错误bug；

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

@@ -36,6 +36,7 @@
import ChPyNetSendPack

import PlayerDBGSEvent

import PlayerUniversalGameRec

import PlayerCompensation

import IpyGameDataPY

import MergePlayer

import PyGameDataStruct

@@ -44,8 +45,9 @@
import CommFunc

import PyGameData

import PlayerGeTui

import time

import IPY_GameServer



import time







@@ -1043,6 +1045,38 @@
        NetPackCommon.SendFakePack(curPlayer, packData)

    return



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



def MapServer_HorsePetRobBossHurtPlayer(msgInfo):

    ## 骑宠争夺boss伤血玩家同步

    GameWorld.Log("骑宠争夺boss伤血玩家同步: %s" % str(msgInfo))

    if not isinstance(msgInfo, list) and len(msgInfo) != 2:

        return

    
    bossID, familyHurtPlayerIDListDict = msgInfo

    PyGameData.g_horsePetRobBossHurtPlayerIDInfo[bossID] = familyHurtPlayerIDListDict

    GameWorld.Log("伤血玩家汇总: %s" % PyGameData.g_horsePetRobBossHurtPlayerIDInfo)

    
    # 判断是否都同步上来了

    horsePetRobBossIDList = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)

    for needBossID in horsePetRobBossIDList:

        if needBossID not in PyGameData.g_horsePetRobBossHurtPlayerIDInfo:

            return

        
    # 结算活动参与奖励

    joinAwardItemList = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 2)

    joinPlayerIDList = []

    for familyHurtPlayerIDDict in PyGameData.g_horsePetRobBossHurtPlayerIDInfo.values():

        for playerIDList in familyHurtPlayerIDDict.values():

            for playerID in playerIDList:

                if playerID not in joinPlayerIDList:

                    joinPlayerIDList.append(playerID)

                    
    GameWorld.Log("结算骑宠争夺参与奖玩家: joinPlayerIDList=%s" % joinPlayerIDList)

    PlayerCompensation.SendMailByKey("FairyGrabBossJoin", joinPlayerIDList, joinAwardItemList)

    PyGameData.g_horsePetRobBossHurtPlayerIDInfo = {}

    return



def MapServer_FamilyOwnerBossInfo(msgInfo):

    ## 地图同步仙盟归属boss信息

    


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

@@ -625,6 +625,11 @@
    if callName =="FamilyOwnerBossInfo":

        GameWorldBoss.MapServer_FamilyOwnerBossInfo(eval(resultName))

        return



    # 骑宠争夺伤血玩家同步

    if callName =="HorsePetRobBossHurtPlayer":

        GameWorldBoss.MapServer_HorsePetRobBossHurtPlayer(eval(resultName))

        return

    

    # 全局掉落CD

    if callName =="GlobalDropCD":


 ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py

@@ -62,7 +62,8 @@
g_bossShuntDeadLine = {} # boss分流线路boss已死亡的线路 {bossID:[lineID, ...], ...}

g_bossShuntDeadLineChangeBoss = [] # boss分流已死亡线路有变更的boss列表



g_familyOwnerBossInfo = {} # 地图同步上来的仙盟归属boss信息

g_familyOwnerBossInfo = {} # 地图同步上来的仙盟归属boss信息 {bossID:[curHp, maxHP, ownerFamilyID, ownerFamilyName], ...}

g_horsePetRobBossHurtPlayerIDInfo = {} # 骑宠争夺有对boss伤血过的玩家ID信息 {bossID:{familyID:[playerID, ...], ...}, ...}



g_todayPlayerLVDict = {} #今日玩家等级字典 {playerID:lv,..}

g_yesterdayPlayerLVDict = {} #昨日玩家等级字典{playerID:lv,..}


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py

@@ -20,6 +20,7 @@
import IPY_GameWorld

import NetPackCommon

import ChPyNetSendPack

import PlayerActivity

import PlayerControl

import IpyGameDataPY

import NPCCommon

@@ -80,6 +81,10 @@
    if not g_familyOwnerBossHurt:

        g_familyOwnerBossHurt = FamilyOwnerBossHurt()

    return g_familyOwnerBossHurt



def IsHorsePetRobBoss(bossID):

    ## 是否骑宠争夺bossID

    return bossID in IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)



def OnGMPrintFamilyOwnerBossHurt(curPlayer, curNPC):

    ## GM显示仙盟归属boss伤血信息

@@ -181,6 +186,12 @@
            hurtName = familyName if hurtType == FamilyHurtObjType_Family else playerName

            objHurtDict[hurtID] = FamilyHurtObj(familyID, hurtType, hurtID, hurtName)

        hurtObj = objHurtDict[hurtID]

        
        # 玩家对该boss第一次造成伤害

        if hurtType == FamilyHurtObjType_Player and hurtObj.hurtValue == 0 and hurtValue:

            if IsHorsePetRobBoss(curBoss.GetNPCID()):

                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyRobBoss)

            
        hurtObj.hurtValue += hurtValue

        GameWorld.DebugLog("    更新伤血%s: hurtType=%s,hurtID=%s,hurtValue=%s" 

                           % (mark, hurtType, hurtID, hurtObj.hurtValue), playerID)

@@ -311,7 +322,7 @@
    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "FamilyOwnerBossInfo", syncMsg, len(syncMsg))

                

    # 伤血在NPCCommon统一清

    return

    return ownerFamilyName



def RefreshFamilyOwnerNPCHurt(npcControl, curNPC, tick, refreshInterval):

    ## 仙盟归属boss刷新伤血列表

@@ -498,6 +509,13 @@
    

    key = (lineID, objID, bossID)

    hurtMgr = GetFamilyHurtMgr()

    
    # 同步对骑宠争夺boss有伤血的玩家ID到GameServer

    familyHurtPlayerIDListDict = hurtMgr.familyPlayerIDDict.get(key, {})

    if IsHorsePetRobBoss(bossID) and familyHurtPlayerIDListDict:

        syncMsg = str([bossID, familyHurtPlayerIDListDict])

        GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "HorsePetRobBossHurtPlayer", syncMsg, len(syncMsg))

        
    hurtMgr.ClearNPCHurt(key)

    

    GameWorld.DebugLog("ClearFamilyOwnerBossHurt lineID=%s, objID=%s, bossID=%s" % (lineID, objID, bossID))