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

client_Hale

2019-04-17 38dbbe3f7cb862fdf46ba053994bc2419c730ce1

 System/BlastFurnace/StoveUpgradWin.cs

@@ -67,7 +67,7 @@
        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShow();

            UI3DTreasureExhibition.Instance.StopShow();

            UI3DTreasureExhibition.Instance.Stop();

        }



        protected override void OnAfterClose()

@@ -151,7 +151,7 @@
            {

                case ActivateShow.ActivateFunc.Stove:

                    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(600, 600);

                    UI3DTreasureExhibition.Instance.BeginShowTreasure(301, m_ModelRawImage);

                    UI3DTreasureExhibition.Instance.ShowTreasure(301, m_ModelRawImage);

                    break;

            }

        }