From 45a6f4aaaf13119215f4cc2f20f5e8300ba13e00 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 26 十月 2018 16:10:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Login/Launch.cs | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index 012aa47..4a42e9b 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -54,20 +54,20 @@
GlobalTimeEvent.Instance.Begin();
#if UNITY_ANDROID && !UNITY_EDITOR
- if (!SDKUtility.Instance.builtinAssetCopyFinished)
+ if (!SDKUtility.builtinAssetCopyFinished)
{
- 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.CopyOneAsset("builtin_assetbundle");
+ SDKUtility.Instance.CopyOneAsset("builtin_assetbundle.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/music");
+ SDKUtility.Instance.CopyOneAsset("builtin/music.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/prefabs");
+ SDKUtility.Instance.CopyOneAsset("builtin/prefabs.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/sprite");
+ SDKUtility.Instance.CopyOneAsset("builtin/sprite.manifest");
+ SDKUtility.Instance.CopyOneAsset("config/Contact.txt");
+ SDKUtility.Instance.CopyOneAsset("config/HelpInfo.txt");
+ SDKUtility.Instance.CopyOneAsset("config/PriorBundle.txt");
+ SDKUtility.Instance.CopyOneAsset("config/PriorLanguage.txt");
LocalSave.SetString("BuiltInAssetCopyCompleted_Android", VersionConfig.Get().version);
}
@@ -76,7 +76,7 @@
#if UNITY_IOS && !UNITY_EDITOR
if (!VersionUtility.Instance.InIosAuditTime())
{
- if (!SDKUtility.Instance.builtinAssetCopyFinished)
+ if (!SDKUtility.builtinAssetCopyFinished)
{
var targetDirectory = ResourcesPath.Instance.ExternalStorePath;
if (!Directory.Exists(targetDirectory))
@@ -96,10 +96,25 @@
fileNames.Add("builtin_assetbundle");
fileNames.Add("builtin_assetbundle.manifest");
+ var configFiles = new List<FileInfo>();
+ FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "config"), configFiles);
+ foreach (var file in configFiles)
+ {
+ var name = Path.GetFileName(file.FullName);
+ fileNames.Add(StringUtility.Contact("config", Path.DirectorySeparatorChar, name));
+ }
+
foreach (var item in fileNames)
{
var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item);
var toPath = StringUtility.Contact(targetDirectory, item);
+
+ var destDirectoryName = Path.GetDirectoryName(toPath);
+ if (!Directory.Exists(destDirectoryName))
+ {
+ Directory.CreateDirectory(destDirectoryName);
+ }
+
File.Copy(fromPath, toPath, true);
}
}
--
Gitblit v1.8.0