Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Editor/Tool/FileOpenEx.cs

@@ -1,7 +1,7 @@


using UnityEngine;

using UnityEngine;

using UnityEditor;

using UnityEditor.Callbacks;

using System.IO;



public class FileOpenEx

{

@@ -21,16 +21,45 @@


        if (name.EndsWith(".Shader") || name.EndsWith(".cginc") || name.EndsWith(".shader") || name.EndsWith(".lua.txt") || name.EndsWith(".lua"))

        {

            System.Diagnostics.Process process = new System.Diagnostics.Process();

            System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();

            startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

            startInfo.FileName = "C:/Program Files/Microsoft VS Code/Code.exe";

            startInfo.Arguments = name;

            process.StartInfo = startInfo;

            process.Start();

            return true;

            if (string.IsNullOrEmpty(ExtensionalTools.shaderEditorPath))

            {

                return false;

            }

            else

            {

                System.Diagnostics.Process process = new System.Diagnostics.Process();

                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();

                startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                startInfo.FileName = ExtensionalTools.shaderEditorPath;

                startInfo.Arguments = name;

                process.StartInfo = startInfo;

                process.Start();

                return true;

            }

        }



        if (name.EndsWith(".txt") && name.Contains("ResourcesOut") && name.Contains("Refdata"))

        {

            if (string.IsNullOrEmpty(ExtensionalTools.txtEditorPath))

            {

                return false;

            }

            else

            {

                System.Diagnostics.Process process = new System.Diagnostics.Process();

                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();



                startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                startInfo.FileName = ExtensionalTools.txtEditorPath;



                name = ExcelReader.GetExcelPath(Path.GetFileNameWithoutExtension(path));

                startInfo.Arguments = name;

                process.StartInfo = startInfo;

                process.Start();

                return true;

            }

        }



        return false;

    }

}
}