Merge branch 'master' into CrossServerBoss

client_Wu Xijin

2019-01-07 cbb4009abdf84cf020be9cfc1de88dc436652bb3

 Utility/StageLoadTimeOutCatcher.cs

@@ -7,7 +7,12 @@
{

    const int timeOut = 20;//秒

    public static DateTime got0102Time = DateTime.MinValue;
    public static DateTime gotA126Time = DateTime.MinValue;
    public static DateTime gotA127Time = DateTime.MinValue;
    public static DateTime got0109Time = DateTime.MinValue;
    public static DateTime send0107Time = DateTime.MinValue;

    public static StageLoadTimeOutCatcher Begin(int stageId)
    {
@@ -43,12 +48,31 @@
            var description = StringUtility.Contact(
                                        "开始时间:", startTime.ToString("HH:mm:ss"), ";",
                                        "超时时间:", DateTime.Now.ToString("HH:mm:ss"),
                                        "服务器是否准备中:", StageManager.Instance.isServerPreparing,
                                        "上一次接收到0109的时间:", got0109Time);
                                        "0102时间:", got0102Time.ToString("HH:mm:ss"), ";",
                                        "A126时间:", gotA126Time.ToString("HH:mm:ss"), ";",
                                        "A127时间:", gotA127Time.ToString("HH:mm:ss"), ";",
                                        "0109时间:", got0109Time.ToString("HH:mm:ss"), ";",
                                        "0107时间:", send0107Time.ToString("HH:mm:ss"));

            ExceptionCatcher.ReportException(title, description);
            Stop();
        }
    }

    public static void ReportChangeMapRecord(GameNetSystem.SocketType socketType, string protocol, DateTime time)
    {
        try
        {
            var title = StringUtility.Contact("地图加载记录-->玩家名称：", PlayerDatas.Instance.baseData.PlayerName);
            var description = StringUtility.Contact("服务器:", socketType, ";", "协议编号:", protocol, ";", "时间:", time.ToString("HH:mm:ss"));

            ExceptionCatcher.ReportException(title, description);
        }
        catch (System.Exception ex)
        {

        }

    }

}