Merge branch 'master' of http://192.168.1.20:10010/r/snxxz_client

dabaoji

2021-03-15 bfe12076fc6648fc103a384958f8534817fd5a0d

 Assets/Editor/Tool/ClientPackage.cs

@@ -41,7 +41,7 @@
    }



    static string THE_2TH_WORLD_SDK_PATH = Application.dataPath + "/Plugins/Android/bin";

    // static string MANIFEST_PATH = Application.dataPath + "/Plugins/Android/AndroidManifest.xml";

    static string MANIFEST_PATH = Application.dataPath + "/Plugins/Android/AndroidManifest.xml";

    static string iOS_PLUGIN_PATH = Application.dataPath + "/Plugins/iOS/Channel";





@@ -440,6 +440,7 @@


        // var manifestpath = StringUtility.Contact(_sdkPath, "/Channel/Android/", versionConfig.appId, "/AndroidManifest.xml");

        var channelSdkPath = StringUtility.Contact(_sdkPath, "/Channel/Android/", versionConfig.appId, "/", variant);

        var manifeastPath = StringUtility.Contact(_sdkPath, "/Channel/Android/", versionConfig.appId, "/AndroidManifest.xml");



        // if (File.Exists(manifestpath))

        // {

@@ -463,6 +464,14 @@
            return;

        }



        if (File.Exists(manifeastPath))

        {

            if (File.Exists(MANIFEST_PATH))

                File.Delete(MANIFEST_PATH);

            File.Copy(manifeastPath, MANIFEST_PATH);

            DebugEx.LogFormat("Android 清单文件拷贝成功，{0}", manifeastPath);

        }



        var option = AssetDatabase.LoadAssetAtPath<Options>("Assets/Editor/Beebyte/Obfuscator/ObfuscatorOptions.asset");

        if (option != null)

        {