export-table-pulgin-csharp 1.1.65 → 1.1.67

package/dist/ExportCSPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AAM1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqTpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}
+{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AAM1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA4TpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}

package/dist/ExportCSPlugin.js

@@ -116,7 +116,7 @@ function export_stuff(paras) {
                 convert.push(`{"${k}","${value[k].toString()}"}`);
             }
             ;
-            return `new Dictionary<string,string>(){${convert}}`;
+            return `new Dictionary<string,string>(${convert.length}){${convert}}`;
         }
         else if (t == "object[]") {
             let values = value;
@@ -127,7 +127,7 @@ function export_stuff(paras) {
                     convert.push(`{"${k}","${val[k].toString()}"}`);
                 }
                 ;
-                return `new Dictionary<string,string>(){${convert}}`;
+                return `new Dictionary<string,string>(${convert.length}){${convert}}`;
             })}}`;
         }
         else if (t == "number" || t == "int" || t == "long") {
@@ -241,35 +241,42 @@ ${(0, export_table_lib_1.foreach)(fields, f => {
 #region uid map
 ${(0, export_table_lib_1.foreach)(fields, f => {
         if (f.isUnique) {
+            let memberName = convMemberName(f.name);
+            let tempDictByMemberName = `_tempDictBy${memberName}`;
+            let memberType = getFieldType(f);
             return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}> _tempDictBy${convMemberName(f.name)};
-		public static ${RowClass} GetConfigBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		protected static Dictionary<${memberType}, ${RowClass}> ${tempDictByMemberName};
+		public static ${RowClass} GetConfigBy${memberName}(${memberType} ${memberName})
 		{
-			if (_tempDictBy${convMemberName(f.name)} == null)
+			if (${tempDictByMemberName} == null)
 			{
-				_tempDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}>();
-				Configs.ForEach(c =>
+				${tempDictByMemberName} = new Dictionary<${memberType}, ${RowClass}>(Configs.Count);
+				for(var i = 0; i < Configs.Count; i++)
 				{
-					_tempDictBy${convMemberName(f.name)}.Add(c.${convMemberName(f.name)}, c);
-				});
+					var c = Configs[i];
+					${tempDictByMemberName}.Add(c.${memberName}, c);
+				}
 			}
-			return _tempDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+			return ${tempDictByMemberName}.GetValueOrDefault(${memberName});
 		}
 `;
         }
         else if (f.type == "number" || f.type == "int" || f.type == "long" || f.type == "string") {
+            let memberName = convMemberName(f.name);
+            let tempRecordsDictByMemberName = `_tempRecordsDictBy${memberName}`;
+            let memberType = getFieldType(f);
             return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}[]> _tempRecordsDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}[]>();
-		public static ${RowClass}[] GetConfigsBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		protected static Dictionary<${memberType}, ${RowClass}[]> ${tempRecordsDictByMemberName} = new Dictionary<${memberType}, ${RowClass}[]>(Configs.Count);
+		public static ${RowClass}[] GetConfigsBy${memberName}(${memberType} ${memberName})
 		{
-			if (_tempRecordsDictBy${convMemberName(f.name)}.ContainsKey(${convMemberName(f.name)}))
+			if (${tempRecordsDictByMemberName}.ContainsKey(${memberName}))
 			{
-				return _tempRecordsDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+				return ${tempRecordsDictByMemberName}.GetValueOrDefault(${memberName});
 			}
 			else
 			{
-				var records = Configs.Where(c => c.${convMemberName(f.name)} == ${convMemberName(f.name)}).ToArray();
-				_tempRecordsDictBy${convMemberName(f.name)}.Add(${convMemberName(f.name)}, records);
+				var records = Configs.Where(c => c.${memberName} == ${memberName});//.ToArray();
+				${tempRecordsDictByMemberName}.Add(${memberName}, records);
 				return records;
 			}
 		}

