0312 时间格式改国际统一

hch

2025-03-03 a35331c055ebbbd3bb1860a17e4cae76dbbf5dab

0312 时间格式改国际统一

# Conflicts:
#	System/Login/LoginWin.cs
#	System/Vip/VoucherWin.cs

 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

@@ -148,7 +148,7 @@
            var index = CrossServerQualifyingModel.Instance.GetNextOpenTimeIndex();
            if (index > -1)
            {
                nextTime.text = Language.Get("CrossServerQualifying64") + CrossServerQualifyingModel.Instance.openTimes[index].ToString("dd-MM-yyyy");
                nextTime.text = Language.Get("CrossServerQualifying64") + CrossServerQualifyingModel.Instance.openTimes[index].ToString("yyyy-MM-dd");
            }
            else
            {
@@ -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;


 LogicProject/System/CrossServerQualifying/CrossServerQualifyingButton.cs

@@ -29,7 +29,7 @@
            var index = CrossServerQualifyingModel.Instance.GetNextOpenTimeIndex();
            if (index > -1)
            {
                SysNotifyMgr.Instance.ShowTip("CrossServerQualifying1", CrossServerQualifyingModel.Instance.openTimes[index].ToString("dd-MM-yyyy"));
                SysNotifyMgr.Instance.ShowTip("CrossServerQualifying1", CrossServerQualifyingModel.Instance.openTimes[index].ToString("yyyy-MM-dd"));
            }
            else
            {

 LogicProject/System/CrossServerQualifying/CrossServerQualifyingModel.cs

@@ -333,7 +333,7 @@
        var config = ILChampionshipTimeConfig.Get(battleID);
        var startTime = startDay.AddDays(config.StartDay - 1).AddSeconds(config.StartHour * 60 * 60 + config.StartMinute * 60);

        return startTime.ToString("dd-MM-yyyy HH:mm");
        return startTime.ToString("yyyy-MM-dd HH:mm");
    }

    //获取流程的结束时间 分钟，负数代表未开始
@@ -894,12 +894,12 @@
            if (record.Ret == 1)
            {
                challengeRecord += Language.Get("CrossServerQualifying62",
                    TimeUtility.GetTime(record.ChallengeTime).ToString("dd-MM-yyyy HH:mm:ss"), record.PlayerName);
                    TimeUtility.GetTime(record.ChallengeTime).ToString("yyyy-MM-dd HH:mm:ss"), record.PlayerName);
            }
            else
            {
                challengeRecord += Language.Get("CrossServerQualifying63",
                    TimeUtility.GetTime(record.ChallengeTime).ToString("dd-MM-yyyy HH:mm:ss"), record.PlayerName);
                    TimeUtility.GetTime(record.ChallengeTime).ToString("yyyy-MM-dd HH:mm:ss"), record.PlayerName);
            }
        }
        WindowCenter.Instance.OpenIL<CrossServerQualifyingOfficialNoteWin>();

 LogicProject/System/CrossServerQualifying/CrossServerQualifyingRaceCell.cs

@@ -47,7 +47,7 @@
        var index = CrossServerQualifyingModel.Instance.GetOpenTimeIndex();
        var showTime = CrossServerQualifyingModel.Instance.openTimes[index].AddDays(config.StartDay - 1);
        showTime = showTime.AddSeconds(config.StartHour * 60 * 60 + config.StartMinute * 60);
        timeStr.text = StringUtility.Contact(showTime.ToString("dd-MM-yyyy HH:mm"), " -> ",

        timeStr.text = StringUtility.Contact(showTime.ToString("yyyy-MM-dd HH:mm"), " -> ",

                        config.EndHour.ToString("D2"), ":", config.EndMinute.ToString("D2"));

        name.text = Language.Get(raceNameList[listIndex]);

 LogicProject/System/CrossServerQualifying/CrossServerQualifyingTimeCell.cs

@@ -31,7 +31,7 @@
        var index = CrossServerQualifyingModel.Instance.GetOpenTimeIndex();
        var showTime = CrossServerQualifyingModel.Instance.openTimes[index].AddDays(config.StartDay - 1);
        showTime = showTime.AddSeconds(config.StartHour * 60 * 60 + config.StartMinute * 60);
        timeStr.text = StringUtility.Contact(showTime.ToString("dd-MM-yyyy HH:mm"), " -> ",

        timeStr.text = StringUtility.Contact(showTime.ToString("yyyy-MM-dd HH:mm"), " -> ",

                        config.EndHour.ToString("D2"), ":", config.EndMinute.ToString("D2"));

        name.text = config.Title;

 LogicProject/System/CrossServerQualifying/CrossServerQualifyingWin.cs

@@ -135,7 +135,7 @@

    void OnSecondEvent()

    {
        timeInfo.text = StringUtility.Contact(ILTimeUtility.ServerCrossNow.ToString("dd-MM-yyyy HH:mm:ss"), " ", CrossServerQualifyingModel.Instance.GetBattleID());
        timeInfo.text = StringUtility.Contact(ILTimeUtility.ServerCrossNow.ToString("yyyy-MM-dd HH:mm:ss"), " ", CrossServerQualifyingModel.Instance.GetBattleID());
    }

}

 System/Auction/TransactionRecordWin.cs

@@ -199,7 +199,7 @@
            });

            textName.text = UIHelper.GetItemName(itemConfig.ID, true);

            textName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);

            timeText.text = item.putAwayTime.ToString("dd-MM-yyyy HH:mm:ss");

            timeText.text = item.putAwayTime.ToString("yyyy-MM-dd HH:mm:ss");

        }



        private void OnCreateGridTypeCell(ScrollerController gridCtrl)


 System/Chat/ChatMineVoiceCell.cs

