6291 【后端】【2.0】限时仙盟boss(鼓舞修改)

xdh

2019-03-12 fe42c2433fea4cfd894b38fec62f24fa4a5d047a

6291 【后端】【2.0】限时仙盟boss(鼓舞修改)

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -1855,7 +1855,7 @@
Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]



# 可重复进的副本

Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]

Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]



# 无玩家时不自动关闭的自伸缩副本

Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py

@@ -27,6 +27,7 @@
import GameLogic_SealDemon

import GameLogic_ZhuXianBoss

import GameLogic_ZhuXianTower

import GameLogic_AllFamilyBoss



## GM命令执行入口

#  @param curPlayer 当前玩家

@@ -50,6 +51,10 @@
        #诛仙塔击杀怪

        GameWorld.GetGameFB().SetGameFBDict(GameLogic_ZhuXianTower.FBDict_RemainHP, 1)

        return

    if curPlayer.GetMapID() == ChConfig.Def_FBMapID_AllFamilyBoss:

        #仙盟BOSS击杀怪

        GameWorld.GetGameWorld().SetGameWorldDict(GameLogic_AllFamilyBoss.FBDict_RemainHP, 1)

        return

    isMapAllNPC = 0

    if len(playerList) > 0:

        isMapAllNPC = playerList[0]


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py

@@ -1915,7 +1915,7 @@
#  @param tick 当前时间

#  @param isMaxlv 是否直接满级

#  @return None

def FbEncourageBuff(curPlayer, key, encourageType, tick, isMaxlv=False):

def FbEncourageBuff(curPlayer, key, encourageType, tick, ownerID=0):

    #GameWorld.Log("FbEncourageBuff moneyType=%s" % (moneyType))

    curMapID = curPlayer.GetMapID()

    curMapID = GetRecordMapID(curMapID)

@@ -1924,10 +1924,10 @@
        return

    maxCnt = ipyData.GetInspireMaxLV()

    gameFB = GameWorld.GetGameFB()

    curPlayerID = curPlayer.GetID()

    encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)

    ownerID = ownerID or curPlayer.GetID()

    encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)

    encourageCntKey = 'FbEncourageCnt_%s' % encourageType

    encourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey)

    encourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey)

    maxLV = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 2, {}).get(curMapID, 0)

    if encourageLV >= maxLV:

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_93643")

@@ -1963,28 +1963,44 @@
    

    buffType = SkillCommon.GetBuffType(skillBuff)

    BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)

    gameFB.SetPlayerGameFBDict(curPlayerID, key, encourageLV+1)

    gameFB.SetPlayerGameFBDict(curPlayerID, encourageCntKey, encourageCnt+1)

    gameFB.SetPlayerGameFBDict(ownerID, key, encourageLV+1)

    gameFB.SetPlayerGameFBDict(ownerID, encourageCntKey, encourageCnt+1)

    #GameWorld.Log("FbEncourageBuff encourage nextLV=%s success" % encourageLV)

    addHurtNum = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 3, {}).get(curMapID, 0)

    PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])

    SendFBEncourageInfo(curPlayer, encourageLV+1)

    #成就

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])

    EventShell.EventRespons_FBEncourage(curPlayer, curMapID)

    return

    if curMapID == ChConfig.Def_FBMapID_AllFamilyBoss:

        #给副本里所有盟成员提示

        playerManager = GameWorld.GetMapCopyPlayerManager()

        for index in xrange(playerManager.GetPlayerCount()):

            player = playerManager.GetPlayerByIndex(index)

            if not player:

                continue

            if player.GetFamilyID() != ownerID:

                continue

            PlayerControl.NotifyCode(player, "AllianceBossText2", [curPlayer.GetName(), encourageLV+1])

            SendFBEncourageInfo(player, encourageLV+1, ownerID)

            if player.GetID() == curPlayer.GetID():

                PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])

                EventShell.EventRespons_FBEncourage(curPlayer, curMapID)

            
    else:

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])

        SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)

        #成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])

        EventShell.EventRespons_FBEncourage(curPlayer, curMapID)

    return True



## 添加副本鼓舞buff，一般用于玩家掉线后，在规定时间内重新上线回到副本时重新上buff

#  @param curPlayer 玩家

#  @param key 副本玩家字典key

#  @param tick 当前时间

#  @return None

def AddFbEncourageBuff(curPlayer, key, tick):

def AddFbEncourageBuff(curPlayer, key, tick, ownerID=0):

    curPlayerID = curPlayer.GetID()

    GameWorld.Log("AddFbEncourageBuff() curPlayerID=%s" % curPlayerID)

  

    gameFB = GameWorld.GetGameFB()

    encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)

    encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)

    if not encourageLV:

        return

    mapID = GameWorld.GetMap().GetMapID()

