6478 【后端】【2.0】仙盟boss进入界面修改

xdh

2019-04-10 7c39ed3b5f3b3335d064d356243df31d76e18bff

6478 【后端】【2.0】仙盟boss进入界面修改

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

@@ -1267,8 +1267,7 @@
    elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:

        CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)

    #仙盟BOSS

    elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1,

                      ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]:

    elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:

        PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)

    #骑宠BOSS

    elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss]:


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

@@ -321,9 +321,4 @@
#是否在仙盟BOSS活动中

def IsInAllFamilyBoss(lineID=-1):

    state1 = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1)

    state2 = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2)

    if lineID == 0:

        return state1

    elif lineID == 1:

        return state2

    return state1 or state2

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -1424,8 +1424,8 @@
DailyActionID_IceLode, # 冰晶矿脉

DailyActionID_HelpBattleCheckIn, # 助战登记  20

DailyActionID_CrossReamPK, # 跨服PK  21

DailyActionID_FamilyBoss1, # 仙盟BOSS第一场  22

DailyActionID_FamilyBoss2, # 仙盟BOSS第二场  23

DailyActionID_FamilyBoss1, # 仙盟BOSS  22

DailyActionID_FamilyBoss2, # 废弃  23

DailyActionID_HorsePetBoss, # 骑宠BOSS  24

DailyActionID_FairyDomain, # 缥缈仙域  25

) = range(1, 25 + 1)


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

@@ -151,10 +151,9 @@
    if not hadDelTicket:

        FBCommon.SetHadDelTicket(curPlayer)

        FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 1)

        if lineID == 0:

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

        else:

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

        
        if fbStep == FB_Step_Open:

            FBCommon.SetFBStep(FB_Step_Fighting, tick)



@@ -604,7 +603,7 @@
    remainHP = GetBossRemainHP(tick)

    totalHP = __GetBossTotalHP()

    if not totalHP:

        return 0

        return 100

    return remainHP * 100 / totalHP






 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py

@@ -1373,8 +1373,7 @@
        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_ElderBattlefield.OnElderBattlefieldStateChange(value, tick)

    # 多仙盟BOSS

    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1,

                 ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]:

    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_AllFamilyBoss.OnAllFamilyBossStateChange(value, tick)

    # 骑宠BOSS


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FBLinePlayerCnt.py

@@ -21,6 +21,7 @@
#导入

import GameLogic_ZhuXianBoss

import GameLogic_HorsePetBoss

import GameLogic_AllFamilyBoss

import GameWorld

import IPY_GameWorld

import ChConfig

@@ -88,6 +89,18 @@
            playerCnt = playerManager.GetPlayerCount()

            hpPer = GameLogic_HorsePetBoss.GetBossRemainHPPer(fblineID, tick)

            fbLinePlayerCntDict[fblineID] = [playerCnt, str(hpPer)]

    elif tagMapID == ChConfig.Def_FBMapID_AllFamilyBoss:

        for index in xrange(gameWorldManager.GetGameWorldCount()):

            gameWorld = IPY_GameWorld.IPY_GameWorld(index)

            playerManager = gameWorld.GetMapCopyPlayerManagerByFbIndex(index)

            fblineID = gameWorld.GetPropertyID() - 1

            if fblineID < 0:

                continue

            if not isAllLine and tagFBLineID != fblineID:

                continue

            playerCnt = playerManager.GetPlayerCount()

            hpPer = GameLogic_AllFamilyBoss.GetBossRemainHPPer(tick)

            fbLinePlayerCntDict[fblineID] = [playerCnt, str(hpPer)]

    else:

        return

    return [tagMapID, fbLinePlayerCntDict]


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

@@ -1424,8 +1424,8 @@
DailyActionID_IceLode, # 冰晶矿脉

DailyActionID_HelpBattleCheckIn, # 助战登记  20

DailyActionID_CrossReamPK, # 跨服PK  21

DailyActionID_FamilyBoss1, # 仙盟BOSS第一场  22

DailyActionID_FamilyBoss2, # 仙盟BOSS第二场  23

DailyActionID_FamilyBoss1, # 仙盟BOSS  22

DailyActionID_FamilyBoss2, # 废弃  23

DailyActionID_HorsePetBoss, # 骑宠BOSS  24

DailyActionID_FairyDomain, # 缥缈仙域  25

) = range(1, 25 + 1)