少年修仙传客户端代码仓库
hch
2025-03-03 8c873e69736ba7d9e9587ce655eb4248a3ca726f
0312 时间格式改国际统一

# Conflicts:
# LogicProject/System/CrossServerQualifying/CrossServerQualifyingModel.cs
# LogicProject/System/CrossServerQualifying/CrossServerQualifyingTimeCell.cs
# System/Login/LoginWin.cs
# System/Vip/VoucherWin.cs
4个文件已修改
12 ■■■■ 已修改文件
LogicProject/System/CrossServerQualifying/CrossServerQualifying64Win.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/RedBagTipsWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Login/ServerBehaviour.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LogicProject/System/CrossServerQualifying/CrossServerQualifying64Win.cs
@@ -386,7 +386,7 @@
            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;
LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs
@@ -453,7 +453,7 @@
            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;
System/FairyAu/RedBagTipsWin.cs
@@ -91,13 +91,13 @@
            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);
            }
System/Login/ServerBehaviour.cs
@@ -63,7 +63,7 @@
                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);
@@ -94,7 +94,7 @@
                        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;