From 93ab6fe56b327576fcaebbc7caa3ee8ea0fe3ff3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 10:36:33 +0800
Subject: [PATCH] 4334 【前端】随包资源支持热更
---
Core/GameEngine/Login/Launch.cs | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index b464d2e..012aa47 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;
@@ -56,22 +54,29 @@
GlobalTimeEvent.Instance.Begin();
#if UNITY_ANDROID && !UNITY_EDITOR
- var files = new List<FileInfo>();
- FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "builtin"), files);
- foreach (var file in files)
+ if (!SDKUtility.Instance.builtinAssetCopyFinished)
{
- var name = Path.GetFileName(file.FullName);
- SDKUtility.Instance.CopyContent(StringUtility.Contact("builtin/",name ));
- }
+ SDKUtility.Instance.CopyContent("builtin_assetbundle");
+ SDKUtility.Instance.CopyContent("builtin_assetbundle.manifest");
+ SDKUtility.Instance.CopyContent("builtin/music");
+ SDKUtility.Instance.CopyContent("builtin/music.manifest");
+ SDKUtility.Instance.CopyContent("builtin/prefabs");
+ SDKUtility.Instance.CopyContent("builtin/prefabs.manifest");
+ SDKUtility.Instance.CopyContent("builtin/sprite");
+ SDKUtility.Instance.CopyContent("builtin/sprite.manifest");
+ SDKUtility.Instance.CopyContent("config/Contact");
+ SDKUtility.Instance.CopyContent("config/HelpInfo");
+ SDKUtility.Instance.CopyContent("config/PriorBundle");
+ SDKUtility.Instance.CopyContent("config/PriorLanguage");
- SDKUtility.Instance.CopyContent("builtin_assetbundle");
- SDKUtility.Instance.CopyContent("builtin_assetbundle.manifest");
+ LocalSave.SetString("BuiltInAssetCopyCompleted_Android", VersionConfig.Get().version);
+ }
#endif
#if UNITY_IOS && !UNITY_EDITOR
if (!VersionUtility.Instance.InIosAuditTime())
{
- if (!SDKUtility.Instance.AssetCopyFinished)
+ if (!SDKUtility.Instance.builtinAssetCopyFinished)
{
var targetDirectory = ResourcesPath.Instance.ExternalStorePath;
if (!Directory.Exists(targetDirectory))
@@ -99,9 +104,14 @@
}
}
}
+
+ LocalSave.SetString("BuiltInAssetCopyCompleted_IOS", VersionConfig.Get().version);
#endif
- AssetBundleUtility.Instance.InitBuiltInAsset();
+ if (!AssetSource.builtInFromEditor)
+ {
+ AssetBundleUtility.Instance.InitBuiltInAsset();
+ }
}
void Start()
--
Gitblit v1.8.0