4792 (只在master)原随包的配置全部支持热更新。

client_Wu Xijin

2018-11-15 02a540dc5aac645fde4ebc38180889f161bc97f9

4792 (只在master)原随包的配置全部支持热更新。

 Assets/Art

@@ -1 +1 @@
Subproject commit 027cfe3e4ee76763629a4eb5051742935757c832
Subproject commit 8d2b2a8e8f55c649f60fa49c29d69aa954ffd65b

 Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs

@@ -332,7 +332,7 @@
                    uiroot = GameObject.FindObjectOfType<UIRoot>();

                    if (uiroot == null)

                    {

                        var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");

                        var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");

                        var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);

                        root.name = "UIRoot";

                        uiroot = root.GetComponent<UIRoot>();


 Assets/Editor/Tool/BuildExtersion.cs

@@ -211,6 +211,7 @@
                BuiltInResourceSetting.SetLaunchBackGround(publisher, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginBackGround(publisher, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginLogo(publisher, buildParameters.buildTarget);

                UpdateBuiltInSetting.SetAllLuaAssetBundleName();

                ExcuteBuildAsset("builtin", buildParameters);

            }

            else


 Assets/Editor/Tool/PrefabCreateTool.cs

@@ -56,7 +56,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();
            if (uiroot == null)
            {
                var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
                var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
                var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
                root.name = "UIRoot";
                uiroot = root.GetComponent<UIRoot>();
@@ -90,7 +90,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();
            if (uiroot == null)
            {
                var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
                var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
                var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
                root.name = "UIRoot";
                uiroot = root.GetComponent<UIRoot>();
@@ -124,7 +124,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();
            if (uiroot == null)
            {
                var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
                var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
                var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
                root.name = "UIRoot";
                uiroot = root.GetComponent<UIRoot>();
@@ -159,7 +159,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();
            if (uiroot == null)
            {
                var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
                var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
                var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
                root.name = "UIRoot";
                uiroot = root.GetComponent<UIRoot>();

 Assets/Editor/Tool/UpdateAssetBundleName.cs

@@ -268,4 +268,38 @@
        AssetDatabase.SaveAssets();

        AssetDatabase.Refresh();

    }

}



public class UpdateBuiltInSetting

{

    static string rootPath = Application.dataPath + "/ResourcesOut/BuiltIn/";

    static string assetPath = "Assets/ResourcesOut/BuiltIn/";



    [MenuItem("程序/设置资源包名/更新BuiltIn(All) AssetBundleName")]

    public static void SetAllLuaAssetBundleName()

    {

        var allFiles = new List<FileInfo>();

        FileExtersion.GetAllDirectoryFileInfos(rootPath, allFiles);



        var amendRootPath = rootPath.Replace("\\", "/");

        foreach (var file in allFiles)

        {

            var extension = Path.GetExtension(file.FullName);

            if (extension == ".meta")

            {

                continue;

            }



            var directoryName = file.DirectoryName.Replace("\\", "/");

            var relativeDirectory = directoryName.Replace(amendRootPath, "");



            var importerPath = assetPath + relativeDirectory + Path.DirectorySeparatorChar + file.Name;

            var importer = AssetImporter.GetAtPath(importerPath);

            importer.assetBundleName = "builtin/" + relativeDirectory.ToLower();

            EditorUtility.SetDirty(importer);

        }



        AssetDatabase.SaveAssets();

        AssetDatabase.Refresh();

    }

}

 Assets/Plugins/Demigiant/DOTweenSettings.asset

 Assets/Plugins/Demigiant/DOTweenSettings.asset.meta

 Assets/Resources/AudioMixer.meta

File was deleted

 Assets/Resources/AudioMixer/Master_AudioMixer.mixer

File was deleted

 Assets/Resources/AudioMixer/Master_AudioMixer.mixer.meta

File was deleted

 Assets/Resources/Config.meta

File was deleted

 Assets/Resources/Config/Contact.txt

File was deleted

 Assets/Resources/Config/Contact.txt.meta

File was deleted

 Assets/Resources/Config/HelpInfo.txt

File was deleted

 Assets/Resources/Config/HelpInfo.txt.meta

File was deleted

 Assets/Resources/Config/PriorBundle.txt

File was deleted

 Assets/Resources/Config/PriorBundle.txt.meta

File was deleted

 Assets/Resources/Config/PriorLanguage.txt

File was deleted

 Assets/Resources/Config/PriorLanguage.txt.meta

File was deleted

 Assets/Resources/Material.meta

File was deleted

 Assets/Resources/Square.png

Binary files differ

 Assets/Resources/Square.png.meta

File was deleted

 Assets/ResourcesOut

@@ -1 +1 @@
Subproject commit 0f504f2b941acf43a1c75a871f4b5e2b2a1e5719
Subproject commit 266a7013549b6b2d5bf2f62962f627b6028a68b6

 Assets/Scripts

@@ -1 +1 @@
Subproject commit 38afc6f2fc317ac74b6eaeba5788bacf6239f453
Subproject commit 9fabf247914adc5f93926644798a8cd543c73193