Merge branch 'master' into ILRuntime

lwb

2021-02-22 a9b4bb435fc0eda83fa5338f40ff854bd9844361

 System/MainInterfacePanel/HighSettingTip.cs

@@ -9,6 +9,7 @@
//顶层面板框按钮

namespace Snxxz.UI

{

    
    public class HighSettingTip : MonoBehaviour

    {

        [SerializeField] Button _DaTreasureBtn;//打宝按钮

@@ -37,6 +38,9 @@
        [SerializeField] Button m_OpenServiceBtn;//周狂欢按钮

        [SerializeField] Button m_NewYearBtn;//新年盛典

        [SerializeField] Button m_HazyRegion;



        [SerializeField] Button m_HolidayWishes;





        private bool isNeedTip = true;



@@ -68,6 +72,7 @@
            _CZFLBtn.SetListener(()=> {

                WindowCenter.Instance.Open<AddUpRechargeWin>();

            });

            m_HolidayWishes.SetListener(OpenHolidayWishes);

        }



        public void Init()

@@ -118,6 +123,12 @@
            WindowCenter.Instance.Open<OpenServerActivityWin>();

        }



        void OpenHolidayWishes() //节日祝福

        {

            HighSettingFadeInFadeOut.SetAutoCloseTimer();

            WindowCenter.Instance.Open<HolidayWishesWin>();

        }



        void ShoppingButton()//商城按钮

        {

            if (FuncOpen.Instance.IsFuncOpen(79))