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

client_Hale

2019-04-17 38dbbe3f7cb862fdf46ba053994bc2419c730ce1

 System/HazyRegion/HazyGrassDungeonWin.cs

@@ -124,7 +124,7 @@
                    var refreshSeconds = npcInfos[i].refreshMinute * 60;

                    var seconds = refreshSeconds - used % refreshSeconds;

                    var npcConfig = NPCConfig.Get(npcInfos[i].npcId);

                    m_GrassTimes[i].text = string.Format("{0}{1}后刷新", npcConfig.charName,

                    m_GrassTimes[i].text = Language.Get("HazyGrassRefresh", npcConfig.charName,

                        TimeUtility.SecondsToMS(seconds));

                }

                else

@@ -176,7 +176,7 @@
            public void Display(int npcId, int count)

            {

                var npcConfig = NPCConfig.Get(npcId);

                m_Title.text = string.Format("剩余{0}数量：", npcConfig.charName);

                m_Title.text = Language.Get("HazyGrassCountTitle", npcConfig.charName);

                m_Count.text = count.ToString();

                m_Count.color = UIHelper.GetUIColor(count > 0 ? TextColType.Green : TextColType.Red);

            }