3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；

hxp

2018-09-11 2638c8b67d1dcac1c774f942ac144579c6f82ec1

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

@@ -83,6 +83,7 @@
import GameLogic_ElderBattlefield

import GameLogic_FamilyBoss

import GameLogic_FamilyWar

import GameLogic_Dogz

import OpenServerCampaign

import PlayerCostRebate

import PlayerSpringSale

@@ -92,6 +93,7 @@
import PlayerVip

import PlayerDiceEx

import IpyGameDataPY

import FamilyRobBoss

import QuestManager

import PyGameData

import PlayerTJG

@@ -510,6 +512,7 @@
        

        #法宝

        PlayerMagicWeapon.OnDay(curPlayer)

        PlayerGoldGift.OnDay(curPlayer)

        

    # 特殊时间点X点过天

    elif onEventType == ShareDefine.Def_OnEventTypeEx:

@@ -529,6 +532,9 @@
        ChItem.ResetItemUseCntToday(curPlayer)

        # 极品白拿

        PlayerFreeGoods.OnDay(curPlayer)

        #采集次数重置

        NPCCommon.CollNPCTimeOnDay(curPlayer)

        
    

    # 以下为支持两种重置模式切换配置的

    FBCommon.FBOnDay(curPlayer, onEventType)

@@ -1223,6 +1229,11 @@
            PyGameData.g_bossShuntDeadLine = eval(msgValue)

            return

        

        if key == ShareDefine.Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt:

            PyGameData.g_familyKillHorsePetRobBossCntDict = eval(msgValue)

            FamilyRobBoss.OnFamilyKillHorsePetRobBossCntChange(tick)

            return

        
        if key == ShareDefine.Def_Notify_WorldKey_FBEnterTimeLimiitMapID:

            PyGameData.FBEnterTimeLimiitMapID = eval(msgValue)

            return

@@ -1239,6 +1250,11 @@
            if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_FamilyBossMap:

                familyID, openCount = eval(msgValue)

                GameLogic_FamilyBoss.GameServerOpenFamilyBoss(familyID, openCount)

            return

        
        if key == ShareDefine.Def_Notify_WorldKey_FamilyPartyInfo:

            if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_FamilyParty:

                PyGameData.g_familyPartyInfo = eval(msgValue)

            return

        

        if key.startswith(ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]): 

@@ -1349,7 +1365,12 @@
                if curPlayer.GetID() == 0:

                    continue

                PlayerWorldAverageLv.UpdatePlayerWorldAverageLv(curPlayer)

                
            
    # 日常活动

    elif key.startswith(ShareDefine.Def_Notify_WorldKey_DailyActionState[:-2]):

        if value and gameWorldMgr.GetGameWorldDictByKey(key) != value:

            NPCCustomRefresh.ResetActivityBossRefreshCount()

            
    #通用设置

    gameWorldMgr.SetGameWorldDict(key, value)

    

@@ -1369,7 +1390,9 @@
    # 活动buff状态变更

    elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):            

        PlayerAction.OnActionBuffStateChange(key, tick)



    #boss刷新时间参数

    elif key.startswith(ShareDefine.Def_Notify_WorldKey_BossOnlineHeroCnt[:-2]):

        GameLogic_Dogz.OnOnlineCntChange(key, tick)

#===============================================================================

#    ---修改为上述的 统一字典处理

#    if msg == ChConfig.Def_Notify_Key_PurTalk: