From ef7d31afb986fa7bfd1f8b2cd2a7ee708f13168f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 九月 2018 16:56:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/Tool/ClientPackage.cs | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index 63a83c8..0f85286 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -224,24 +224,16 @@
// 鏇村悕鍘熸湁鏂囦欢
string _gradleTemplateUrl = EditorApplication.applicationContentsPath + "/PlaybackEngines/AndroidPlayer/Tools/GradleTemplates/";
string _gradleFileUrl = _gradleTemplateUrl + "mainTemplate.gradle";
- string _gradleFileUrl_cache = _gradleTemplateUrl + "mainTemplate_cache.gradle";
-
- if(!File.Exists(_gradleFileUrl_cache))
- {
- if (File.Exists(_gradleFileUrl))
- {
- File.Move(_gradleFileUrl, _gradleFileUrl_cache);
- }
- }
-
string _diffGradleFileUrl = StringUtility.Contact(_sdkPath, "/GradleDiff/", versionConfig.appId, "/mainTemplate.gradle");
-
FileInfo _fileInfo = new FileInfo(_diffGradleFileUrl);
- if (_fileInfo.Exists)
+ if (!_fileInfo.Exists)
{
- _fileInfo.CopyTo(_gradleFileUrl, true);
+ EditorUtility.DisplayDialog("璀﹀憡","Gradle妯″紡闇�瑕侀厤缃樊寮傛枃浠�,浣嗘槸娌℃湁鎵惧埌璇ユ枃浠�: " + _diffGradleFileUrl,"@Hale");
+ return;
}
+
+ _fileInfo.CopyTo(_gradleFileUrl, true);
// 绉诲姩閰嶇疆鏂囦欢鑷虫墦鍖呭伐浣滅洰褰曚腑
@@ -250,7 +242,7 @@
PlayerSettings.Android.keyaliasName = versionConfig.keystoreAlias;
PlayerSettings.Android.keyaliasPass = versionConfig.keystoreAliasPassword;
PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel22;
-
+
PlayerSettings.enableInternalProfiler = _development;
if (Directory.Exists(ANDROID_PLUGIN_PATH))
@@ -273,17 +265,6 @@
{
var apkName = StringUtility.Contact(_output, "/", versionName, "_", versionConfig.clientPackageFlag, "_v", versionConfig.m_Version, "_", _buildIndex, ".apk");
BuildPipeline.BuildPlayer(baseLevels, apkName, BuildTarget.Android, BuildOptions.None);
- }
-
- // 杩樺師gradle鏂囦欢
- if (File.Exists(_gradleFileUrl))
- {
- File.Delete(_gradleFileUrl);
- }
-
- if (File.Exists(_gradleFileUrl_cache))
- {
- File.Move(_gradleFileUrl_cache, _gradleFileUrl);
}
}
--
Gitblit v1.8.0