7157 【后端】七日巡礼功能的boss争夺战修改为骑宠争夺，增加仙盟boss功能

xdh

2019-06-06 cdf8dc54c976826c950fb0c647b60631b3b1097d

7157 【后端】七日巡礼功能的boss争夺战修改为骑宠争夺，增加仙盟boss功能

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

@@ -5247,7 +5247,7 @@
Def_WPAct_CrossPK, #跨服pk 11

Def_WPAct_Recharge, #充值X仙玉 12

Def_WPAct_GiftBag,  #购买限时礼包 13

Def_WPAct_FamilyRobBoss, #boss争夺战 14

Def_WPAct_HorsePetBoss, #骑宠争夺 14

Def_WPAct_SWRH, #守卫人皇 15

Def_WPAct_ElderBattlefield, #上古战场 16

Def_WPAct_ChaosDemon, #混乱妖域 17

@@ -5261,7 +5261,8 @@
Def_WPAct_GodWeapon,  #神兵总等级 25

Def_WPAct_Rune,  #穿戴某品质符印 26

Def_WPAct_Pray,  #祈愿 27

) = range(1, 27+1)

Def_WPAct_FamilyBoss,  #仙盟Boss 28

) = range(1, 28+1)



#可提前完成的周狂欢活动

AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]


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

@@ -28,6 +28,7 @@
import NPCCustomRefresh

import PlayerAuctionHouse

import ItemControler

import PlayerWeekParty

import PlayerActivity

import EventReport

import GameObj

@@ -148,6 +149,7 @@
        

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

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_FamilyBoss, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_FamilyBoss, 1)

        if fbStep == FB_Step_Open:

            FBCommon.SetFBStep(FB_Step_Fighting, tick)




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

@@ -26,7 +26,7 @@
import ShareDefine

import PlayerActivity

import NPCCustomRefresh

import ItemControler

import PlayerWeekParty

import EventReport

import NPCCommon

import GameObj

@@ -131,6 +131,7 @@
    if not hadDelTicket:

        FBCommon.SetHadDelTicket(curPlayer)

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

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_HorsePetBoss, 1)

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

        EventShell.EventRespons_HorsePetBoss(curPlayer)

        if fbStep == FB_Step_Open:


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

@@ -533,7 +533,7 @@
        lastStartTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_XMZZLastStartTime)

        curTime = int(time.time())

        costTime = (curTime-lastStartTime)*1000

        overDict = {FBCommon.Over_score:addScore, FBCommon.Over_extrScore:updExtraScore,

        overDict = {FBCommon.Over_score:updScore, FBCommon.Over_extrScore:updExtraScore,

                    FBCommon.Over_extraExp:updExtraExp, FBCommon.Over_extraExpPoint:updExtraExpPoint,

                    FBCommon.Over_exp:exp, FBCommon.Over_expPoint:expPoint, FBCommon.Over_costTime:costTime,

                    'conWinCnt':conWinCnt}


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

@@ -201,7 +201,7 @@
        if hurtType == FamilyHurtObjType_Player and hurtObj.hurtValue == 0 and hurtValue:

            if IsHorsePetRobBoss(curBoss.GetNPCID()):

                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyRobBoss)

                PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_FamilyRobBoss, 1)

                
            

        hurtObj.hurtValue += hurtValue

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