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

client_linchunjie

2018-10-25 75bddc93d399116209fb1af6e2ed8a0f908b2190

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

 System/KnapSack/New/OfflineHangUpUseWin.cs

@@ -128,7 +128,8 @@
            }



            int addHour = (itemModel.chinItemModel.EffectValueA1 / 3600)* (int)Mathf.Ceil(_batchUseSlider.value);

            s = StringUtility.Contact(s,"+", Language.Get("ItemOverdue103",addHour));

            string addHourStr = UIHelper.GetTextColorByItemColor(TextColType.Green,StringUtility.Contact("+", Language.Get("ItemOverdue103", addHour)),true);

            s = StringUtility.Contact(s, addHourStr);

            return s;

        }