package/dist/ExportUnityCSJsonPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAe,MAAM,kBAAkB,CAAA;AAMlI,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+CnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAgFzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAsB3C"}
+{"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAIxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+CnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAgFzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAsB3C"}

package/dist/ExportUnityCSJsonPlugin.js

@@ -26,9 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportUJsonPlugin = exports.exportUJsonLoader = exports.exportUJson = void 0;
 const export_table_lib_1 = require("export-table-lib");
 const fs = __importStar(require("fs-extra"));
-let firstLetterUpper = function (str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-};
+let firstLetterUpper = export_table_lib_1.makeFirstLetterUpper;
 function exportUJson(paras) {
     let { datas, fields, name, objects, table, } = paras;
     let firstLetterLower = function (str) {
@@ -72,71 +70,71 @@ function exportUJsonLoader(paras) {
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
     // !!!必须开头没有空格
-    let temp = `
-using UnityEngine.AddressableAssets;
-using System.Threading.Tasks;
-using UnityEngine;
-using lang.json;
-
-namespace MEEC.ExportedConfigs
-{
-	public partial class ${RowClass}
-	{
-#if UNITY_EDITOR && ENABLE_CONFIG_LOG
-		static ${RowClass}()
-		{
-			Debug.Log("ReferConfig-${RowClass}");
-		}
-#endif
-		public static async Task Load()
-		{
-			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
-			var configJson =
-#if UNITY_EDITOR
-				Application.isPlaying ? await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task
-					: UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
-#else
-				await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task;
-#endif
-			if (configJson != null)
-			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
-				var configs = ${RowClass}.Configs;
-				configs.Clear();
-				configs.AddRange(jsonObjs);
-			}
-			else
-			{
-				Debug.LogError($"配表资源缺失: {loadUrl}");
-			}
-		}
-
-#if UNITY_EDITOR
-		public static void LoadInEditor()
-		{
-			if (Application.isPlaying)
-			{
-				var tip = $"cannot load ${RowClass}[] with LoadInEditor at runtime";
-				Debug.LogError(tip);
-				throw new System.Exception(tip);
-			}
-			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
-			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
-			if (configJson != null)
-			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
-				var configs = ${RowClass}.Configs;
-				configs.Clear();
-				configs.AddRange(jsonObjs);
-			}
-			else
-			{
-				Debug.LogError($"配表资源缺失: {loadUrl}");
-			}
-		}
-#endif
-	}
-}
+    let temp = `
+using UnityEngine.AddressableAssets;
+using System.Threading.Tasks;
+using UnityEngine;
+using lang.json;
+
+namespace MEEC.ExportedConfigs
+{
+	public partial class ${RowClass}
+	{
+#if UNITY_EDITOR && ENABLE_CONFIG_LOG
+		static ${RowClass}()
+		{
+			Debug.Log("ReferConfig-${RowClass}");
+		}
+#endif
+		public static async Task Load()
+		{
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
+			var configJson =
+#if UNITY_EDITOR
+				Application.isPlaying ? await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task
+					: UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
+#else
+				await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task;
+#endif
+			if (configJson != null)
+			{
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+			else
+			{
+				Debug.LogError($"配表资源缺失: {loadUrl}");
+			}
+		}
+
+#if UNITY_EDITOR
+		public static void LoadInEditor()
+		{
+			if (Application.isPlaying)
+			{
+				var tip = $"cannot load ${RowClass}[] with LoadInEditor at runtime";
+				Debug.LogError(tip);
+				throw new System.Exception(tip);
+			}
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
+			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
+			if (configJson != null)
+			{
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+			else
+			{
+				Debug.LogError($"配表资源缺失: {loadUrl}");
+			}
+		}
+#endif
+	}
+}
 `;
     return temp;
 }
@@ -167,22 +165,22 @@ class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
     }
     handleBatch(paras) {
         var tables = paras.tables;
-        var temp = `
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MEEC.ExportedConfigs
-{
-	public static class DefaultConfigLoader{
-		public static IEnumerable<Func<Task>> Load(){
-${(0, export_table_lib_1.foreach)(tables, (table) => `
-			yield return ${firstLetterUpper(table.name)}.Load;
-`)}
-			yield break;
-		}
-	}
-}
+        var temp = `
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MEEC.ExportedConfigs
+{
+	public static class DefaultConfigLoader{
+		public static IEnumerable<Func<Task>> Load(){
+${(0, export_table_lib_1.foreach)(tables, (table) => `
+			yield return ${firstLetterUpper(table.name)}.Load;
+`)}
+			yield break;
+		}
+	}
+}
 `;
         let savePath = paras.outPath + "/DefaultConfigLoader.cs";
         fs.outputFileSync(savePath, temp, "utf-8");

package/dist/ExportUnityCSJsonPluginV1.d.ts

@@ -0,0 +1,8 @@
+import { HandleSheetParams, PluginBase, HandleBatchParams } from "export-table-lib";
+export declare class ExportUJsonPluginV1 extends PluginBase {
+    name: string;
+    tags: string[];
+    handleSheet(paras: HandleSheetParams): string | null;
+    handleBatch(paras: HandleBatchParams): void;
+}
+//# sourceMappingURL=ExportUnityCSJsonPluginV1.d.ts.map

package/dist/ExportUnityCSJsonPluginV1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportUnityCSJsonPluginV1.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPluginV1.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAgGxJ,qBAAa,mBAAoB,SAAQ,UAAU;IAClD,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAa;IAE3B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAsB3C"}

package/dist/ExportUnityCSJsonPluginV1.js

@@ -0,0 +1,149 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportUJsonPluginV1 = void 0;
+const export_table_lib_1 = require("export-table-lib");
+const fs = __importStar(require("fs-extra"));
+let firstLetterUpper = export_table_lib_1.makeFirstLetterUpper;
+function exportUJson(paras) {
+    let { datas, fields, name, objects, table, } = paras;
+    let firstLetterLower = function (str) {
+        return str.charAt(0).toLowerCase() + str.slice(1);
+    };
+    let convMemberName = function (str) {
+        return str.split("_").map(s => firstLetterUpper(s)).join("");
+    };
+    var fullName = `${table.workbookName}-${name}`;
+    let jsonString = JSON.stringify(objects.map(obj => {
+        var newObj = Object.create(null);
+        Object.keys(obj).forEach(key => {
+            var newKey = convMemberName(key);
+            newObj[newKey] = obj[key];
+        });
+        return newObj;
+    }));
+    // !!!必须开头没有空格
+    let temp = `%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 496f60086c072a8479a6e0b948efb5e8, type: 3}
+  m_Name: ${fullName}
+  m_EditorClassIdentifier: 
+  JsonText: ${JSON.stringify(jsonString)}
+`;
+    return temp;
+}
+function exportUJsonLoader(paras) {
+    let { datas, fields, name, objects, table, } = paras;
+    let RowClass = firstLetterUpper(name);
+    var fullName = `${table.workbookName}-${name}`;
+    // !!!必须开头没有空格
+    let temp = `
+using lang.json;
+using UnityEngine.AddressableAssets;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace MEEC.ExportedConfigs
+{
+    public partial class ${RowClass}
+    {
+        public static async Task Load()
+        {
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.asset";
+            var configJson = await Addressables.LoadAssetAsync<ExcelConfigJson>(loadUrl).Task;
+			if (configJson != null)
+            {
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.JsonText);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+            else
+            {
+                Debug.LogError($"配表资源缺失: {loadUrl}");
+            }
+        }
+    }
+}
+`;
+    return temp;
+}
+class ExportUJsonPluginV1 extends export_table_lib_1.PluginBase {
+    constructor() {
+        super(...arguments);
+        this.name = "ujson1";
+        this.tags = ["ujson1"];
+    }
+    handleSheet(paras) {
+        var fullName = `${paras.table.workbookName}-${paras.name}`;
+        {
+            let content1 = exportUJsonLoader(paras);
+            if (content1 != null) {
+                let savePath = new export_table_lib_1.OutFilePath(paras.outPath, fullName, "Loader.cs").fullPath;
+                fs.outputFileSync(savePath, content1, "utf-8");
+            }
+        }
+        {
+            let content2 = exportUJson(paras);
+            if (content2 != null) {
+                let savePath = new export_table_lib_1.OutFilePath(paras.outPath, fullName, ".asset").fullPath;
+                fs.outputFileSync(savePath, content2, "utf-8");
+            }
+            return content2;
+        }
+    }
+    handleBatch(paras) {
+        var tables = paras.tables;
+        var temp = `
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MEEC.ExportedConfigs
+{
+	public static class DefaultConfigLoader{
+		public static IEnumerable<Func<Task>> Load(){
+${(0, export_table_lib_1.foreach)(tables, (table) => `
+			yield return ${firstLetterUpper(table.name)}.Load;
+`)}
+			yield break;
+		}
+	}
+}
+`;
+        let savePath = paras.outPath + "/DefaultConfigLoader.cs";
+        fs.outputFileSync(savePath, temp, "utf-8");
+    }
+}
+exports.ExportUJsonPluginV1 = ExportUJsonPluginV1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-pulgin-csharp",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {

package/src/ExportCSPlugin.ts

@@ -90,7 +90,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 			for (let k in value) {
 				convert.push(`{"${k}","${(value as any)[k].toString()}"}`);
 			};
-			return `new Dictionary<string,string>(){${convert}}`;
+			return `new Dictionary<string,string>(${convert.length}){${convert}}`;
 		} else if (t == "object[]") {
 			let values = value as object[];
 			//throw new Error("invalid type <object[]>")
@@ -99,7 +99,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 				for (let k in val) {
 					convert.push(`{"${k}","${(val as any)[k].toString()}"}`);
 				};
-				return `new Dictionary<string,string>(){${convert}}`;
+				return `new Dictionary<string,string>(${convert.length}){${convert}}`;
 			})}}`
 		} else if (t == "number" || t == "int" || t == "long") {
 			return `${value}`
@@ -213,34 +213,41 @@ ${foreach(fields, f => {
 #region uid map
 ${foreach(fields, f => {
 		if (f.isUnique) {
+			let memberName = convMemberName(f.name);
+			let tempDictByMemberName = `_tempDictBy${memberName}`;
+			let memberType = getFieldType(f);
 			return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}> _tempDictBy${convMemberName(f.name)};
-		public static ${RowClass} GetConfigBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		protected static Dictionary<${memberType}, ${RowClass}> ${tempDictByMemberName};
+		public static ${RowClass} GetConfigBy${memberName}(${memberType} ${memberName})
 		{
-			if (_tempDictBy${convMemberName(f.name)} == null)
+			if (${tempDictByMemberName} == null)
 			{
-				_tempDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}>();
-				Configs.ForEach(c =>
+				${tempDictByMemberName} = new Dictionary<${memberType}, ${RowClass}>(Configs.Count);
+				for(var i = 0; i < Configs.Count; i++)
 				{
-					_tempDictBy${convMemberName(f.name)}.Add(c.${convMemberName(f.name)}, c);
-				});
+					var c = Configs[i];
+					${tempDictByMemberName}.Add(c.${memberName}, c);
+				}
 			}
-			return _tempDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+			return ${tempDictByMemberName}.GetValueOrDefault(${memberName});
 		}
 `
 		} else if (f.type == "number" || f.type == "int" || f.type == "long" || f.type == "string") {
+			let memberName = convMemberName(f.name);
+			let tempRecordsDictByMemberName = `_tempRecordsDictBy${memberName}`;
+			let memberType = getFieldType(f);
 			return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}[]> _tempRecordsDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}[]>();
