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

yyl

4 天以前 9e89e605d5429babb4b33df2e47ea86dff9d2ba7

 Main/System/BoneField/BoneFieldManager.cs

@@ -10,7 +10,7 @@
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DungeonManager.Instance.UpdateFBInfoChangeEvent += OnUpdateFBInfoChangeEvent;
        DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
        TimeMgr.Instance.OnDayEvent += OnDayEvent;
@@ -19,7 +19,7 @@
    public override void Release()
    {
        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,17 +37,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;
@@ -114,21 +113,9 @@

    public bool TryGetShowSweepCount(out int showSweepMaxCount, out int showrealRemainSweepCount)
    {
        showSweepMaxCount = 0;
        showrealRemainSweepCount = 0;
        int dataMapID = BoneFieldManager.Instance.DataMapID;
        if (!DungeonOpenTimeConfig.HasKey(dataMapID))
        if (!DungeonManager.Instance.TryGetDungeonCount(DataMapID, out showSweepMaxCount, out showrealRemainSweepCount))
            return false;
        if (!DungeonManager.Instance.TryGetFBInfoByMapID(dataMapID, out FBInfo fbInfo))
            return false;
        DungeonOpenTimeConfig dungeonOpenTimeConfig = DungeonOpenTimeConfig.Get(dataMapID);

        int baseCount = dungeonOpenTimeConfig.DayTimes + dungeonOpenTimeConfig.PayCntMax;
        int realMaxCount = baseCount + fbInfo.ADAddCnt + fbInfo.BuyAddCnt + fbInfo.ItemAddCnt;
        int realRemainSweepCount = realMaxCount - fbInfo.EnterCnt;

        showSweepMaxCount = realMaxCount - fbInfo.ADAddCnt - fbInfo.BuyAddCnt;
        showrealRemainSweepCount = realRemainSweepCount - fbInfo.BuyAddCnt;
        return true;
    }