Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/Editor/Bat/updateGame.bat

@@ -2,9 +2,15 @@ cd ../../../Assets/Res
 svn up --force --accept tc
 
 cd ../../../
+git clean -df
+git reset --hard
+git status
 git pull
 
 cd GameClient/Assets/Game/CSShare
+git clean -df
+git reset --hard
+git status
 git pull
 
 pause

GameClient/Assets/Editor/ToolsMenu.cs

@@ -2,6 +2,7 @@
 using GFGGame;
 using System;
 using System.IO;
+using System.Threading;
 using UnityEditor;
 using UnityEditor.Compilation;
 using UnityEngine;
@@ -62,6 +63,8 @@ namespace GFGEditor
         [MenuItem("策划/其它/更新项目", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
         static void UpdateProject()
         {
+            SQLiteHelper.Instance.CloseConnection();
+            Thread.Sleep(1000);
             EditorUtility.DisplayProgressBar("进度", "正在更新项目", 1);
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateGame.bat");
             EditorUtility.ClearProgressBar();
@@ -133,6 +136,7 @@ namespace GFGEditor
             File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
+            SQLiteHelper.Instance.CloseConnection();
         }
 
         [MenuItem("策划/检查配置表", false, (int)TOOL_MENU_PRIORITY.CheckExcel)]