Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/Welfare/WelfareWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_TurntableBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;



@@ -40,7 +39,6 @@
            Btn_InSeven.AddListener(InSeven);

            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            m_TurntableBtn.onClick.AddListener(OnTurntableBtn);

            closeBtn.onClick.AddListener(CloseClick);

        }



@@ -98,20 +96,6 @@
            }

            functionOrder = 4;

        }

        private void OnTurntableBtn()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<WheelOfFortuneWin>();

            }

            else

            {

                WindowCenter.Instance.Open<WheelOfFortuneWin>();

            }

            functionOrder = 5;



        }

        private void OnSignIn()

        {

            CloseChildWin();

@@ -137,14 +121,6 @@
            else

            {

                Btn_InSeven.gameObject.SetActive(true);

            }

            if (FuncOpen.Instance.IsFuncOpen(144))

            {

                m_TurntableBtn.gameObject.SetActive(true);

            }

            else

            {

                m_TurntableBtn.gameObject.SetActive(false);

            }

            CheckOperationOpen();



@@ -203,10 +179,6 @@
            if (WindowCenter.Instance.IsOpen<AwardExchangeWin>())

            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }

            if (WindowCenter.Instance.IsOpen<WheelOfFortuneWin>())

            {

                WindowCenter.Instance.CloseImmediately<WheelOfFortuneWin>();

            }

        }