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

client_Wu Xijin

2019-04-16 fc714208ff3a320c3bb52bddd5ea3d91f647a206

 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;

@@ -83,8 +88,8 @@
        {

            var used = Mathf.Max(0, (int)(TimeUtility.ServerNow - hazyGrassModel.grassBornTime).TotalSeconds);

            var refreshSeconds = hazyGrassModel.grassRefreshSeconds - used % hazyGrassModel.grassRefreshSeconds;

            m_BasicGrassRefreshTime.text = string.Format("基础草丛{0}后刷新", TimeUtility.SecondsToMS(refreshSeconds));

            m_FairyGrassRefreshTime.text = string.Format("灵草丛{0}后刷新", TimeUtility.SecondsToMS(refreshSeconds));

            m_BasicGrassRefreshTime.text = Language.Get("HazyBasicGrassRefresh", TimeUtility.SecondsToMS(refreshSeconds));

            m_FairyGrassRefreshTime.text = Language.Get("HazyFairyGrassRefresh", TimeUtility.SecondsToMS(refreshSeconds));

        }

    }