-		public static ${RowClass}[] GetConfigsBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		protected static Dictionary<${memberType}, ${RowClass}[]> ${tempRecordsDictByMemberName} = new Dictionary<${memberType}, ${RowClass}[]>(Configs.Count);
+		public static ${RowClass}[] GetConfigsBy${memberName}(${memberType} ${memberName})
 		{
-			if (_tempRecordsDictBy${convMemberName(f.name)}.ContainsKey(${convMemberName(f.name)}))
+			if (${tempRecordsDictByMemberName}.ContainsKey(${memberName}))
 			{
-				return _tempRecordsDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+				return ${tempRecordsDictByMemberName}.GetValueOrDefault(${memberName});
 			}
 			else
 			{
-				var records = Configs.Where(c => c.${convMemberName(f.name)} == ${convMemberName(f.name)}).ToArray();
-				_tempRecordsDictBy${convMemberName(f.name)}.Add(${convMemberName(f.name)}, records);
+				var records = Configs.Where(c => c.${memberName} == ${memberName});//.ToArray();
+				${tempRecordsDictByMemberName}.Add(${memberName}, records);
 				return records;
 			}
 		}

package/src/ExportUnityCSJsonPlugin.ts

@@ -1,184 +1,182 @@
-
-import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath } from "export-table-lib"
-import * as fs from "fs-extra"
-
-let firstLetterUpper = function (str: string) {
-	return str.charAt(0).toUpperCase() + str.slice(1);
-};
-export function exportUJson(paras: HandleSheetParams): string | null {
-	let {
-		datas,
-		fields,
-		name,
-		objects,
-		table,
-	} = paras;
-
-	let firstLetterLower = function (str: string) {
-		return str.charAt(0).toLowerCase() + str.slice(1);
-	};
-	let convMemberName = function (str: string) {
-		return str.split("_").map(s => firstLetterUpper(s)).join("")
-	}
-
-	var fullName = `${table.workbookName}-${name}`
-	let jsonString = JSON.stringify(objects.map(obj => {
-		var newObj = Object.create(null);
-		Object.keys(obj).forEach(key => {
-			var newKey = convMemberName(key);
-			newObj[newKey] = obj[key];
-		})
-		return newObj
-	}));
-
-	return jsonString;
-
-// 	// !!!必须开头没有空格
-// 	let temp = `%YAML 1.1
-// %TAG !u! tag:unity3d.com,2011:
-// --- !u!114 &11400000
-// MonoBehaviour:
-//   m_ObjectHideFlags: 0
-//   m_CorrespondingSourceObject: {fileID: 0}
-//   m_PrefabInstance: {fileID: 0}
-//   m_PrefabAsset: {fileID: 0}
-//   m_GameObject: {fileID: 0}
-//   m_Enabled: 1
-//   m_EditorHideFlags: 0
-//   m_Script: {fileID: 11500000, guid: 496f60086c072a8479a6e0b948efb5e8, type: 3}
-//   m_Name: ${fullName}
-//   m_EditorClassIdentifier:
-//   JsonText: ${JSON.stringify(jsonString)}
-// `
-// 	return temp
-
-}
-
-export function exportUJsonLoader(paras: HandleSheetParams): string | null {
-	let {
-		datas,
-		fields,
-		name,
-		objects,
-		table,
-	} = paras;
-
-	let RowClass = firstLetterUpper(name)
-	var fullName = `${table.workbookName}-${name}`
-	// !!!必须开头没有空格
-	let temp = `
-using UnityEngine.AddressableAssets;
-using System.Threading.Tasks;
-using UnityEngine;
-using lang.json;
-
-namespace MEEC.ExportedConfigs
-{
-	public partial class ${RowClass}
-	{
-#if UNITY_EDITOR && ENABLE_CONFIG_LOG
-		static ${RowClass}()
-		{
-			Debug.Log("ReferConfig-${RowClass}");
-		}
-#endif
-		public static async Task Load()
-		{
-			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
-			var configJson =
-#if UNITY_EDITOR
-				Application.isPlaying ? await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task
-					: UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
-#else
-				await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task;
-#endif
-			if (configJson != null)
-			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
-				var configs = ${RowClass}.Configs;
-				configs.Clear();
-				configs.AddRange(jsonObjs);
-			}
-			else
-			{
-				Debug.LogError($"配表资源缺失: {loadUrl}");
-			}
-		}
-
-#if UNITY_EDITOR
-		public static void LoadInEditor()
-		{
-			if (Application.isPlaying)
-			{
-				var tip = $"cannot load ${RowClass}[] with LoadInEditor at runtime";
-				Debug.LogError(tip);
-				throw new System.Exception(tip);
-			}
-			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
-			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
-			if (configJson != null)
-			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
-				var configs = ${RowClass}.Configs;
-				configs.Clear();
-				configs.AddRange(jsonObjs);
-			}
-			else
-			{
-				Debug.LogError($"配表资源缺失: {loadUrl}");
-			}
-		}
-#endif
-	}
-}
-`
-	return temp
-
-}
-
-export class ExportUJsonPlugin extends PluginBase {
-	name = "ujson"
-	tags: string[] = ["ujson"]
-
-	handleSheet(paras: HandleSheetParams) {
-		var fullName = `${paras.table.workbookName}-${paras.name}`
-		{
-			let content1 = exportUJsonLoader(paras)
-			if (content1 != null) {
-				let savePath = new OutFilePath(paras.outPath, fullName, "Loader.cs").fullPath
-				fs.outputFileSync(savePath, content1, "utf-8")
-			}
-		}
-		{
-			let content2 = exportUJson(paras)
-			if (content2 != null) {
-				let savePath = new OutFilePath(paras.outPath, fullName, ".json").fullPath
-				fs.outputFileSync(savePath, content2, "utf-8")
-			}
-			return content2
-		}
-	}
-
-	handleBatch(paras: HandleBatchParams): void {
-		var tables = paras.tables;
-		var temp = `
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MEEC.ExportedConfigs
-{
-	public static class DefaultConfigLoader{
-		public static IEnumerable<Func<Task>> Load(){
-${foreach(tables, (table) => `
-			yield return ${firstLetterUpper(table.name)}.Load;
-`)}
-			yield break;
-		}
-	}
-}
-`
-		let savePath = paras.outPath + "/DefaultConfigLoader.cs";
-		fs.outputFileSync(savePath, temp, "utf-8");
-	}
-}
+
+import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath, makeFirstLetterUpper } from "export-table-lib"
+import * as fs from "fs-extra"
+
+let firstLetterUpper = makeFirstLetterUpper;
+export function exportUJson(paras: HandleSheetParams): string | null {
+	let {
+		datas,
+		fields,
+		name,
+		objects,
+		table,
+	} = paras;
+
+	let firstLetterLower = function (str: string) {
+		return str.charAt(0).toLowerCase() + str.slice(1);
+	};
+	let convMemberName = function (str: string) {
+		return str.split("_").map(s => firstLetterUpper(s)).join("")
+	}
+
+	var fullName = `${table.workbookName}-${name}`
+	let jsonString = JSON.stringify(objects.map(obj => {
+		var newObj = Object.create(null);
+		Object.keys(obj).forEach(key => {
+			var newKey = convMemberName(key);
+			newObj[newKey] = obj[key];
+		})
+		return newObj
+	}));
+
+	return jsonString;
+
+// 	// !!!必须开头没有空格
+// 	let temp = `%YAML 1.1
+// %TAG !u! tag:unity3d.com,2011:
+// --- !u!114 &11400000
+// MonoBehaviour:
+//   m_ObjectHideFlags: 0
+//   m_CorrespondingSourceObject: {fileID: 0}
+//   m_PrefabInstance: {fileID: 0}
+//   m_PrefabAsset: {fileID: 0}
+//   m_GameObject: {fileID: 0}
+//   m_Enabled: 1
+//   m_EditorHideFlags: 0
+//   m_Script: {fileID: 11500000, guid: 496f60086c072a8479a6e0b948efb5e8, type: 3}
+//   m_Name: ${fullName}
+//   m_EditorClassIdentifier:
+//   JsonText: ${JSON.stringify(jsonString)}
+// `
+// 	return temp
+
+}
+
+export function exportUJsonLoader(paras: HandleSheetParams): string | null {
+	let {
+		datas,
+		fields,
+		name,
+		objects,
+		table,
+	} = paras;
+
+	let RowClass = firstLetterUpper(name)
+	var fullName = `${table.workbookName}-${name}`
+	// !!!必须开头没有空格
+	let temp = `
+using UnityEngine.AddressableAssets;
+using System.Threading.Tasks;
+using UnityEngine;
+using lang.json;
+
+namespace MEEC.ExportedConfigs
+{
+	public partial class ${RowClass}
+	{
+#if UNITY_EDITOR && ENABLE_CONFIG_LOG
+		static ${RowClass}()
+		{
+			Debug.Log("ReferConfig-${RowClass}");
+		}
+#endif
+		public static async Task Load()
+		{
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
+			var configJson =
+#if UNITY_EDITOR
+				Application.isPlaying ? await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task
+					: UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
+#else
+				await Addressables.LoadAssetAsync<TextAsset>(loadUrl).Task;
+#endif
+			if (configJson != null)
+			{
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+			else
+			{
+				Debug.LogError($"配表资源缺失: {loadUrl}");
+			}
+		}
+
+#if UNITY_EDITOR
+		public static void LoadInEditor()
+		{
+			if (Application.isPlaying)
+			{
+				var tip = $"cannot load ${RowClass}[] with LoadInEditor at runtime";
+				Debug.LogError(tip);
+				throw new System.Exception(tip);
+			}
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.json";
+			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
+			if (configJson != null)
+			{
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+			else
+			{
+				Debug.LogError($"配表资源缺失: {loadUrl}");
+			}
+		}
+#endif
+	}
+}
+`
+	return temp
+
+}
+
+export class ExportUJsonPlugin extends PluginBase {
+	name = "ujson"
+	tags: string[] = ["ujson"]
+
+	handleSheet(paras: HandleSheetParams) {
+		var fullName = `${paras.table.workbookName}-${paras.name}`
+		{
+			let content1 = exportUJsonLoader(paras)
+			if (content1 != null) {
+				let savePath = new OutFilePath(paras.outPath, fullName, "Loader.cs").fullPath
+				fs.outputFileSync(savePath, content1, "utf-8")
+			}
+		}
+		{
+			let content2 = exportUJson(paras)
+			if (content2 != null) {
+				let savePath = new OutFilePath(paras.outPath, fullName, ".json").fullPath
+				fs.outputFileSync(savePath, content2, "utf-8")
+			}
+			return content2
+		}
+	}
+
+	handleBatch(paras: HandleBatchParams): void {
+		var tables = paras.tables;
+		var temp = `
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MEEC.ExportedConfigs
+{
+	public static class DefaultConfigLoader{
+		public static IEnumerable<Func<Task>> Load(){
+${foreach(tables, (table) => `
+			yield return ${firstLetterUpper(table.name)}.Load;
+`)}
+			yield break;
+		}
+	}
+}
+`
+		let savePath = paras.outPath + "/DefaultConfigLoader.cs";
+		fs.outputFileSync(savePath, temp, "utf-8");
+	}
+}

