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

client_Zxw

2018-08-13 196c1f03fe7a8908272c8127133e632d107eaef8

 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));