@@ -1999,7 +2015,7 @@
    buffType = SkillCommon.GetBuffType(skillBuff)

    BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)

    

    SendFBEncourageInfo(curPlayer, encourageLV)

    SendFBEncourageInfo(curPlayer, encourageLV, ownerID)

    return



## 清除鼓舞buff

@@ -2019,7 +2035,7 @@
## 发送副本鼓舞信息

#  @param curPlayer 玩家

#  @return None

def SendFBEncourageInfo(curPlayer, lv):

def SendFBEncourageInfo(curPlayer, lv, ownerID=0):

    #//A3 0A 副本鼓舞信息通知 #tagMCFBEncourageInfo

    curMapID = curPlayer.GetMapID()

    curMapID = GetRecordMapID(curMapID)

@@ -2031,12 +2047,12 @@
    encourageInfo.InfoList = []

    encourageCntKey = 'FbEncourageCnt_%s'

    gameFB = GameWorld.GetGameFB()

    curPlayerID = curPlayer.GetID()

    ownerID = ownerID or curPlayer.GetID()

    for ipyData in ipyDataList:

        inspireType = ipyData.GetInspireType()

        packData = ChPyNetSendPack.tagMCFBEncourageCnt()

        packData.MoneyType = inspireType

        packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey % inspireType)

        packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey % inspireType)

        encourageInfo.InfoList.append(packData)

    encourageInfo.Cnt = len(encourageInfo.InfoList)

    NetPackCommon.SendFakePack(curPlayer, encourageInfo)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py

@@ -39,6 +39,7 @@
FBPlayerDict_Rank = "FBPlayerDict_Rank"  # 玩家排名

FBDict_BossTotalHP = 'FBDict_BossTotalHP'  #BOSS血量

FBDict_LastHurtTick = 'FBDict_LastHurtTick'  #上次伤害时间

FBDict_IsEncourage = 'FBDict_IsEncourage'  #是否鼓舞过



(

    Def_BossTime, #BOSS时间

@@ -142,7 +143,8 @@
    

    playerCnt = GameWorld.GetGameWorld().GetMapCopyPlayerManager().GetPlayerCount()

    GameWorld.DebugLog("DoEnterFB...playerCnt=%s,lineID=%s" % (playerCnt, lineID), playerID)

    
    familyID = curPlayer.GetFamilyID()

    fbStep = GameWorld.GetGameFB().GetFBStep()

    hadDelTicket = FBCommon.GetHadDelTicket(curPlayer)

    if not hadDelTicket:

        FBCommon.SetHadDelTicket(curPlayer)

@@ -151,26 +153,29 @@
            PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss1, 1)

        else:

            PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss2, 1)

        if GameWorld.GetGameFB().GetFBStep() == FB_Step_Open:

        if fbStep == FB_Step_Open:

            FBCommon.SetFBStep(FB_Step_Fighting, tick)

        familyID = curPlayer.GetFamilyID()

        if familyID not in PyGameData.g_allfamilyBossDict:

            PyGameData.g_allfamilyBossDict[familyID] = [curPlayer.GetFamilyName(), 0, [playerID]]

        elif playerID not in PyGameData.g_allfamilyBossDict[familyID][2]:

            PyGameData.g_allfamilyBossDict[familyID][2].append(playerID)



        EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 0, ChConfig.CME_Log_Start)

        if fbStep >= FB_Step_Over:

            PlayerControl.PlayerLeaveFB(curPlayer)

            return



    if familyID not in PyGameData.g_allfamilyBossDict:

        PyGameData.g_allfamilyBossDict[familyID] = [curPlayer.GetFamilyName(), 0, [playerID]]

    elif playerID not in PyGameData.g_allfamilyBossDict[familyID][2]:

        PyGameData.g_allfamilyBossDict[familyID][2].append(playerID)

    

    UpdateHPReduceSpeed(tick)        

    gameFB = GameWorld.GetGameFB()

    # 上鼓舞buff

    encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)

    encourageLV = gameFB.GetPlayerGameFBDictByKey(familyID, FBPlayerDict_EncourageLV)

    if encourageLV > 0:

        FBCommon.AddFbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, tick)

        FBCommon.AddFbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, tick, familyID)

    else:

        FBCommon.SendFBEncourageInfo(curPlayer, encourageLV)

        FBCommon.SendFBEncourageInfo(curPlayer, encourageLV, familyID)

        

    #DoFBHelp(curPlayer, tick)

    DoFBHelp(curPlayer, tick)

    return





@@ -217,19 +222,20 @@
# @return 返回值无意义

def DoPlayerLeaveFB(curPlayer, tick):

#    FBCommon.SetHadDelTicket(curPlayer, 0)

#    #主动退出的去掉排行榜信息

#    lineID = GameWorld.GetGameWorld().GetPropertyID() - 1

#    playerHurtDict = PyGameData.g_AllFamilyBossPlayerHurtDict.get(lineID, {})

#    playerHurtDict.pop(curPlayer.GetPlayerID(), 0)

