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

client_Hale

2019-04-19 feeceecc1252fd472a7027fc2049cd95816ea162

 System/Alchemy/AlchemyBaseWin.cs

@@ -16,6 +16,7 @@
        [SerializeField] FunctionButtonGroup m_FuncGroup;

        [SerializeField] FunctionButton m_AlchemyNormal;

        [SerializeField] FunctionButton m_AlchemyFairy;

        [SerializeField] FunctionButton m_AlchemyDrug;

        [SerializeField] Button m_Close;

        [SerializeField] Button m_Left;

        [SerializeField] Button m_Right;

@@ -29,6 +30,7 @@
        {

            m_AlchemyNormal.AddListener(ShowAlchemyNormal);
            m_AlchemyFairy.AddListener(ShowAlchemyFairy);
            m_AlchemyDrug.AddListener(ShowAlchemyDrug);
            m_Left.AddListener(()=> 
            {

                m_FuncGroup.TriggerLast();

@@ -82,6 +84,13 @@
            functionOrder = m_AlchemyNormal.order;

        }



        private void ShowAlchemyDrug()

        {

            CloseSubWindows();

            WindowCenter.Instance.Open<AlchemyUseDrugWin>();

            functionOrder = m_AlchemyDrug.order;

        }



        private void CloseSubWindows()

        {

            var children = WindowConfig.Get().FindChildWindows("AlchemyBaseWin");