Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Editor/Tool/NetPkgTool.cs

@@ -217,6 +217,16 @@
            }

        }



        if (GUILayout.Button("打印摘要"))

        {

            NetPkgCtl.WriteAllNetLog(false);

        }



        if (GUILayout.Button("打印详情"))

        {

            NetPkgCtl.WriteAllNetLog(true);

        }



        if (GUILayout.Button("清除"))

        {

            if (NetPkgCtl.GetNetPkg() != null)