Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-26 73a0f52c197a8fe89b8610c039250777dcbbe891

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Login/Launch.cs

@@ -56,18 +56,18 @@
#if UNITY_ANDROID && !UNITY_EDITOR

        if (!SDKUtility.Instance.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);

        }

@@ -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);

                }

            }


 Core/SDK/SDKUtility.cs

@@ -208,11 +208,11 @@
        SendMessageToSDK(m_Json);

    }



    public void CopyOneAsset(string content)

    public void CopyOneAsset(string relationPath)

    {

        m_Json.Clear();

        m_Json["code"] = CodeU2A.CopyOneAsset;

        m_Json["content"] = content;

        m_Json["fileName"] = relationPath;

        SendMessageToSDK(m_Json);

    }