配置表生成代码修改

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -13,12 +13,12 @@ namespace GFGEditor
         /// <summary>
         /// 存放编辑器序列化文件的文件夹路径
         /// </summary>
-        public const string configCodePath = "Assets/Game/HotUpdate/ExcelConfig/GenCode/Item/";
+        public const string configCodePath = "Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/GenCode/Item/";
 
         /// <summary>
         /// 存放编辑器序列化文件的文件夹路径
         /// </summary>
-        public const string configArrayCodePath = "Assets/Game/HotUpdate/ExcelConfig/GenCode/Array/";
+        public const string configArrayCodePath = "Assets/Game/CSShare/GFG//HotUpdate/ExcelConfig/GenCode/Array/";
 
 
         /// <summary>

GameClient/Assets/Editor/Excel/Template/Config.txt

@@ -1,4 +1,8 @@
-using Mono.Data.Sqlite;
+#if UNITY_2017_1_OR_NEWER
+    using Mono.Data.Sqlite;
+#else
+using Microsoft.Data.Sqlite;
+#endif
 
 namespace GFGGame
 {

GameClient/Assets/Editor/Excel/Template/ConfigArray.txt

@@ -26,7 +26,7 @@ namespace GFGGame
                 }
                 catch(System.Exception e)
                 {
-                    throw (e);
+                    ET.Log.Error(e);
                 }
                 finally
                 {
@@ -57,7 +57,7 @@ namespace GFGGame
                     }
                     catch(System.Exception e)
                     {
-                        throw (e);
+                        ET.Log.Error(e);
                     }
                     finally
                     {

GameClient/Assets/Editor/Excel/Template/ConfigArray2.txt

@@ -26,7 +26,7 @@ namespace GFGGame
             }
             catch(System.Exception e)
             {
-                throw (e);
+                ET.Log.Error(e);
             }
             finally
             {
@@ -59,7 +59,7 @@ namespace GFGGame
                     }
                     catch(System.Exception e)
                     {
-                        throw (e);
+                        ET.Log.Error(e);
                     }
                     finally
                     {

GameClient/Assets/Editor/ToolsMenu.cs

@@ -1,4 +1,5 @@
-using GFGGame;
+using ET;
+using GFGGame;
 using System;
 using System.IO;
 using UnityEditor;
@@ -133,6 +134,8 @@ namespace GFGEditor
         [MenuItem("策划/其它/导入配置表", false, (int)TOOL_MENU_PRIORITY.ImportExcel)]
         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(true, null);
@@ -156,7 +159,7 @@ namespace GFGEditor
             }
             catch (Exception e)
             {
-                throw (e);
+                throw (e.InnerException);
             }
             finally
             {

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 828be86e826f150f3b837dd51a51193a6b7c431b
+Subproject commit ff9ea3fbe837ab301dbeebe8c62926733414412d