2453【前端】修改多倍经验时间显示

client_linchunjie

2018-08-13 eb048d48df656c1d839230f0a9ea01a706678670

2453【前端】修改多倍经验时间显示

 System/Welfare/MultipleExpWin.cs

@@ -15,6 +15,7 @@
    public class MultipleExpWin : Window

    {

        [SerializeField] Text m_MultipleTime;

        [SerializeField] Text m_MultipleDate;

        [SerializeField] Text m_ActivityRule;

        [SerializeField] Image m_MultipleIcon1;

        [SerializeField] Image m_MultipleIcon2;

@@ -64,6 +65,10 @@
            {

                OperationMultiExp operation = operationBase as OperationMultiExp;

                m_MultipleTime.text = operation.ToDisplayTime();

                m_MultipleDate.text = StringUtility.Contact(Language.Get("OperationDate"), operation.startDate.ToDisplay(),

                    operation.startDate == operation.endDate ? string.Empty : "—",

                    operation.startDate == operation.endDate ? string.Empty :

                    operation.endDate.ToDisplay(operation.startDate.year != operation.endDate.year));

                m_ActivityRule.text = Language.Get("MultipleExp_Rule_2", operation.GetMultipleCHS());

                m_MultipleIcon1.SetSprite(StringUtility.Contact("MultipleExp_Icon_", operation.multiple / 10000));

                m_MultipleIcon2.SetSprite(StringUtility.Contact("MultipleExp_Icon_", operation.multiple / 10000));


 System/Welfare/OperationTimeHepler.cs

@@ -890,17 +890,12 @@
        {

            var textBuilder = OperationTimeHepler.textBuilder;

            textBuilder.Length = 0;

            textBuilder.Append(startDate.ToDisplay());

            if (startDate == endDate)

            {

                textBuilder.Append("，");

            }

            else

            {

                textBuilder.Append("—");

                textBuilder.Append(endDate.ToDisplay(startDate.year != endDate.year));

                textBuilder.Append("，");

            }

            //textBuilder.Append(startDate.ToDisplay());

            //if (startDate != endDate)

            //{

            //    textBuilder.Append("—");

            //    textBuilder.Append(endDate.ToDisplay(startDate.year != endDate.year));

            //}

            if (allDay)

            {

                textBuilder.Append(Language.Get("OpenAllDay"));