Merge branch 'master' into ILRuntime

lwb

2021-02-24 6fdd4b40277b3aab892a8a0cadc310a492f20d2b

 System/WindowBase/OneLevelWin.cs

@@ -73,6 +73,9 @@

            m_TitleIcon.SetSprite(WindowConfig.GetTitleIconKey(name));
            m_TitleIcon.SetNativeSize();

            PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataUpdate;

        }

        protected override void AddListeners()
@@ -89,7 +92,7 @@
                m_Diamond = this.GetComponent<Text>("Pivot/Container_BackGround/FollowStoreBottom/GoldCountBG/CountText");
                m_BindDiamond = this.GetComponent<Text>("Pivot/Container_BackGround/FollowStoreBottom/GoldPaperCountBG/CountText");

            PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataUpdate;
            
            UpdateMoney();
        }

@@ -99,7 +102,6 @@

        protected override void OnPreClose()
        {
            PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataUpdate;
            CloseSubWindows();
        }

@@ -138,6 +140,17 @@
            m_Group.SetFunctionButtonActive(order, isShow);
        }

        public RedPointState GetFunctionButtonRedPointState(int order)
        {
            return m_Group.GetFunctionButtonRedPointState(order);
        }

        public void FunctionButtonInvoke(int order)
        {
            m_Group.TriggerByOrder(order);
            m_Group.GotoOrder(order);
        }

        private void OnPlayerDataUpdate(PlayerDataType type)
        {
            switch (type)