From 11971eedb6531fa41b33111e917d877e5aed7e1a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 21 二月 2019 11:18:22 +0800
Subject: [PATCH] Merge branch 'master' into TreasureRevise
---
Core/GameEngine/Login/LaunchPostProcess.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Login/LaunchPostProcess.cs b/Core/GameEngine/Login/LaunchPostProcess.cs
index 9824bb2..aa0879e 100644
--- a/Core/GameEngine/Login/LaunchPostProcess.cs
+++ b/Core/GameEngine/Login/LaunchPostProcess.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using UnityEngine;
using Snxxz.UI;
-
using System;
[XLua.LuaCallCSharp]
@@ -11,14 +10,13 @@
bool m_Completed = false;
public bool completed { get { return m_Completed; } set { m_Completed = value; } }
- public float progress { get { return Mathf.Clamp01((Time.time - startTime) * 0.1f + ConfigInitiator.progress * 0.7f); } }
- float startTime = 0f;
+ DateTime startTime;
public void Begin()
{
completed = false;
- startTime = Time.time;
+ startTime = DateTime.Now;
ConfigInitiator.Init();
}
@@ -26,6 +24,8 @@
{
if (!completed && ConfigInitiator.done)
{
+ DebugEx.LogFormat("瑙ｆ瀽閰嶇疆琛ㄨ�楁椂锛歿0}", (DateTime.Now - startTime).TotalMilliseconds);
+
try
{
InGameDownLoad.Instance.ParseRewardConfig();
@@ -43,8 +43,6 @@
{
AssetDeCompressTask.Delete7zFiles(ResourcesPath.Instance.ExternalStorePath);
}
-
- DebugEx.LogFormat("瑙ｆ瀽閰嶇疆琛ㄨ�楁椂锛歿0}", Time.time - startTime);
}
catch (Exception ex)
{
--
Gitblit v1.8.0