Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

4 天以前 749903dc17ff915995712ac88e77c54816edff88

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 Main/System/Mail/MailManager.cs

@@ -28,12 +28,16 @@
        tabRedpoint0 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Personal));
        tabRedpoint1 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Global));
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
        personalMailMaxLimitCount = int.Parse(FuncConfigConfig.Get("PersonalMail").Numerical1);
    }



    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
    }

    public void OnBeforePlayerDataInitializeEventOnRelogin()
@@ -41,6 +45,14 @@
        mailDataDict.Clear();
    }

    private void OnFuncStateChange(int obj)
    {
        if (obj == (int)FuncOpenEnum.Mail)
        {
            UpdateRedPoint();
        }
    }
    
    public bool CheckIsEmptyGrid(int needGrid = 1)
    {
        // 背包满
@@ -82,6 +94,8 @@
    {
        if (tabRedpoint0 == null)
            return;
        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Mail))
            return;
        tabRedpoint0.state = RedPointState.None;
        if (HasNoReadMail(MailCategory.Personal))
        {

 Main/System/Main/HomeWin.cs

@@ -140,6 +140,8 @@

        mailBtn.AddListener(() =>
        {
            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Mail, true))
                return;
            UIManager.Instance.OpenWindow<MailWin>();
        });

@@ -729,10 +731,6 @@
            FirstChargeBtn.SetActive(isFuncOpen);
        }
    }





    private void OnFirstChargeTaskUpdateEvent()
    {

 Main/Utility/EnumHelper.cs

@@ -848,6 +848,7 @@
    HeroFatesUpgrade = 49, //宿缘升级
    LineupRecommend = 50, //阵容推荐
    DailySpecials = 51, //每日特惠
    Mail = 52, //邮箱
}