Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

4 天以前 9e89e605d5429babb4b33df2e47ea86dff9d2ba7

 Main/System/TianziBillborad/TianziBillboradManager.cs

@@ -22,7 +22,7 @@
        EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DungeonManager.Instance.UpdateFBInfoChangeEvent += OnUpdateFBInfoChangeEvent;
        DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
        TimeMgr.Instance.OnDayEvent += OnDayEvent;
@@ -37,7 +37,7 @@
        EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DungeonManager.Instance.UpdateFBInfoChangeEvent -= OnUpdateFBInfoChangeEvent;
        DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
        TimeMgr.Instance.OnDayEvent -= OnDayEvent;
@@ -148,17 +148,16 @@
        UpdateRedPoint();
    }

    private void OnUpdateFBInfoChangeEvent(int mapID, bool isADAddCntChange, bool isBuyAddCntChange, bool isItemAddCntChange)
    private void OnUpdateFBInfoChangeEvent(int mapID)
    {
        int dataMapID = DataMapID;
        if (mapID != dataMapID)
            return;
        if (isADAddCntChange)
            return;

        UpdateRedPoint();
    }

    private void OnAdsInfoListUpdateEvent(int id, int mapId)
    private void OnAdsInfoListUpdateEvent(int id, int type, int mapId)
    {
        if (mapId != DataMapID)
            return;
@@ -209,12 +208,11 @@
        }
        return res;
    }

    public bool TryGetADAwardConfigByMapId(int dataMapID, out ADAwardConfig adAwardConfig)
    {
        adAwardConfig = null;
        if (!ADAwardConfig.TryGetADIDByADMapID(dataMapID, out int adID) || !ADAwardConfig.HasKey(adID))
        if (!ADAwardConfig.TryGetADIDByTypeValue(2, dataMapID, out adAwardConfig))
            return false;
        adAwardConfig = ADAwardConfig.Get(adID);
        return true;
    }