From 2cfc54da70f0639f662d2cd8ce08c69d813e9bd2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 28 八月 2018 15:47:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

---
 Assets/Editor/Tool/ClientPackage.cs |  100 +++++++++++++++++++++++++++----------------------
 1 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index 9b2739e..67c2b20 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -1,30 +1,33 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-using UnityEditor;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Text;
-using TableConfig;
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using UnityEditor;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Text;
+using TableConfig;
+
 public class ClientPackage
-{
-    public static readonly string versionsFilePath = Application.dataPath + Path.DirectorySeparatorChar + "Editor/VersionConfigs/Versions.txt";
+{
+    public static readonly string versionsFilePath = Application.dataPath + Path.DirectorySeparatorChar + "Editor/VersionConfigs/Versions.txt";
     public static readonly string[] baseLevels = new string[] { "Assets/Resources/Scenes/Launch.unity", "Assets/Resources/Scenes/Empty.unity" };
 
-    public static string SDK_PLUGIN_PROJECT {
+    public static string SDK_PLUGIN_PROJECT
+    {
         get { return LocalSave.GetString("SDK_PROJECT_PATH"); }
         set { LocalSave.SetString("SDK_PROJECT_PATH", value); }
-    }
-
-    static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";
-
-    static int packageIndex {
+    }
+
+    static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";
+    static string iOS_PLUGIN_PATH = Application.dataPath + "/Plugins/iOS/The2thWorldSDK";
+
+    static int packageIndex
+    {
         get { return LocalSave.GetInt("ClientPackageIndex", 1); }
         set { LocalSave.SetInt("ClientPackageIndex", value); }
-    }
-
+    }
+
     public static void BuildPublishers(string _sdkPath, string _assetBundlePath, string _output, string _publisherString, bool _development, bool _replace)
     {
         var publisherIds = new List<string>();
@@ -49,7 +52,7 @@
                     }
                     break;
             }
-        }
+        }
 
         var smallPackages = new List<string>();
         var halfPackages = new List<string>();
@@ -95,7 +98,7 @@
 #if UNITY_ANDROID
                 BuildApk(_sdkPath, _output, smallPackages[i], _development);
 #elif UNITY_IOS
-                BuildIpa(smallPackages[i], _replace);
+                BuildIpa(_sdkPath, smallPackages[i], _replace);
 #endif
             }
         }
@@ -178,7 +181,7 @@
 #if UNITY_ANDROID
                 BuildApk(_sdkPath, _output, halfPackages[i], _development);
 #elif UNITY_IOS
-                BuildIpa(halfPackages[i], _replace);
+                BuildIpa(_sdkPath, halfPackages[i], _replace);
 #endif
             }
         }
@@ -191,14 +194,14 @@
 #if UNITY_ANDROID
                 BuildApk(_sdkPath, _output, bigPackages[i], _development);
 #elif UNITY_IOS
-                BuildIpa(bigPackages[i], _replace);
+                BuildIpa(_sdkPath, bigPackages[i], _replace);
 #endif
             }
         }
 
         packageIndex++;
     }
-
+
     public static void BuildApk(string _sdkPath, string _output, string _publisher, bool _development)
     {
         PreBuild(_publisher);
@@ -235,12 +238,9 @@
             Directory.Delete(ANDROID_PLUGIN_PATH, true);
         }
 
-        Debug.LogFormat("鎵цAndroid SDK 鏂囦欢鎷疯礉锛宖rom:{0};to:{1}", StringUtility.Contact(_sdkPath, "/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);
-        FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);
-        if (!versionConfig.appId.Equals("test"))
-        {
-            FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/娓犻亾宸紓/", versionConfig.productName), ANDROID_PLUGIN_PATH);
-        }
+        Debug.LogFormat("鎵цAndroid SDK 鏂囦欢鎷疯礉锛宖rom:{0};to:{1}", StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);
+        FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);
+        FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/ChannelDiff/", versionConfig.appId), ANDROID_PLUGIN_PATH);
         AssetDatabase.SaveAssets();
         AssetDatabase.Refresh();
 
@@ -255,11 +255,21 @@
             var apkName = StringUtility.Contact(_output, "/", versionName, "_", versionConfig.clientPackageFlag, "_v", versionConfig.m_Version, "_", index, ".apk");
             BuildPipeline.BuildPlayer(baseLevels, apkName, BuildTarget.Android, BuildOptions.None);
         }
-    }
-
-    public static void BuildIpa(string _publisher, bool _replace)
+    }
+
+    public static void BuildIpa(string _sdkPath, string _publisher, bool _replace)
     {
         PreBuild(_publisher);
+
+        var versionName = string.Empty;
+        var versionConfig = GetVersionConfig(_publisher, out versionName);
+        if (!versionConfig.appId.Equals("test"))
+        {
+            FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/ChannelDiff/", versionConfig.appId), iOS_PLUGIN_PATH);
+        }
+        AssetDatabase.SaveAssets();
+        AssetDatabase.Refresh();
+
         PlayerSettings.iOS.buildNumber = VersionConfig.Get().buildIndex.ToString();
         PlayerSettings.iOS.appleDeveloperTeamID = VersionConfig.Get().appleDeveloperTeamID;
 
@@ -271,8 +281,8 @@
         {
             XCodeProjectMod.BuildIOSProject_Append();
         }
-    }
-
+    }
+
     private static void PreBuild(string _publisher)
     {
         try
@@ -323,8 +333,8 @@
             AssetDatabase.Refresh();
         }
 
-    }
-
+    }
+
     static VersionConfig GetVersionConfig(string _publisher, out string _versionName)
     {
         var lines = File.ReadAllLines(versionsFilePath);
@@ -344,8 +354,8 @@
 
         _versionName = string.Empty;
         return null;
-    }
-
+    }
+
     static void SetIconAndSplashImage(string _versionName)
     {
         var buildTarget = GetBuildTarget();
@@ -415,8 +425,8 @@
             EditorUtility.SetDirty(textureImporter);
         }
 
-    }
-
+    }
+
     static BuildTargetGroup GetBuildTarget()
     {
 #if UNITY_ANDROID
@@ -426,6 +436,6 @@
 #else
         return BuildTargetGroup.Standalone;
 #endif
-    }
-
-}
+    }
+
+}

--
Gitblit v1.8.0