Merge branch 'master' into Cross_Server

client_Wu Xijin

2018-12-19 6b9579a63726c3b0d37cb3e9b4453cfd7f17b5d1

Merge branch 'master' into Cross_Server

 Assets/Editor/Tool/BuiltInResourceSetting.cs

@@ -14,7 +14,7 @@
        {
            var fileName = fileNames[i];
            var fromPath = "Assets/Editor/Logo/" + GetVersionName(publisher) + "/" + fileName;
            var toPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/" + fileName;
            var toPath = "Assets/ResourcesOut/BuiltIn/Sprites/" + fileName;
            AssetDatabase.DeleteAsset(toPath);

            if (AssetDatabase.LoadAssetAtPath<Texture>(fromPath) == null)
@@ -64,7 +64,7 @@
    public static void SetLoginBackGround(string publisher, BuildTarget buildTarget)
    {
        var fromPath = "Assets/Editor/Logo/" + GetVersionName(publisher) + "/LoginBackGround.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/LoginBackGround.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/Sprites/LoginBackGround.png";
        AssetDatabase.DeleteAsset(toPath);
        if (!File.Exists(Application.dataPath + "/Editor/Logo/" + GetVersionName(publisher) + "/LoginBackGround.png"))
        {
@@ -72,7 +72,7 @@
        }
        AssetDatabase.CopyAsset(fromPath, toPath);

        var importerPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/LoginBackGround.png";
        var importerPath = "Assets/ResourcesOut/BuiltIn/Sprites/LoginBackGround.png";
        var importer = AssetImporter.GetAtPath(importerPath);
        var textureImporter = importer as TextureImporter;
        if (textureImporter != null)
@@ -111,11 +111,11 @@
    public static void SetLoginLogo(string publisher, BuildTarget buildTarget)
    {
        var fromPath = "Assets/Editor/Logo/" + GetVersionName(publisher) + "/TB_DL_Logo.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/TB_DL_Logo.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/Sprites/TB_DL_Logo.png";
        AssetDatabase.DeleteAsset(toPath);
        AssetDatabase.CopyAsset(fromPath, toPath);

        var importerPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/TB_DL_Logo.png";
        var importerPath = "Assets/ResourcesOut/BuiltIn/Sprites/TB_DL_Logo.png";
        var importer = AssetImporter.GetAtPath(importerPath);
        var textureImporter = importer as TextureImporter;
        if (textureImporter != null)

 ProjectSettings/EditorBuildSettings.asset

@@ -54,6 +54,9 @@
    path: Assets/Art/Maps/Scenes/Map103_Bzjec.unity
    guid: a3abe460b3baa2d4e8ceb965fdbded65
  - enabled: 1
    path: Assets/Art/Maps/Scenes/Map134_Yams.unity
    guid: 00000000000000000000000000000000
  - enabled: 1
    path: Assets/Art/Maps/Scenes/Map007_Jyzk.unity
    guid: 1522caa409cd02d49be4e23766345ea4
  - enabled: 1