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

client_Hale

2019-04-16 e8fef6c83238990fc56000a439a17b7df3704af3

 System/HazyRegion/HazyGrassDungeonWin.cs

@@ -20,6 +20,9 @@
        [SerializeField] Text m_BasicGrassRefreshTime;

        [SerializeField] Text m_FairyGrassRefreshTime;



        [SerializeField] Transform m_ContainerCollectSucc;

        [SerializeField] Text m_GainRemind;



        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }

        HazyGrassModel hazyGrassModel { get { return ModelCenter.Instance.GetModel<HazyGrassModel>(); } }

@@ -34,6 +37,8 @@


        protected override void OnPreOpen()

        {

            m_ContainerCollectSucc.gameObject.SetActive(false);



            Display();



            GlobalTimeEvent.Instance.secondEvent += PerSecond;