From 41ff6b87a11c57a0a880784a2d9a5365bb80a7d6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 24 八月 2018 17:51:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Login/Launch.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index d420a09..a9f7c08 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -13,9 +13,11 @@
static public LaunchStage currentStage { get { return m_CurrentStage; } }
static float m_Progress = 0f;
- static public float progress {
+ static public float progress
+ {
get { return m_Progress; }
- set {
+ set
+ {
if (m_Progress != value)
{
m_Progress = value;
@@ -69,12 +71,9 @@
IEnumerator Co_Lanuch()
{
#if !UNITY_EDITOR
- if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)
+ while (!SDKUtility.Instance.InitFinished)
{
- while (!SDKUtility.Instance.InitFinished)
- {
- yield return null;
- }
+ yield return null;
}
#endif
var cpu = 2;
@@ -253,7 +252,7 @@
while (!LaunchPostProcess.Instance.completed
&& LaunchPostProcess.Instance.progress < (Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.8f))
{
- progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * (1 - progressBuf) , progressBuf, 1f);
+ progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * (1 - progressBuf), progressBuf, 1f);
yield return null;
}
--
Gitblit v1.8.0