@@ -41,7 +41,7 @@
            avatarCell.InitUI(AvatarHelper.GetMyAvatarModel());



            m_PlayerName.text = _data.name;

            m_ChatTime.text = _data.createTime.ToString("dd-MM-yyyy HH:mm");
            m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm");
            if (_data.vipLv > 0)

            {

                m_VipLevel.text = "VIP";//string.Format("V{0}", _data.vipLv);


 System/Chat/ChatOtherVoiceCell.cs

@@ -45,7 +45,7 @@
            });



            m_PlayerName.text = _data.name;

            m_ChatTime.text = _data.createTime.ToString("dd-MM-yyyy HH:mm");

            m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm");

            if (_data.vipLv > 0)

            {

                m_VipLevel.text = "VIP";//string.Format("V{0}", _data.vipLv);


 System/Chat/ChatPlayerMineCell.cs

@@ -43,7 +43,7 @@
            });

            m_PlayerName.text = chatUserData.name;

            m_ChatTime.text = data.createTime.ToString("dd-MM-yyyy HH:mm");
            m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm");
            if (chatUserData.vipLv > 0)
            {
                m_VipLv.text = "VIP";//string.Format("V{0}", chatUserData.vipLv);

 System/Chat/ChatPlayerOtherCell.cs

@@ -41,7 +41,7 @@
            });



            m_PlayerName.text = chatUserData.name;

            m_ChatTime.text = data.createTime.ToString("dd-MM-yyyy HH:mm");

            m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm");

            if (chatUserData.vipLv > 0)

            {

                m_VipLv.text = "VIP";//string.Format("V{0}", chatUserData.vipLv);


 System/Dungeon/DungeonAssistModel.cs

@@ -635,7 +635,7 @@
            assistResult.addCoins = msg.RelationCoinAdd;

            assistResult.vipLv = PlayerDatas.Instance.baseData.VIPLv;

            assistResult.isSweep = msg.IsSweep == 1;

            assistResult.createTime = TimeUtility.ServerNow.ToString("dd-MM-yyyy HH:mm:ss");

            assistResult.createTime = TimeUtility.ServerNow.ToString("yyyy-MM-dd HH:mm:ss");

            assistResult.noGetReason = msg.Reason;

            assistResult.SetNotifyResult();

            assistResults.Add(assistResult);


 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/FindPrecious/DemonJarAutoChallengeLogBehaviour.cs

@@ -21,7 +21,7 @@
            var log = (DemonJarModel.AutoChallengeLog)_data;
            var npcConfig = NPCConfig.Get(log.bossId);
            var npcLevel = npcConfig.NPCLV;
            var time = log.time.ToString("dd-MM-yyyy hh:mm:ss");
            var time = log.time.ToString("yyyy-MM-dd hh:mm:ss");
            var doubleTip = Language.Get(log.isDouble ? "DemonJarAutoDiary2" : "DemonJarAutoDiary1");
            var rankTip = Language.Get(log.rank == 1 ? "DemonJarAutoDiary3" : "DemonJarAutoDiary4");


 System/FindPrecious/FindPreciousModel.cs

@@ -969,7 +969,7 @@


            public override string ToString()

            {

                var timeString = time.ToString("dd-MM-yyyy HH:mm:ss");

                var timeString = time.ToString("yyyy-MM-dd HH:mm:ss");

                return Language.Get("FightTreasure_DropRecord", timeString, playerName, playerId, mapId, bossId, itemId, userdata,

                    serverGroupId, playerLevel, lineId);

            }


 System/HappyXB/HappyXBModel.cs

@@ -1082,7 +1082,7 @@
            this.itemId = id;

            this.count = count;

            createTime = TimeUtility.ServerNow;

            createTimeStr = TimeUtility.ServerNow.ToString("dd-MM-yyyy HH:mm:ss");

            createTimeStr = TimeUtility.ServerNow.ToString("yyyy-MM-dd HH:mm:ss");

        }

    }




 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;