From 7ba3caee07d144cc006e4098c873c509e8b880fa Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 23 一月 2019 15:56:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Launch/LaunchWin.cs | 20 ++++++++++++++++++--
Core/GameEngine/Login/Launch.cs | 32 +++++++++++++++++++-------------
System/OpenServerActivity/OpenServiceAchievementModel.cs | 3 +++
Fight/Stage/Dungeon/DungeonStage.cs | 4 ++--
4 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index 554ec1e..0b317e5 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -186,8 +186,6 @@
void Update()
{
- timer += Time.deltaTime;
-
if (!launchComplete)
{
if (currentTask == null)
@@ -215,20 +213,28 @@
currentTask = null;
}
- var progress = Mathf.Lerp(progressInfo.totalProgress, timer / totalTime, 0.5f);
-
- var partProgress = 0f;
- if (currentTask == null)
+ if (m_CurrentStage == LaunchStage.DownLoad)
{
- partProgress = 0f;
+ progressInfo = new ProgressInfo(m_CurrentStage, progressInfo.totalProgress, 0f);
}
else
{
- var temp = currentTask.timer / Mathf.Min(1f, currentTask.duration);
- partProgress = temp - (int)temp;
- }
+ timer += Time.deltaTime;
+ var progress = Mathf.Lerp(progressInfo.totalProgress, timer / totalTime, 0.5f);
- progressInfo = new ProgressInfo(m_CurrentStage, progress, partProgress);
+ var partProgress = 0f;
+ if (currentTask == null)
+ {
+ partProgress = 0f;
+ }
+ else
+ {
+ var temp = currentTask.timer / Mathf.Min(1f, currentTask.duration);
+ partProgress = temp - (int)temp;
+ }
+
+ progressInfo = new ProgressInfo(m_CurrentStage, Mathf.Clamp01(progress), partProgress);
+ }
}
if (launchComplete)
@@ -347,7 +353,7 @@
List<FileInfo> copyTasks = new List<FileInfo>();
public override float expectTime {
- get { return LocalSave.GetFloat("AssetCopyTask_ExpectTime", 20f); }
+ get { return LocalSave.GetFloat("AssetCopyTask_ExpectTime", 30f); }
protected set { LocalSave.SetFloat("AssetCopyTask_ExpectTime", value); }
}
@@ -792,7 +798,7 @@
public class ConfigInitTask : LaunchTask
{
public override float expectTime {
- get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", 5f); }
+ get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", 10f); }
protected set { LocalSave.SetFloat("ConfigInitTask_ExpectTime", value); }
}
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index f075662..55b2f21 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -462,9 +462,9 @@
{
for (var i = 100101; i <= 100109; i++)
{
- var config = Config.Instance.Get<SceneReplaceConfig>(i);
- if (config != null)
+ if (Config.Instance.ContainKey<SceneReplaceConfig>(i))
{
+ var config = Config.Instance.Get<SceneReplaceConfig>(i);
var groundTexture = SceneLoader.LoadTexture(config.folder, config.resourceName);
var @object = GameObject.Find(config.objectPath);
diff --git a/System/Launch/LaunchWin.cs b/System/Launch/LaunchWin.cs
index 53244b1..7f3bea1 100644
--- a/System/Launch/LaunchWin.cs
+++ b/System/Launch/LaunchWin.cs
@@ -168,8 +168,24 @@
var progressInfo = Launch.progressInfo;
m_TotalProgressSlider.value = progressInfo.totalProgress;
m_TotalProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.totalProgress * 100), "%");
- m_PartProgressSlider.value = progressInfo.partProgress;
- m_PartProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.partProgress * 100), "%");
+
+ if (progressInfo.stage == Launch.LaunchStage.DownLoad)
+ {
+ if (m_PartProgressSlider.gameObject.activeInHierarchy)
+ {
+ m_PartProgressSlider.gameObject.SetActive(false);
+ }
+ }
+ else
+ {
+ if (!m_PartProgressSlider.gameObject.activeInHierarchy)
+ {
+ m_PartProgressSlider.gameObject.SetActive(true);
+ }
+
+ m_PartProgressSlider.value = progressInfo.partProgress;
+ m_PartProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.partProgress * 100), "%");
+ }
DisplayStageDescription(progressInfo.stage);
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index 84f9bba..73a3ae1 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -120,6 +120,7 @@
{
GlobalTimeEvent.Instance.secondEvent -= secondEvent;
GlobalTimeEvent.Instance.secondEvent += secondEvent;
+ GetDayNow();//鑾峰彇褰撳墠澶╂暟
SetRedPoint();
}
@@ -206,6 +207,8 @@
public void WeekPartyInfo(HAA0A_tagMCWeekPartyInfo info)
{
+ WeekPartyDayDic.Clear();
+ WeekPartyActionDic.Clear();
ResetType = info.ResetType;
string[] dateArray = info.StartDate.Split('-');
if (dateArray != null && dateArray.Length == 3)
--
Gitblit v1.8.0