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

client_linchunjie

2018-09-25 32ff763df50a154617b3d0050a4207e9393dfe0a

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

 System/DailyQuest/DailyQuestBehaviour.cs

@@ -15,6 +15,7 @@
    {

        [SerializeField] Text m_Title;

        [SerializeField] RectTransform m_ContainerTimes;

        [SerializeField] Text m_TimesUnit;

        [SerializeField] TextEx m_Times;

        [SerializeField] Text m_PracticePoint;

        [SerializeField] Text m_UnLockCondition;

@@ -189,6 +190,17 @@
            else

            {

                m_ContainerTimes.gameObject.SetActive(true);



                switch ((DailyQuestType)this.data.id)

                {

                    case DailyQuestType.KillMonster:

                        m_TimesUnit.text = Language.Get("DailyQuestMonster");

                        break;

                    default:

                        m_TimesUnit.text = Language.Get("DailyQuestTimes");

                        break;

                }



                m_Times.text = StringUtility.Contact(completedTimes, "/", totalTimes);

                m_Times.colorType = completedTimes >= totalTimes ? TextColType.DarkGreen : TextColType.NavyBrown;

            }

@@ -318,6 +330,9 @@


            switch ((DailyQuestType)data.id)

            {

                case DailyQuestType.KillMonster:

                    m_PracticePoint.text = Language.Get("DailyQuestPerPoint2", config.OnceActivity, config.OnceActivityTime);

                    break;

                case DailyQuestType.BlastStove:

                    m_PracticePoint.text = Language.Get("DailyQuestLiandan", config.OnceActivity);

                    break;