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

cehua-TT

2018-10-25 37621ba044af65d3d5f11b0b8b50d544dbf8552f

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

 Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs

@@ -181,7 +181,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/SpritePacking/SpriteSettings.asset

@@ -460,3 +460,19 @@
      maxTextureSize: 256
      textureFormat: 33
      compressionQuality: 1
  - folderName: DengLu
    meshType: 1
    alphaSource: 1
    platformSettings:
    - name: Standalone
      maxTextureSize: 1024
      textureFormat: 4
      compressionQuality: 1
    - name: Android
      maxTextureSize: 1024
      textureFormat: 4
      compressionQuality: 1
    - name: iPhone
      maxTextureSize: 1024
      textureFormat: 4
      compressionQuality: 1

 Assets/Editor/Tool/BuildExtersion.cs

@@ -86,7 +86,7 @@
            {

                UpdateScriptableObjectsSetting.SetAllScriptableObjectAssetBundleName();

                ExcuteBuildAsset("config", buildParameters);

                TableTool.ReadAllTxtToBytes(StringUtility.Contact(buildParameters.GetWholeOutPutPath(), "/config"));

                TableTool.CopyConfigsToOutPutPath(StringUtility.Contact(buildParameters.GetWholeOutPutPath(), "/config"));

            }

            else

            {

@@ -175,6 +175,32 @@
        }

    }



    public static void BuildBuiltIn()

    {

        try

        {

            var buildParameters = new BuildParameters();

            if (!buildParameters.error)

            {

                var versionName = string.Empty;

                BuiltInResourceSetting.SetLaunchBackGround(versionName, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginBackGround(versionName, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginLogo(versionName, buildParameters.buildTarget);

                ExcuteBuildAsset("builtin", buildParameters);

            }

            else

            {

                EditorApplication.Exit(1);

            }

        }

        catch (Exception ex)

        {

            Debug.Log("打包builtin失败");

            Debug.Log(ex);

            EditorApplication.Exit(1);

        }

    }



    public static void MakeAssetVersionFile()

    {

        try

@@ -212,6 +238,7 @@
    {

        public bool error = false;

        public string outputPath;

        public string publisher;

        public BuildTarget buildTarget;



        public BuildParameters()

@@ -238,6 +265,10 @@
                                break;

                        }

                    }

                    else if (arg.ToLower() == "-publisher")

                    {

                        publisher = args[i + 1];

                    }

                }



                error = false;


 Assets/Editor/Tool/BuiltInResourceSetting.cs

New file
@@ -0,0 +1,138 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;

public class BuiltInResourceSetting
{
    public static void SetLaunchBackGround(string versionName, BuildTarget buildTarget)
    {
        var fromPath = "Assets/Editor/Logo/" + versionName + "/Launch.png";
        var toPath = "Assets/Resources/UI/Sprites/Launch.png";
        AssetDatabase.DeleteAsset(toPath);
        AssetDatabase.CopyAsset(fromPath, toPath);

        var importerPath = "Assets/Resources/UI/Sprites/Launch.png";
        var importer = AssetImporter.GetAtPath(importerPath);
        var textureImporter = importer as TextureImporter;
        if (textureImporter != null)
        {
            textureImporter.textureType = TextureImporterType.Sprite;
            textureImporter.spritePackingTag = string.Empty;
            textureImporter.assetBundleName = string.Empty;

            var platformSetting = new TextureImporterPlatformSettings();
            switch (buildTarget)
            {
                case BuildTarget.Android:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "Android";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.ETC2_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
                case BuildTarget.iOS:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.compressionQuality = 1;
                    break;
            }

            textureImporter.SetPlatformTextureSettings(platformSetting);
            AssetDatabase.ImportAsset(importerPath);
            EditorUtility.SetDirty(textureImporter);
        }

    }

    public static void SetLoginBackGround(string versionName, BuildTarget buildTarget)
    {
        var fromPath = "Assets/Editor/Logo/" + versionName + "/LoginBackGround.png";
        var toPath = "Assets/Resources/UI/Sprites/LoginBackGround.png";
        AssetDatabase.DeleteAsset(toPath);
        AssetDatabase.CopyAsset(fromPath, toPath);

        var importerPath = "Assets/Resources/UI/Sprites/LoginBackGround.png";
        var importer = AssetImporter.GetAtPath(importerPath);
        var textureImporter = importer as TextureImporter;
        if (textureImporter != null)
        {
            textureImporter.textureType = TextureImporterType.Sprite;
            textureImporter.spritePackingTag = string.Empty;
            textureImporter.assetBundleName = string.Empty;

            var platformSetting = new TextureImporterPlatformSettings();
            switch (buildTarget)
            {
                case BuildTarget.Android:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "Android";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.ETC2_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
                case BuildTarget.iOS:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.compressionQuality = 1;
                    break;
            }

            textureImporter.SetPlatformTextureSettings(platformSetting);
            AssetDatabase.ImportAsset(importerPath);
            EditorUtility.SetDirty(textureImporter);
        }
    }

    public static void SetLoginLogo(string versionName, BuildTarget buildTarget)
    {
        var fromPath = "Assets/Editor/Logo/" + versionName + "/TB_DL_Logo.png";
        var toPath = "Assets/ResourcesOut/BuiltIn/UI/Sprites/TB_DL_Logo.png";
        AssetDatabase.DeleteAsset(toPath);
        AssetDatabase.CopyAsset(fromPath, toPath);

        var importerPath = "Assets/Resources/UI/Sprites/TB_DL_Logo.png";
        var importer = AssetImporter.GetAtPath(importerPath);
        var textureImporter = importer as TextureImporter;
        if (textureImporter != null)
        {
            textureImporter.textureType = TextureImporterType.Sprite;
            textureImporter.spritePackingTag = string.Empty;
            textureImporter.assetBundleName = string.Empty;

            var platformSetting = new TextureImporterPlatformSettings();
            switch (buildTarget)
            {
                case BuildTarget.Android:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "Android";
                    platformSetting.maxTextureSize = 512;
                    platformSetting.format = TextureImporterFormat.ETC2_RGBA8;
                    platformSetting.compressionQuality = 1;
                    break;
                case BuildTarget.iOS:
                    platformSetting.overridden = true;
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 512;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.compressionQuality = 1;
                    break;
            }

            textureImporter.SetPlatformTextureSettings(platformSetting);
            AssetDatabase.ImportAsset(importerPath);
            EditorUtility.SetDirty(textureImporter);
        }
    }

}

 Assets/Editor/Tool/BuiltInResourceSetting.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 1ebae8774d6334d4f84aa56b08bcbebb
timeCreated: 1540438784
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Editor/Tool/ClientPackage.cs

@@ -88,6 +88,19 @@


        if (smallPackages.Count > 0)

        {

            FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath);



            var files = new List<FileInfo>();

            FileExtersion.GetAllDirectoryFileInfos(ResourcesPath.Instance.StreamingAssetPath, files);

            foreach (var file in files)

            {

                var fileName = Path.GetFileName(file.FullName);

                if (!fileName.Contains("builtin"))

                {

                    File.Delete(file.FullName);

                }

            }



            for (int i = 0; i < smallPackages.Count; i++)

            {

#if UNITY_ANDROID

@@ -415,126 +428,6 @@
            projectSettings.ApplyModifiedProperties();



            PlayerSettings.Android.splashScreenScale = AndroidSplashScreenScale.ScaleToFill;

        }



        var logoFromPath = "Assets/Editor/Logo/" + _versionName + "/TB_DL_Logo.png";

        var logoToPath = "Assets/Resources/UI/Sprites/TB_DL_Logo.png";

        AssetDatabase.DeleteAsset(logoToPath);

        AssetDatabase.CopyAsset(logoFromPath, logoToPath);



        var logoImporterPath = "Assets/Resources/UI/Sprites/TB_DL_Logo.png";

        var logoImporter = AssetImporter.GetAtPath(logoImporterPath);

        var logoTextureImporter = logoImporter as TextureImporter;

        if (logoTextureImporter != null)

        {

            logoTextureImporter.textureType = TextureImporterType.Sprite;

            logoTextureImporter.spritePackingTag = string.Empty;

            logoTextureImporter.assetBundleName = string.Empty;



            var platformSetting = new TextureImporterPlatformSettings();

            switch (buildTarget)

            {

                case BuildTargetGroup.Android:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "Android";

                    platformSetting.maxTextureSize = 512;

                    platformSetting.format = TextureImporterFormat.ETC2_RGBA8;

                    platformSetting.compressionQuality = 1;

                    break;

                case BuildTargetGroup.iOS:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "iOS";

                    platformSetting.maxTextureSize = 512;

                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;

                    platformSetting.compressionQuality = 1;

                    break;

            }



            logoTextureImporter.SetPlatformTextureSettings(platformSetting);

            AssetDatabase.ImportAsset(logoImporterPath);

            EditorUtility.SetDirty(logoTextureImporter);

        }



        var backGroundFromPath = "Assets/Editor/Logo/" + _versionName + "/Launch.png";

        var backGroundToPath = "Assets/Resources/UI/Sprites/Launch.png";

        AssetDatabase.DeleteAsset(backGroundToPath);

        AssetDatabase.CopyAsset(backGroundFromPath, backGroundToPath);



        var backGroundImporterPath = "Assets/Resources/UI/Sprites/Launch.png";

        var backGrouindImporter = AssetImporter.GetAtPath(backGroundImporterPath);

        var backGroundTextureImporter = backGrouindImporter as TextureImporter;

        if (backGroundTextureImporter != null)

        {

            backGroundTextureImporter.textureType = TextureImporterType.Sprite;

            backGroundTextureImporter.spritePackingTag = string.Empty;

            backGroundTextureImporter.assetBundleName = string.Empty;



            var platformSetting = new TextureImporterPlatformSettings();

            switch (buildTarget)

            {

                case BuildTargetGroup.Android:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "Android";

                    platformSetting.maxTextureSize = 1024;

                    platformSetting.format = TextureImporterFormat.ETC2_RGB4;

                    platformSetting.compressionQuality = 1;

                    break;

                case BuildTargetGroup.iOS:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "iOS";

                    platformSetting.maxTextureSize = 1024;

                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;

                    platformSetting.compressionQuality = 1;

                    break;

            }



            backGroundTextureImporter.SetPlatformTextureSettings(platformSetting);

            AssetDatabase.ImportAsset(backGroundImporterPath);

            EditorUtility.SetDirty(backGroundTextureImporter);

        }



        var loginBackGroundFromPath = "Assets/Editor/Logo/" + _versionName + "/LoginBackGround.png";

        var loginBackGroundToPath = "Assets/Resources/UI/Sprites/LoginBackGround.png";

        AssetDatabase.DeleteAsset(loginBackGroundToPath);

        AssetDatabase.CopyAsset(loginBackGroundFromPath, loginBackGroundToPath);



        var loginBackGroundImporterPath = "Assets/Resources/UI/Sprites/LoginBackGround.png";

        var loginBackGrouindImporter = AssetImporter.GetAtPath(loginBackGroundImporterPath);

        var loginBackGroundTextureImporter = loginBackGrouindImporter as TextureImporter;

        if (loginBackGroundTextureImporter != null)

        {

            loginBackGroundTextureImporter.textureType = TextureImporterType.Sprite;

            loginBackGroundTextureImporter.spritePackingTag = string.Empty;

            loginBackGroundTextureImporter.assetBundleName = string.Empty;



            var platformSetting = new TextureImporterPlatformSettings();

            switch (buildTarget)

            {

                case BuildTargetGroup.Android:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "Android";

                    platformSetting.maxTextureSize = 1024;

                    platformSetting.format = TextureImporterFormat.ETC2_RGB4;

                    platformSetting.compressionQuality = 1;

                    break;

                case BuildTargetGroup.iOS:

                    platformSetting.overridden = true;

                    platformSetting.allowsAlphaSplitting = false;

                    platformSetting.name = "iOS";

                    platformSetting.maxTextureSize = 1024;

                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;

                    platformSetting.compressionQuality = 1;

                    break;

            }



            loginBackGroundTextureImporter.SetPlatformTextureSettings(platformSetting);

            AssetDatabase.ImportAsset(loginBackGroundImporterPath);

            EditorUtility.SetDirty(loginBackGroundTextureImporter);

        }

    }




 Assets/Editor/Tool/PrefabCreateTool.cs

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

 Assets/Editor/Tool/TableTool.cs

