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

client_Hale

2019-04-29 3e9201b0b65a36cfc62a50823be15757329b01ce

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

 System/Alchemy/AlchemyResultWin.cs

@@ -22,6 +22,8 @@
        [SerializeField] Slider m_Slider;

        [SerializeField] ItemBehaviour m_Item;

        [SerializeField] Text m_CloseTip;

        [SerializeField] Image m_FairyStove;

        [SerializeField] Image m_NormalStove;

        [SerializeField] Button m_Close;



        public static Item displayItem;

@@ -85,6 +87,9 @@


        void DisplayStove()

        {

            m_FairyStove.gameObject.SetActive(model.selectAlchemyType == AlchemyType.Fairy);

            m_NormalStove.gameObject.SetActive(model.selectAlchemyType == AlchemyType.Normal);



            m_StoveLevel.text = StringUtility.Contact("Lv.", model.stoveLevel);

            var isMax = !RefineStoveConfig.Has(model.stoveLevel + 1);

            var stoveConfig = RefineStoveConfig.Get(model.stoveLevel);