#    PyGameData.g_AllFamilyBossPlayerHurtDict[lineID] = playerHurtDict

#    if not playerHurtDict: #榜上没人，停止掉血

#        StopReduceHP(lineID, tick)

    #主动退出的去掉排行榜信息

    familyHurtInfo = PyGameData.g_allfamilyBossDict.get(curPlayer.GetFamilyID(), [])

    if familyHurtInfo:

        playerID = curPlayer.GetPlayerID()

        if playerID in familyHurtInfo[2]:

            familyHurtInfo[2].remove(playerID)

            FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)

    return





##玩家切换地图

def DoPlayerChangeMapLogic(curPlayer):

    #FBCommon.SetHadDelTicket(curPlayer, 0)

    
    return





@@ -271,12 +277,13 @@
    totalHP = __GetBossTotalHP()

    hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0

    remainHPPer = min(1000000, remainHP * 1000000 / totalHP) if totalHP else 0

    
    fbHelpDict = {"hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed,

    playerID = curPlayer.GetPlayerID()

    IsEncourage = GameWorld.GetGameFB().GetPlayerGameFBDictByKey(playerID, FBDict_IsEncourage)

    fbHelpDict = {"hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed,'IsEncourage':IsEncourage,

                  'remainHPPer':remainHPPer, 'isReduceing':isReduceing, 'myHurt':myHurt % ChConfig.Def_PerPointValue,

                  'myHurtEx':myHurt / ChConfig.Def_PerPointValue, 'myRank':myRank, 'myMenberCnt':myMenberCnt

                  }

    GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())

    GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, playerID)

    FBCommon.Notify_FBHelp(curPlayer, fbHelpDict)

    return



@@ -289,7 +296,17 @@
#  @return None

def DoFBAction(curPlayer, actionType, actionInfo, tick):

    if actionType == 0:

        FBCommon.FbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, actionInfo, tick)

        playerID = curPlayer.GetID()

        gameFB = GameWorld.GetGameFB()

        if gameFB.GetPlayerGameFBDictByKey(playerID, FBDict_IsEncourage):

            GameWorld.DebugLog('只能鼓舞一次！', playerID)

            return

        if FBCommon.FbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, actionInfo, tick, curPlayer.GetFamilyID()):

            gameFB.SetPlayerGameFBDict(playerID, FBDict_IsEncourage, 1)

            #给鼓舞奖励

            itemList = IpyGameDataPY.GetFuncEvalCfg('LeagueBOSSReward1')

            giveItemList = [[itemID, itemCnt, 0] for itemID, itemCnt in itemList]

            ItemControler.GivePlayerItemOrMail(curPlayer, giveItemList)

    return





@@ -389,27 +406,29 @@
            memberCnt = len(memberIDList)

            familyAuctionItemList, menberItemList = __GetFamilyBossAward(rank, worldLV)

            GameWorld.Log('rank=%s,worldLV=%s,familyAuctionItemList=%s,menberItemList=%s,memberCnt=%s'%(rank, worldLV,familyAuctionItemList,menberItemList, memberCnt), familyID)

            
            overDict = {FBCommon.Over_rank:rank, 'memberCnt':len(memberIDList)}

            if memberCnt >= needMemberCnt and familyAuctionItemList:#仙盟拍品

                familyAuctionItemDict[familyID] = [memberIDList, familyAuctionItemList]

                overDict['AuctionItem'] = FBCommon.GetJsonItemList(familyAuctionItemList)

            if menberItemList: #成员奖励

                overDict = {FBCommon.Over_rank:rank, 
                            FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(menberItemList),

                            'AuctionItem':FBCommon.GetJsonItemList(familyAuctionItemList), 
                            'memberCnt':len(memberIDList)}

                mailPlayerIDList = []

                for memberID in memberIDList:

                    member = playerManager.FindPlayerByID(memberID)

                    if member:

                overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(menberItemList)

                
            mailPlayerIDList = []

            for memberID in memberIDList:

                member = playerManager.FindPlayerByID(memberID)

                if member:

                    if menberItemList:

                        ItemControler.GivePlayerItemOrMail(member, menberItemList, 'LeagueBOSS1', event)

                        member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)

                        FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass, overDict)

                    else:

                        mailPlayerIDList.append(memberID)

                if mailPlayerIDList:

                    batchPlayerIDList.append(mailPlayerIDList)

                    batchAddItemList.append(menberItemList)

                    batchParamList.append([])

                    batchDetailList.append({'rank':rank})

                    member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)

                    FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass, overDict)

                elif menberItemList:

                    mailPlayerIDList.append(memberID)

            if mailPlayerIDList:

                batchPlayerIDList.append(mailPlayerIDList)

                batchAddItemList.append(menberItemList)

                batchParamList.append([])

                batchDetailList.append({'rank':rank})

  

        if batchPlayerIDList:

            PlayerControl.SendMailBatch("LeagueBOSS2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)