Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-04-16 2f723e5320ef618985cc9ea8f71deafd3e4bec36

 System/CrossServerOneVsOne/CrossServerWin.cs

@@ -13,6 +13,7 @@
        [SerializeField] Button closeBtn;

        [SerializeField] FunctionButton arenaFunc;

        [SerializeField] FunctionButton bossFunc;

        [SerializeField] FunctionButton m_HazyRegion;

        [SerializeField] FunctionButtonGroup funcGroup;

        #region Built-in

        protected override void BindController()

@@ -26,6 +27,7 @@
            rightBtn.AddListener(ClickRight);

            arenaFunc.AddListener(ClickArenaFunc);

            bossFunc.AddListener(ClickBossFunc);

            m_HazyRegion.AddListener(OpenHazyRegion);

        }



        protected override void OnPreOpen()

@@ -61,12 +63,21 @@
        {

            CloseSubWindows();

            WindowCenter.Instance.Open<CrossServerBossWin>();

            functionOrder = bossFunc.order;

        }



        private void ClickArenaFunc()

        {

            CloseSubWindows();

            WindowCenter.Instance.Open<CrossServerOneVsOneWin>();

            functionOrder = arenaFunc.order;

        }



        private void OpenHazyRegion()

        {

            CloseSubWindows();

            WindowCenter.Instance.Open<HazyRegionWin>();

            functionOrder = m_HazyRegion.order;

        }



        private void ClickRight()