@@ -178,15 +178,19 @@
        MessageBox.Show("导出成功！");

    }



    public static void ReadAllTxtToBytes(string _outPath)

    public static void CopyConfigsToOutPutPath(string _outPath)

    {

        configOutPutPath = _outPath;

        var rootPath = UnityEngine.Application.dataPath + "/ResourcesOut/Refdata/Config";

        var configFiles = FileExtersion.GetFileInfos(rootPath, new string[] { "*.txt", "*.TXT" });

        var root1 = UnityEngine.Application.dataPath + "/ResourcesOut/Refdata/Config";

        var configFiles = new List<FileInfo>();

        configFiles.AddRange(FileExtersion.GetFileInfos(root1, new string[] { "*.txt", "*.TXT" }));

        var root2 = UnityEngine.Application.dataPath + "/Resources/Config";

        configFiles.AddRange(FileExtersion.GetFileInfos(root1, new string[] { "*.txt", "*.TXT" }));



        foreach (var file in configFiles)

        {

            var fileInfo = new System.IO.FileInfo(file.FullName);

            ReadTxtToBytes(fileInfo);

            var fileInfo = new FileInfo(file.FullName);

            CopyTxt(fileInfo);

        }

    }



@@ -211,11 +215,11 @@
            {

                continue;

            }

            ReadTxtToBytes(_tableNameLst[i].fileInfo);

            CopyTxt(_tableNameLst[i].fileInfo);

        }

    }



    private static void ReadTxtToBytes(FileInfo fileInfo)

    private static void CopyTxt(FileInfo fileInfo)

    {

        string fileName = fileInfo.Name.Split('.')[0];




 Assets/Resources/Config/Contact.txt

@@ -1,8 +1,8 @@
string    string    string

appid    qq    phone

渠道唯一标识    qq号码    电话

test    364452445    123456

226114725    696899964	
822055139    939014605	
spxjgame    3004332105	
jisugame    738444213	
int    string    int    string    string

id    appid    branch    qq    phone

唯一标识    渠道唯一标识    分支    qq号码    电话

1    test    0    364452445    123456

2    226114725    0    696899964	
3    822055139    0    939014605	
4    spxjgame    0    3004332105	
5    jisugame    0    738444213	

 Assets/Resources/Config/PriorLanguage.txt

@@ -31,6 +31,6 @@
28    <color=#35e122>流畅</color>

29    <color=#d5d5d5>维护</color>

30    账号登录中

31    客服QQ: {0}

31    客服QQ: 
32    客服电话: {0}

33    复制成功

 Assets/Resources/Font.meta

File was deleted

 Assets/Resources/Music.meta

File was deleted

 Assets/Resources/Music/Music_Login.wav

Binary files differ

 Assets/Resources/Music/Music_Login.wav.meta

File was deleted

 Assets/Resources/UI.meta

File was deleted

 Assets/Resources/UI/Prefabs.meta

File was deleted

 Assets/Resources/UI/Prefabs/DownLoadWin.prefab

File was deleted

 Assets/Resources/UI/Prefabs/DownLoadWin.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/FirstScreenWin.prefab

File was deleted

 Assets/Resources/UI/Prefabs/FirstScreenWin.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/HUDRoot.prefab

File was deleted

 Assets/Resources/UI/Prefabs/HUDRoot.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/LaunchWin.prefab

File was deleted

 Assets/Resources/UI/Prefabs/LaunchWin.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/UI3DModelExhibitionStage.prefab

File was deleted

 Assets/Resources/UI/Prefabs/UI3DModelExhibitionStage.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/UI3DTreasureExhibitionStage.prefab

File was deleted

 Assets/Resources/UI/Prefabs/UI3DTreasureExhibitionStage.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/UIRoot.prefab

File was deleted

 Assets/Resources/UI/Prefabs/UIRoot.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/UIRootDebug.prefab

File was deleted

 Assets/Resources/UI/Prefabs/UIRootDebug.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/UserHelpWin.prefab

File was deleted

 Assets/Resources/UI/Prefabs/UserHelpWin.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab

File was deleted

 Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab.meta

File was deleted

 Assets/Resources/UI/Prefabs/WindowMask.prefab

File was deleted

 Assets/Resources/UI/Prefabs/WindowMask.prefab.meta

File was deleted

 Assets/Resources/UI/Sprites.meta

File was deleted

 Assets/Resources/UI/Sprites/Launch.png

Binary files differ

 Assets/Resources/UI/Sprites/Launch.png.meta

File was deleted

 Assets/Resources/UI/Sprites/Square.png

Binary files differ

 Assets/Resources/UI/Sprites/Square.png.meta

File was deleted

 Assets/Resources/UI/Sprites/TB_DL_Logo.png

Binary files differ

 Assets/Resources/UI/Sprites/TB_DL_Logo.png.meta

File was deleted