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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -6,10 +6,15 @@ namespace GFGEditor
     public class ExcelConfig
     {
         /// <summary>
-        /// 存放excel表文件夹的的路径，本例excel表放在了"Assets/Excel/"当中
+        /// 存放excel表文件夹的的路径
         /// </summary>
         public const string excelsFolderPath = "../../../gfg/tools/Config";
 
+        /// <summary>
+        /// 共享库中存放sqlite文件的的路径
+        /// </summary>
+        public const string sqliteFilePathCSShare = "Assets/Game/CSShare/Sqlite/excelConfig.sqlite";
+
         /// <summary>
         /// 存放编辑器序列化文件的文件夹路径
         /// </summary>

GameClient/Assets/Editor/ToolsMenu.cs

@@ -129,6 +129,8 @@ namespace GFGEditor
             }
             //开始扫描表格，自动生成部分数据
             ExcelScanner.StartScan();
+            //拷贝slqlite文件至共享库
+            File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit d9711126125a385777a56e2532deb16b2e825b31
+Subproject commit 17e5874dc0f677570e9a3131563e3b21f0e923c0