From 32e548861974148a835a55026705a7ac454099e6 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 22 八月 2018 17:50:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Login/Launch.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index b1b9c9a..9219e44 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -13,11 +13,9 @@
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;
@@ -254,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.25f, progressBuf, 1f);
+ progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * (1 - progressBuf) , progressBuf, 1f);
yield return null;
}
--
Gitblit v1.8.0