Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/ToolsMenu.cs

@@ -27,9 +27,20 @@ namespace GFGEditor
             ImportArtRes,
         }
 
-#if PT_TEMP || PT_TISHEN || PT_DEV
+#if PT_TEMP || PT_DEV
         
+        [MenuItem("外网/")]
+        public static void VersionTag()
+        {
+            
+        }
 #else
+
+        [MenuItem("内网/")]
+        public static void VersionTag()
+        {
+            
+        }
         [MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
         static void UpdateAndImportAll()
         {
@@ -87,47 +98,9 @@ namespace GFGEditor
         }
 
         [MenuItem("策划/其它/导入配置表", false, (int)TOOL_MENU_PRIORITY.ImportExcel)]
-        public static void ImportExcel()
+        public static void ImportExcelNeiWang()
         {
-            Log.ILog = new UnityLogger();
-            ET.Options.Instance = new ET.Options();
-            EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
-            SqliteController.Instance.dirPath = Path.Combine(Environment.CurrentDirectory, ResPathUtil.CONFIG_DIR_PATH);
-            SqliteController.Instance.Init(false, null);
-            SQLiteHelper.Instance.OpenConnection();
-            //try
-            //{
-
-            SQLiteHelper.Instance.ClearAllTables();
-            CodeTemplateFactory.Init();
-
-            if (!Directory.Exists(ExcelConfig.configCodePath))
-            {
-                Directory.CreateDirectory(ExcelConfig.configCodePath);
-            }
-            if (!Directory.Exists(ExcelConfig.configArrayCodePath))
-            {
-                Directory.CreateDirectory(ExcelConfig.configArrayCodePath);
-            }
-
-            ExcelReader.WriteExcle();
-            ExcelReader.ReadExcel(CodeBuilder.GenerateCode);
-            //}
-            //catch (Exception e)
-            //{
-            //    throw (e.InnerException);
-            //}
-            //finally
-            //{
-            SQLiteHelper.Instance.CloseConnection();
-            //}
-            //开始扫描表格，自动生成部分数据
-            ExcelScanner.StartScan();
-            //拷贝slqlite文件至共享库
-            File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
-            AssetDatabase.Refresh();
-            EditorUtility.ClearProgressBar();
-            SQLiteHelper.Instance.CloseConnection();
+            ImportExcel();
         }
 
         [MenuItem("策划/检查配置表", false, (int)TOOL_MENU_PRIORITY.CheckExcel)]
@@ -140,11 +113,15 @@ namespace GFGEditor
         }
 
         [MenuItem("策划/其它/导入美术资源", false, (int)TOOL_MENU_PRIORITY.ImportArtRes)]
-        public static void ImportArtRes()
+        public static void ImportArtResNeiWang()
         {
-            EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
-            ImportArtResTool.Import();
-            EditorUtility.ClearProgressBar();
+            ImportArtRes();
+        }
+
+        [MenuItem("策划/其它/清除冗余文件")]
+        public static void DeleteUnnecessaryImageNeiWang()
+        {
+            DeleteUnnecessaryImage();
         }
 #endif
 
@@ -180,7 +157,54 @@ namespace GFGEditor
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
             EditorUtility.ClearProgressBar();
         }
+        public static void ImportArtRes()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
+            ImportArtResTool.Import();
+            EditorUtility.ClearProgressBar();
+        }
+        public static void ImportExcel()
+        {
+            Log.ILog = new UnityLogger();
+            ET.Options.Instance = new ET.Options();
+            EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
+            SqliteController.Instance.dirPath = Path.Combine(Environment.CurrentDirectory, ResPathUtil.CONFIG_DIR_PATH);
+            SqliteController.Instance.Init(false, null);
+            SQLiteHelper.Instance.OpenConnection();
+            //try
+            //{
 
+            SQLiteHelper.Instance.ClearAllTables();
+            CodeTemplateFactory.Init();
+
+            if (!Directory.Exists(ExcelConfig.configCodePath))
+            {
+                Directory.CreateDirectory(ExcelConfig.configCodePath);
+            }
+            if (!Directory.Exists(ExcelConfig.configArrayCodePath))
+            {
+                Directory.CreateDirectory(ExcelConfig.configArrayCodePath);
+            }
+
+            ExcelReader.WriteExcle();
+            ExcelReader.ReadExcel(CodeBuilder.GenerateCode);
+            //}
+            //catch (Exception e)
+            //{
+            //    throw (e.InnerException);
+            //}
+            //finally
+            //{
+            SQLiteHelper.Instance.CloseConnection();
+            //}
+            //开始扫描表格，自动生成部分数据
+            ExcelScanner.StartScan();
+            //拷贝slqlite文件至共享库
+            File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
+            AssetDatabase.Refresh();
+            EditorUtility.ClearProgressBar();
+            SQLiteHelper.Instance.CloseConnection();
+        }
         static void UpdateAndImportArtRes()
         {
             UpdateArtRes();
@@ -210,7 +234,8 @@ namespace GFGEditor
         //     FileUtil.DeleteUnnecessaryImagePos(ImportArtResTool.DressUpTargetPath);
         //     FileUtil.DeleteUnnecessaryImageMD5(new string[] { ImportArtResTool.DressUpMd5FileSaveName });
         // }
-        [MenuItem("策划/其它/清除冗余文件")]
+        
+
         public static void DeleteUnnecessaryImage()
         {
             EditorUtility.DisplayProgressBar("进度", "开始清除资源", 1);
@@ -269,7 +294,35 @@ namespace GFGEditor
             }
         }
 