package/src/ExportUnityCSJsonPluginV1.ts

@@ -0,0 +1,143 @@
+
+import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath, makeFirstLetterUpper } from "export-table-lib"
+import * as fs from "fs-extra"
+
+let firstLetterUpper = makeFirstLetterUpper;
+function exportUJson(paras: HandleSheetParams): string | null {
+	let {
+		datas,
+		fields,
+		name,
+		objects,
+		table,
+	} = paras;
+
+	let firstLetterLower = function (str: string) {
+		return str.charAt(0).toLowerCase() + str.slice(1);
+	};
+	let convMemberName = function (str: string) {
+		return str.split("_").map(s => firstLetterUpper(s)).join("")
+	}
+
+	var fullName = `${table.workbookName}-${name}`
+	let jsonString = JSON.stringify(objects.map(obj => {
+		var newObj = Object.create(null);
+		Object.keys(obj).forEach(key => {
+			var newKey = convMemberName(key);
+			newObj[newKey] = obj[key];
+		})
+		return newObj
+	}));
+
+	// !!!必须开头没有空格
+	let temp = `%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 496f60086c072a8479a6e0b948efb5e8, type: 3}
+  m_Name: ${fullName}
+  m_EditorClassIdentifier: 
+  JsonText: ${JSON.stringify(jsonString)}
+`
+	return temp
+
+}
+
+function exportUJsonLoader(paras: HandleSheetParams): string | null {
+	let {
+		datas,
+		fields,
+		name,
+		objects,
+		table,
+	} = paras;
+
+	let RowClass = firstLetterUpper(name)
+	var fullName = `${table.workbookName}-${name}`
+	// !!!必须开头没有空格
+	let temp = `
+using lang.json;
+using UnityEngine.AddressableAssets;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace MEEC.ExportedConfigs
+{
+    public partial class ${RowClass}
+    {
+        public static async Task Load()
+        {
+			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.asset";
+            var configJson = await Addressables.LoadAssetAsync<ExcelConfigJson>(loadUrl).Task;
+			if (configJson != null)
+            {
+				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.JsonText);
+				var configs = ${RowClass}.Configs;
+				configs.Clear();
+				configs.AddRange(jsonObjs);
+			}
+            else
+            {
+                Debug.LogError($"配表资源缺失: {loadUrl}");
+            }
+        }
+    }
+}
+`
+	return temp
+
+}
+
+export class ExportUJsonPluginV1 extends PluginBase {
+	name = "ujson1"
+	tags: string[] = ["ujson1"]
+
+	handleSheet(paras: HandleSheetParams) {
+		var fullName = `${paras.table.workbookName}-${paras.name}`
+		{
+			let content1 = exportUJsonLoader(paras)
+			if (content1 != null) {
+				let savePath = new OutFilePath(paras.outPath, fullName, "Loader.cs").fullPath
+				fs.outputFileSync(savePath, content1, "utf-8")
+			}
+		}
+		{
+			let content2 = exportUJson(paras)
+			if (content2 != null) {
+				let savePath = new OutFilePath(paras.outPath, fullName, ".asset").fullPath
+				fs.outputFileSync(savePath, content2, "utf-8")
+			}
+			return content2
+		}
+	}
+
+	handleBatch(paras: HandleBatchParams): void {
+		var tables = paras.tables;
+		var temp = `
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MEEC.ExportedConfigs
+{
+	public static class DefaultConfigLoader{
+		public static IEnumerable<Func<Task>> Load(){
+${foreach(tables, (table) => `
+			yield return ${firstLetterUpper(table.name)}.Load;
+`)}
+			yield break;
+		}
+	}
+}
+`
+		let savePath = paras.outPath + "/DefaultConfigLoader.cs";
+		fs.outputFileSync(savePath, temp, "utf-8");
+	}
+}

package/test/testCS.bat

@@ -1 +1 @@
-node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:cs --libs E:\DATA\Projects\netease\quicktable %*
+node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:cs --libs E:\DATA\Projects\netease\quicktable %*

package/test/testUJson.bat

@@ -1 +1 @@
-node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:ujson --libs E:\DATA\Projects\netease\quicktable %*
+node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:ujson --libs E:\DATA\Projects\netease\quicktable %*