0312 时间格式改国际统一
# Conflicts:
# LogicProject/System/CrossServerQualifying/CrossServerQualifyingModel.cs
# LogicProject/System/CrossServerQualifying/CrossServerQualifyingTimeCell.cs
# System/Login/LoginWin.cs
# System/Vip/VoucherWin.cs
| | |
| | | showTime = showTime.AddSeconds(tmpConfig.StartHour * 60 * 60 + tmpConfig.StartMinute * 60); |
| | | |
| | | raceInfo = StringUtility.Contact(raceInfo, "</r>", tmpConfig.Title, " ",
|
| | | showTime.ToString("dd-MM-yyyy HH:mm"), " -> ", |
| | | showTime.ToString("yyyy-MM-dd HH:mm"), " -> ", |
| | | tmpConfig.EndHour.ToString("D2"), ":", tmpConfig.EndMinute.ToString("D2")); |
| | | } |
| | | todayRaceText.text = raceInfo; |
| | |
| | | showTime = showTime.AddSeconds(tmpConfig.StartHour * 60 * 60 + tmpConfig.StartMinute * 60);
|
| | |
|
| | | raceInfo = StringUtility.Contact(raceInfo, "</r>", tmpConfig.Title, " ",
|
| | | showTime.ToString("dd-MM-yyyy HH:mm"), " -> ",
|
| | | showTime.ToString("yyyy-MM-dd HH:mm"), " -> ",
|
| | | tmpConfig.EndHour.ToString("D2"), ":", tmpConfig.EndMinute.ToString("D2"));
|
| | | }
|
| | | todayRaceText.text = raceInfo;
|
| | |
| | | if (redPacket._DicRedBag[_key].MoneyType == 1)
|
| | | {
|
| | | _particulars.text = string.Format(Language.Get("RedBag_V6"), TimeUtility.GetTime((uint)redPacket._DicRedBag[_key].Time).
|
| | | ToString("dd-MM HH:mm"), UIHelper.ServerStringTrim(redPacket._DicRedBag[_key].Name), redPacket._DicRedBag[_key].MoneyNum);
|
| | | ToString("yyyy-MM-dd HH:mm"), UIHelper.ServerStringTrim(redPacket._DicRedBag[_key].Name), redPacket._DicRedBag[_key].MoneyNum);
|
| | | }
|
| | | else
|
| | | {
|
| | |
|
| | | _particulars.text = string.Format(Language.Get("Z1055"), TimeUtility.GetTime((uint)redPacket._DicRedBag[_key].Time).
|
| | | ToString("dd-MM HH:mm"), UIHelper.ServerStringTrim(redPacket._DicRedBag[_key].Name),
|
| | | ToString("yyyy-MM-dd HH:mm"), UIHelper.ServerStringTrim(redPacket._DicRedBag[_key].Name),
|
| | | RedEnvelopeContent(redPacket._DicRedBag[_key].GetWay), redPacket._DicRedBag[_key].MoneyNum);
|
| | | }
|
| | |
|
| | |
| | | m_OpenTime.SetActive(m_ServerData.start_date > DateTime.Now);
|
| | | if (m_ServerData.start_date > DateTime.Now)
|
| | | {
|
| | | m_OpenTime.text = Language.Get("ServerOnTime", m_ServerData.start_date.ToString("dd-MM HH:mm"));
|
| | | m_OpenTime.text = Language.Get("ServerOnTime", m_ServerData.start_date.ToString("yyyy-MM-dd HH:mm"));
|
| | | }
|
| | | avatarCell.bgImage.SetActive(false);
|
| | | avatarCell.avatarImage.SetActive(false);
|
| | |
| | | SysNotifyMgr.Instance.ShowTip("ServerDown");
|
| | | break;
|
| | | case ServerState.Predicted:
|
| | | SysNotifyMgr.Instance.ShowTip("ServerOpen", m_ServerData.start_date.ToString("dd-MM HH:mm"));
|
| | | SysNotifyMgr.Instance.ShowTip("ServerOpen", m_ServerData.start_date.ToString("yyyy-MM-dd HH:mm"));
|
| | | break;
|
| | | default:
|
| | | ServerListCenter.Instance.currentServer = m_ServerData;
|