-        [MenuItem("Tools/BuildTest/导入临时版本资源")]
+        [MenuItem("Tools/Build/copy AOT dll", false, 0)]
+        public static void CopyDll()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在拷贝", 1);
+            BuildDllHelper.CopyAOTAssembliesToStreamingAssets();
+            EditorUtility.ClearProgressBar();
+        }
+
+        [MenuItem("Tools/Build/Build Bundles Res Init")]
+        public static void BuildBundlesResIn()
+        {
+            BuildScript.BuildCustomBundles(new string[] { "ResIn/Txt" }, "BuildSetting");
+        }
+
+        [MenuItem("Tools/Build/Build Bundles All")]
+        public static void BuildBundlesRes()
+        {
+            BuildDllHelper.BuildHotUpdateDll();
+            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
+        }
+
+        //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
+        [MenuItem("Tools/Build/Copy To StreamingAssets", false, 1)]
+        public static void CopyToStreamingAssets()
+        {
+            BuildScript.CopyToStreamingAssets();
+        }
+
+        [MenuItem("Tools/BuildTest/导入临时版本资源", false, 0)]
         public static void SetBundlesResTestDir()
         {
             try
@@ -285,7 +338,7 @@ namespace GFGEditor
                 CommitWhenRelease = true;
             }
         }
-        [MenuItem("Tools/BuildTest/导入临时版本配置")]
+        [MenuItem("Tools/BuildTest/导入临时版本配置", false, 1)]
         public static void SetBundlesExcelTestDir()
         {
             try
@@ -301,7 +354,8 @@ namespace GFGEditor
                 CommitWhenRelease = true;
             }
         }
-        [MenuItem("Tools/BuildTest/发布临时版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
+
+        [MenuItem("Tools/BuildTest/发布临时版本", false, 3)]
         public static void BuildBundlesResTemp()
         {
             EditorUtility.DisplayProgressBar("进度", "正在发布临时版本", 1);
@@ -310,26 +364,5 @@ namespace GFGEditor
             EditorUtility.ClearProgressBar();
         }
 
-        [MenuItem("Tools/BuildTest/copy AOT dll", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
-        public static void CopyDll()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在拷贝", 1);
-            BuildDllHelper.CopyAOTAssembliesToStreamingAssets();
-            EditorUtility.ClearProgressBar();
-        }
-
-        [MenuItem("Tools/BuildTest/Build Bundles Res Init")]
-        public static void BuildBundlesResIn()
-        {
-            BuildScript.BuildCustomBundles(new string[] { "ResIn/Txt" }, "BuildSetting");
-        }
-
-        [MenuItem("Tools/BuildTest/Build Bundles All")]
-        public static void BuildBundlesRes()
-        {
-            BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
-        }
-
     }
 }

GameClient/Assets/Editor/Xasset/MenuItems.cs

@@ -29,13 +29,6 @@ namespace VEngine.Editor
             BuildScript.BuildPlayer();
         }
 
-        //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
-        [MenuItem("Tools/BuildTest/Copy To StreamingAssets")]
-        public static void CopyToStreamingAssets()
-        {
-            BuildScript.CopyToStreamingAssets();
-        }
-
         [MenuItem("XAssets/Versions/Clear Bundles")]
         public static void ClearBuild()
         {