export-table-pulgin-csharp 1.1.164 → 1.1.165

package/dist/CSParseTool.d.ts

@@ -13,6 +13,8 @@ export declare function genTupleArrayValue(f: Field, content: string): {
 export declare function ToNewTupleStatement(obj: ValueTuple): string;
 export declare function ConvValue2Literal(value: any, t: FieldType, f: Field): string;
 export declare let isSkipExportDefaults0: boolean;
+export declare let isOverwriteWithProto: boolean;
+export declare let overwriteWithProtoPath: string;
 export declare let firstLetterUpper: (str: string) => string;
 export declare let firstLetterLower: (str: string) => string;
 export declare let convMemberName: (str: string) => string;

package/dist/CSParseTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CSParseTool.d.ts","sourceRoot":"","sources":["../src/CSParseTool.ts"],"names":[],"mappings":";AACA,OAAO,EAA0B,KAAK,EAA4D,SAAS,EAAwB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGtK,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CAWpE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CA0CjE;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,UAAU,EAAE,CAAA;CAAE,GAAG,SAAS,CAoDlH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,UAElD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAwE5E;AAED,eAAO,IAAI,qBAAqB,SAA0D,CAAA;AAE1F,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,cAAc,QAAkB,MAAM,WAEhD,CAAA;AACD,eAAO,IAAI,WAAW,QANuB,MAAM,WAMV,CAAA;AAEzC,eAAO,IAAI,mBAAmB,MAAgB,KAAK,WAclD,CAAA;AAED,eAAO,IAAI,YAAY,MAAgB,KAAK,wGAiD3C,CAAA;AAED,eAAO,IAAI,WAAW,MAAgB,KAAK,YAI1C,CAAA;AAED,eAAO,IAAI,kBAAkB,MAAgB,KAAK,WA+CjD,CAAA;AAED,eAAO,IAAI,4BAA4B,MAAgB,KAAK,WAiB3D,CAAA;AAED,eAAO,IAAI,cAAc,WAAqB,SAAS,EAAE,SAAS,KAAK,cAEtE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,GAAG,KAAK,KAAK,KAAG,MAE/C,CAAA;AAED,eAAO,MAAM,QAAQ,MAAO,KAAK,WAEhC,CAAA;AAED,eAAO,MAAM,YAAY,MAAO,KAAK,aAEpC,CAAA;AAED,eAAO,MAAM,kBAAkB,MAAO,KAAK,sBAc1C,CAAA;AAED,eAAO,MAAM,wBAAwB,MAAO,KAAK,WAYhD,CAAA;AAED,wBAAgB,yBAAyB,WAQxC;AAED,eAAO,IAAI,WAAW,SAAwD,CAAA;AAC9E,eAAO,IAAI,eAAe,QAAgC,CAAA;AAE1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAS7F"}
+{"version":3,"file":"CSParseTool.d.ts","sourceRoot":"","sources":["../src/CSParseTool.ts"],"names":[],"mappings":";AACA,OAAO,EAA0B,KAAK,EAA4D,SAAS,EAAwB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGtK,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CAWpE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CA0CjE;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,UAAU,EAAE,CAAA;CAAE,GAAG,SAAS,CAoDlH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,UAElD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAwE5E;AAED,eAAO,IAAI,qBAAqB,SAA0D,CAAA;AAE1F,eAAO,IAAI,oBAAoB,SAAsB,CAAA;AACrD,eAAO,IAAI,sBAAsB,QAA+D,CAAA;AAEhG,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,cAAc,QAAkB,MAAM,WAEhD,CAAA;AACD,eAAO,IAAI,WAAW,QANuB,MAAM,WAMV,CAAA;AAEzC,eAAO,IAAI,mBAAmB,MAAgB,KAAK,WAclD,CAAA;AAED,eAAO,IAAI,YAAY,MAAgB,KAAK,wGAiD3C,CAAA;AAED,eAAO,IAAI,WAAW,MAAgB,KAAK,YAI1C,CAAA;AAED,eAAO,IAAI,kBAAkB,MAAgB,KAAK,WA+CjD,CAAA;AAED,eAAO,IAAI,4BAA4B,MAAgB,KAAK,WAiB3D,CAAA;AAED,eAAO,IAAI,cAAc,WAAqB,SAAS,EAAE,SAAS,KAAK,cAEtE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,GAAG,KAAK,KAAK,KAAG,MAE/C,CAAA;AAED,eAAO,MAAM,QAAQ,MAAO,KAAK,WAEhC,CAAA;AAED,eAAO,MAAM,YAAY,MAAO,KAAK,aAEpC,CAAA;AAED,eAAO,MAAM,kBAAkB,MAAO,KAAK,sBAc1C,CAAA;AAED,eAAO,MAAM,wBAAwB,MAAO,KAAK,WAYhD,CAAA;AAED,wBAAgB,yBAAyB,WAQxC;AAED,eAAO,IAAI,WAAW,SAAwD,CAAA;AAC9E,eAAO,IAAI,eAAe,QAAgC,CAAA;AAE1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAS7F"}

package/dist/CSParseTool.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.outputFileSync = exports.useMMPNamespace = exports.isEnableMMP = exports.GetUsingJsonToolNamespace = exports.convTupleArrayTypeDefine = exports.convTupleArrayType = exports.getDescripts = exports.getTitle = exports.genValue = exports.getFkFieldType = exports.getCustomFieldTypeAnnotation = exports.getFieldAnnotation = exports.isTypeArray = exports.getFieldType = exports.getFieldElementType = exports.convVarName = exports.convMemberName = exports.firstLetterLower = exports.firstLetterUpper = exports.isSkipExportDefaults0 = exports.ConvValue2Literal = exports.ToNewTupleStatement = exports.genTupleArrayValue = exports.ConvValue = exports.TryConvValue = void 0;
+exports.outputFileSync = exports.useMMPNamespace = exports.isEnableMMP = exports.GetUsingJsonToolNamespace = exports.convTupleArrayTypeDefine = exports.convTupleArrayType = exports.getDescripts = exports.getTitle = exports.genValue = exports.getFkFieldType = exports.getCustomFieldTypeAnnotation = exports.getFieldAnnotation = exports.isTypeArray = exports.getFieldType = exports.getFieldElementType = exports.convVarName = exports.convMemberName = exports.firstLetterLower = exports.firstLetterUpper = exports.overwriteWithProtoPath = exports.isOverwriteWithProto = exports.isSkipExportDefaults0 = exports.ConvValue2Literal = exports.ToNewTupleStatement = exports.genTupleArrayValue = exports.ConvValue = exports.TryConvValue = void 0;
 const export_table_lib_1 = require("export-table-lib");
 const fs = __importStar(require("fs-extra"));
 function TryConvValue(value, t, f) {
@@ -246,6 +246,9 @@ function ConvValue2Literal(value, t, f) {
 }
 exports.ConvValue2Literal = ConvValue2Literal;
 exports.isSkipExportDefaults0 = process.argv.findIndex(v => v == "--SkipDefaults") >= 0;
+let withProtoIndex = process.argv.findIndex(v => v == "--WithProto");
+exports.isOverwriteWithProto = withProtoIndex >= 0;
+exports.overwriteWithProtoPath = exports.isOverwriteWithProto ? process.argv[withProtoIndex + 1] : "";
 let firstLetterUpper = function (str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 };

package/dist/CSProtoParser.d.ts

@@ -0,0 +1,22 @@
+export declare class FieldInfo {
+    name: string;
+    isArray: boolean;
+    type: string;
+    csName: string;
+    csType: string;
+    setName(n: string): void;
+    setType(t: string): void;
+    getFieldType(): string;
+}
+export declare class ClassInfo {
+    name: string;
+    type: "class" | "enum";
+    fields: FieldInfo[];
+    getFieldInfo(fieldName: string): FieldInfo | undefined;
+}
+export declare class CSProtoParser {
+    typeMap: Map<string, ClassInfo>;
+    parseProtoFile(filePath: string): void;
+    getClassInfo(className: string): ClassInfo | undefined;
+}
+//# sourceMappingURL=CSProtoParser.d.ts.map

package/dist/CSProtoParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CSProtoParser.d.ts","sourceRoot":"","sources":["../src/CSProtoParser.ts"],"names":[],"mappings":"AAUA,qBAAa,SAAS;IAClB,IAAI,EAAE,MAAM,CAAK;IACjB,OAAO,EAAE,OAAO,CAAQ;IACxB,IAAI,EAAE,MAAM,CAAK;IACjB,MAAM,EAAE,MAAM,CAAK;IACnB,MAAM,EAAE,MAAM,CAAK;IAEnB,OAAO,CAAC,CAAC,EAAE,MAAM;IAOjB,OAAO,CAAC,CAAC,EAAE,MAAM;IAWjB,YAAY;CAGf;AAED,qBAAa,SAAS;IAClB,IAAI,EAAE,MAAM,CAAK;IACjB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAU;IAChC,MAAM,EAAE,SAAS,EAAE,CAAK;IAExB,YAAY,CAAC,SAAS,EAAE,MAAM;CAIjC;AAED,qBAAa,aAAa;IACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAC5C,cAAc,CAAC,QAAQ,EAAE,MAAM;IA+D/B,YAAY,CAAC,SAAS,EAAE,MAAM;CAGjC"}

package/dist/CSProtoParser.js

@@ -0,0 +1,142 @@
+"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.CSProtoParser = exports.ClassInfo = exports.FieldInfo = void 0;
+const fs = __importStar(require("fs-extra"));
+const CSParseTool_1 = require("./CSParseTool");
+let fieldTypeMap = {
+    ["float"]: "float",
+    ["double"]: "double",
+    ["int32"]: "int",
+    ["bool"]: "bool",
+    ["bytes"]: "byte[]",
+};
+class FieldInfo {
+    name = "";
+    isArray = false;
+    type = "";
+    csName = "";
+    csType = "";
+    setName(n) {
+        this.name = n;
+        this.csName = (0, CSParseTool_1.firstLetterLower)(this.name.split("_")
+            .map(t => t.slice(0, 1).toUpperCase() + t.slice(1))
+            .join(""));
+    }
+    setType(t) {
+        this.type = t;
+        let internalType = fieldTypeMap[this.type];
+        if (internalType != undefined) {
+            this.csType = internalType;
+        }
+        else {
+            this.csType = t;
+        }
+    }
+    getFieldType() {
+        return this.csType;
+    }
+}
+exports.FieldInfo = FieldInfo;
+class ClassInfo {
+    name = "";
+    type = "class";
+    fields = [];
+    getFieldInfo(fieldName) {
+        return this.fields.find(field => field.csName == fieldName);
+    }
+}
+exports.ClassInfo = ClassInfo;
+class CSProtoParser {
+    typeMap = new Map();
+    parseProtoFile(filePath) {
+        let content = fs.readFileSync(filePath, "utf-8");
+        let curClass = null;
+        let codeLines = content.split("\n");
+        let messageRegex = /message (\w+)/;
+        let enumRegex = /enum (\w+)/;
+        let structEndRegex = /^\}/;
+        let fieldRegex = /(?:(repeated) )?(\w+) (\w+)\s*=\s*\d+;/;
+        let codeLinesLen = codeLines.length;
+        let isInClass = false;
+        for (let i = 0; i < codeLinesLen; i++) {
+            let line = codeLines[i];
+            if (!isInClass) {
+                // check enter class
+                while (true) {
+                    let m1 = line.match(messageRegex);
+                    if (m1) {
+                        let className = m1[1];
+                        curClass = new ClassInfo();
+                        console.log(`find class: ${className}`);
+                        curClass.name = className;
+                        curClass.type = "class";
+                        this.typeMap.set(className, curClass);
+                        isInClass = true;
+                        break;
+                    }
+                    let m2 = line.match(enumRegex);
+                    if (m2) {
+                        let enumName = m2[1];
+                        curClass = new ClassInfo();
+                        curClass.name = enumName;
+                        curClass.type = "enum";
+                        this.typeMap.set(enumName, curClass);
+                        isInClass = true;
+                        break;
+                    }
+                    break;
+                }
+            }
+            else {
+                // check leave class
+                let m3 = line.match(structEndRegex);
+                if (m3) {
+                    curClass = null;
+                    isInClass = false;
+                }
+                else {
+                    // parse class fields
+                    let mField = line.match(fieldRegex);
+                    if (mField) {
+                        let isArray = mField[1] == "repeated";
+                        let fieldType = mField[2];
+                        let fieldName = mField[3];
+                        let field = new FieldInfo();
+                        field.setName(fieldName);
+                        field.setType(fieldType);
+                        field.isArray = isArray;
+                        curClass.fields.push(field);
+                        console.log(`find field: ${field.csName}, ${field.csType}, ${curClass.fields.length}`);
+                    }
+                }
+            }
+        }
+    }
+    getClassInfo(className) {
+        return this.typeMap.get(className);
+    }
+}
+exports.CSProtoParser = CSProtoParser;

package/dist/ExportCSPlugin.d.ts

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

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,EAAsE,MAAM,kBAAkB,CAAA;AAItK,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA0OpE;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,EAAE,iBAAiB,EAAmD,MAAM,kBAAkB,CAAA;AAMtK,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA6QpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAI3C,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}

package/dist/ExportCSPlugin.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportPlugin = exports.export_stuff = void 0;
 const export_table_lib_1 = require("export-table-lib");
 const CSParseTool_1 = require("./CSParseTool");
+const CSProtoParser_1 = require("./CSProtoParser");
+let protoParser = new CSProtoParser_1.CSProtoParser();
 function export_stuff(paras) {
-    let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, allTags, } = paras;
+    let { datas, fields, inject, name, objects, packagename, tables, table: { nameOrigin, }, xxtea, exportNamespace, moreOptions, allTags, } = paras;
     let isSkipExportDefaults = !!(moreOptions?.SkipDefaults ?? false);
     if (CSParseTool_1.isSkipExportDefaults0) {
         isSkipExportDefaults = true;
@@ -21,17 +23,51 @@ function export_stuff(paras) {
             customFields.push(f3);
         }
     }
+    let isValidField;
+    let getFieldType2;
+    let classNameOrigin = (0, CSParseTool_1.firstLetterUpper)(nameOrigin);
+    if (CSParseTool_1.isOverwriteWithProto) {
+        let classInfo = protoParser.getClassInfo(classNameOrigin);
+        if (classInfo != null) {
+            for (let f of classInfo.fields) {
+                console.log(`${f.csName}`);
+            }
+        }
+        isValidField = (f) => {
+            let fieldInfo = classInfo?.getFieldInfo(f.name);
+            console.log(`validf: ${f.name}, ${fieldInfo}`);
+            return fieldInfo == null;
+        };
+        getFieldType2 = (f) => {
+            let fieldInfo = classInfo?.getFieldInfo(f.name);
+            if (fieldInfo != null) {
+                let fieldName = fieldInfo.getFieldType();
+                return fieldName;
+            }
+            else {
+                return (0, CSParseTool_1.getFieldType)(f);
+            }
+        };
+    }
+    else {
+        isValidField = (f) => true;
+        getFieldType2 = CSParseTool_1.getFieldType;
+    }
+    let validFields = fields.filter(f => isValidField(f));
+    let mmpPrefix = CSParseTool_1.isOverwriteWithProto ? "[MemoryPackable]" : "";
+    let extendClass = CSParseTool_1.isOverwriteWithProto ? ` : ${classNameOrigin}` : "";
+    let usingProtoNamespace = CSParseTool_1.isOverwriteWithProto ? "\nusing DXTS.BattleProto;" : "";
     let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1;
     let mmpNamespace = isMMPEnabled ? CSParseTool_1.useMMPNamespace : "";
     let temp = `
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;${usingProtoNamespace}
 ${mmpNamespace}
 
 namespace ${exportNamespace}{
-[System.Serializable]
-public partial class ${RowClass} {
+[System.Serializable]${mmpPrefix}
+public partial class ${RowClass}${extendClass} {
 
 	public static List<${RowClass}> Configs = new List<${RowClass}>()
 	{
@@ -41,7 +77,7 @@ ${(0, export_table_lib_1.foreach)(datas, data => `		new ${RowClass}(${(0, export
 	};
 
 	public ${RowClass}() { }
-	public ${RowClass}(${(0, export_table_lib_1.st)(() => customFields.map(f => `${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.convVarName)(f.name)}`).join(", "))})
+	public ${RowClass}(${(0, export_table_lib_1.st)(() => customFields.map(f => `${getFieldType2(f)} ${(0, CSParseTool_1.convVarName)(f.name)}`).join(", "))})
 	{
 ${(0, export_table_lib_1.foreach)(customFields, f => `		this.${(0, CSParseTool_1.convMemberName)(f.name)} = ${(0, CSParseTool_1.convVarName)(f.name)};`)}
 	}
@@ -60,12 +96,12 @@ ${(0, export_table_lib_1.foreach)(customFields, f => `		this.${(0, CSParseTool_1
 	}
 
 	${(0, export_table_lib_1.cmm)( /**生成字段 */)}
-${(0, export_table_lib_1.foreach)(fields, f => `
+${(0, export_table_lib_1.foreach)(validFields, f => `
 	/// <summary>
 ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `	/// ${line}`)}
 	/// </summary>
 	${(0, CSParseTool_1.getFieldAnnotation)(f)}
-	public ${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.convMemberName)(f.name)};
+	public ${getFieldType2(f)} ${(0, CSParseTool_1.convMemberName)(f.name)};
 
 ${(0, export_table_lib_1.iff)(f.rawType.startsWith("@"), () => `
 	/// <summary>
@@ -78,7 +114,7 @@ ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `
 #region get字段
 ${(0, export_table_lib_1.foreach)(fields, f => {
         if (f.nameOrigin != f.name) {
-            return `	public ${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.getTitle)(f).replace(" ", "_")} => ${(0, CSParseTool_1.convMemberName)(f.name)};`;
+            return `	public ${getFieldType2(f)} ${(0, CSParseTool_1.getTitle)(f).replace(" ", "_")} => ${(0, CSParseTool_1.convMemberName)(f.name)};`;
         }
         else {
             return "";
@@ -92,7 +128,7 @@ ${(0, export_table_lib_1.foreach)(fields, f => {
             let memberName = (0, CSParseTool_1.convMemberName)(f.name);
             let paraName = (0, CSParseTool_1.convVarName)(memberName);
             let tempDictByMemberName = `TempDictBy${memberName}`;
-            let memberType = (0, CSParseTool_1.getFieldType)(f);
+            let memberType = getFieldType2(f);
             return `
 		protected static Dictionary<${memberType}, ${RowClass}> ${tempDictByMemberName};
 		public static ${RowClass} GetConfigBy${memberName}(${memberType} ${paraName})
@@ -120,7 +156,7 @@ ${(0, export_table_lib_1.foreach)(fields, f => {
             let memberName = (0, CSParseTool_1.convMemberName)(f.name);
             let paraName = (0, CSParseTool_1.convVarName)(memberName);
             let tempRecordsDictByMemberName = `TempRecordsDictBy${memberName}`;
-            let memberType = (0, CSParseTool_1.getFieldType)(f);
+            let memberType = getFieldType2(f);
             return `
 		protected static Dictionary<${memberType}, ${RowClass}[]> ${tempRecordsDictByMemberName};
 		public static ${RowClass}[] GetConfigsBy${memberName}(${memberType} ${paraName})
@@ -213,6 +249,10 @@ exports.export_stuff = export_stuff;
 class ExportPlugin extends export_table_lib_1.PluginBase {
     name = "csharp";
     tags = ["cs"];
+    handleBatch(paras) {
+        console.log(`try parse proto: ${CSParseTool_1.overwriteWithProtoPath}`);
+        protoParser.parseProtoFile(CSParseTool_1.overwriteWithProtoPath);
+    }
     handleSheet(paras) {
         let content = export_stuff(paras);
         if (content != null) {

package/dist/index.d.ts

@@ -3,5 +3,5 @@ import { ExportLiteDBCSPlugin } from "./ExportLiteDBCSPlugin";
 import { ExportLiteDBUJsonPlugin } from "./ExportLiteDBUnityCSJsonPlugin";
 import { ExportUJsonPlugin } from "./ExportUnityCSJsonPlugin";
 import { ExportUnityMMPPlugin } from "./ExportUnityMMPPlugin";
-export declare const ExportPlugins: (ExportCSPlugin | ExportLiteDBCSPlugin | ExportUJsonPlugin | ExportLiteDBUJsonPlugin | ExportUnityMMPPlugin)[];
+export declare const ExportPlugins: (ExportCSPlugin | ExportUJsonPlugin | ExportLiteDBCSPlugin | ExportLiteDBUJsonPlugin | ExportUnityMMPPlugin)[];
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-pulgin-csharp",
-  "version": "1.1.164",
+  "version": "1.1.165",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {},
@@ -13,7 +13,7 @@
   "dependencies": {
     "@types/commander": "2.12.2",
     "@types/node": "^17.0.18",
-    "export-table-lib": "^1.0.67",
+    "export-table-lib": "^1.0.68",
     "fs": "^0.0.1-security",
     "fs-extra": "^10.0.0",
     "fse": "^4.0.1"

package/src/CSParseTool.ts

@@ -197,6 +197,9 @@ export function ConvValue2Literal(value: any, t: FieldType, f: Field): string {
 }
 
 export let isSkipExportDefaults0 = process.argv.findIndex(v => v == "--SkipDefaults") >= 0
+let withProtoIndex = process.argv.findIndex(v => v == "--WithProto")
+export let isOverwriteWithProto = withProtoIndex >= 0
+export let overwriteWithProtoPath = isOverwriteWithProto ? process.argv[withProtoIndex + 1] : ""
 
 export let firstLetterUpper = function (str: string) {
 	return str.charAt(0).toUpperCase() + str.slice(1);

package/src/CSProtoParser.ts

@@ -0,0 +1,120 @@
+import * as fs from 'fs-extra';
+import { firstLetterLower } from './CSParseTool';
+
+let fieldTypeMap: { [key: string]: string } = {
+    ["float"]: "float",
+    ["double"]: "double",
+    ["int32"]: "int",
+    ["bool"]: "bool",
+    ["bytes"]: "byte[]",
+}
+export class FieldInfo {
+    name: string = ""
+    isArray: boolean = false
+    type: string = ""
+    csName: string = ""
+    csType: string = ""
+
+    setName(n: string) {
+        this.name = n
+
+        this.csName = firstLetterLower(this.name.split("_")
+            .map(t => t.slice(0, 1).toUpperCase() + t.slice(1))
+            .join(""))
+    }
+    setType(t: string) {
+        this.type = t;
+
+        let internalType = fieldTypeMap[this.type]
+        if (internalType != undefined) {
+            this.csType = internalType
+        } else {
+            this.csType = t
+        }
+    }
+
+    getFieldType() {
+        return this.csType
+    }
+}
+
+export class ClassInfo {
+    name: string = ""
+    type: "class" | "enum" = "class"
+    fields: FieldInfo[] = []
+
+    getFieldInfo(fieldName: string) {
+        return this.fields.find(field => field.csName == fieldName)
+    }
+
+}
+
+export class CSProtoParser {
+    typeMap: Map<string, ClassInfo> = new Map();
+    parseProtoFile(filePath: string) {
+        let content = fs.readFileSync(filePath, "utf-8");
+        let curClass: ClassInfo | null = null
+        let codeLines = content.split("\n")
+        let messageRegex = /message (\w+)/
+        let enumRegex = /enum (\w+)/
+        let structEndRegex = /^\}/
+        let fieldRegex = /(?:(repeated) )?(\w+) (\w+)\s*=\s*\d+;/
+        let codeLinesLen = codeLines.length
+        let isInClass = false;
+        for (let i = 0; i < codeLinesLen; i++) {
+            let line = codeLines[i]
+            if (!isInClass) {
+                // check enter class
+                while (true) {
+                    let m1 = line.match(messageRegex)
+                    if (m1) {
+                        let className = m1[1]
+                        curClass = new ClassInfo()
+                        console.log(`find class: ${className}`)
+                        curClass.name = className
+                        curClass.type = "class"
+                        this.typeMap.set(className, curClass)
+                        isInClass = true
+                        break
+                    }
+                    let m2 = line.match(enumRegex)
+                    if (m2) {
+                        let enumName = m2[1]
+                        curClass = new ClassInfo()
+                        curClass.name = enumName
+                        curClass.type = "enum"
+                        this.typeMap.set(enumName, curClass)
+                        isInClass = true
+                        break
+                    }
+                    break
+                }
+            } else {
+                // check leave class
+                let m3 = line.match(structEndRegex)
+                if (m3) {
+                    curClass = null
+                    isInClass = false;
+                } else {
+                    // parse class fields
+                    let mField = line.match(fieldRegex)
+                    if (mField) {
+                        let isArray = mField[1] == "repeated"
+                        let fieldType = mField[2]
+                        let fieldName = mField[3]
+                        let field = new FieldInfo()
+                        field.setName(fieldName)
+                        field.setType(fieldType)
+                        field.isArray = isArray
+                        curClass!.fields.push(field)
+                        console.log(`find field: ${field.csName}, ${field.csType}, ${curClass!.fields.length}`)
+                    }
+                }
+            }
+        }
+    }
+
+    getClassInfo(className: string) {
+        return this.typeMap.get(className)
+    }
+}

package/src/ExportCSPlugin.ts

@@ -1,7 +1,9 @@
 
 import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, iff, FieldType, makeFirstLetterLower, DataTable } from "export-table-lib"
-import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isSkipExportDefaults0, outputFileSync, useMMPNamespace } from "./CSParseTool"
+import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isOverwriteWithProto, isSkipExportDefaults0, outputFileSync, overwriteWithProtoPath, useMMPNamespace } from './CSParseTool';
 import * as fs from "fs-extra"
+import { CSProtoParser } from "./CSProtoParser";
+let protoParser = new CSProtoParser()
 
 export function export_stuff(paras: HandleSheetParams): string | null {
 	let {
@@ -12,6 +14,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		objects,
 		packagename,
 		tables,
+		table: { nameOrigin, },
 		xxtea,
 		exportNamespace,
 		moreOptions,
@@ -37,18 +40,52 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		}
 	}
 
+
+	let isValidField: (f: Field) => boolean
+	let getFieldType2: (f: Field) => string
+	let classNameOrigin = firstLetterUpper(nameOrigin)
+	if (isOverwriteWithProto) {
+		let classInfo = protoParser.getClassInfo(classNameOrigin)
+		if (classInfo != null) {
+			for (let f of classInfo.fields) {
+				console.log(`${f.csName}`)
+			}
+		}
+		isValidField = (f: Field) => {
+			let fieldInfo = classInfo?.getFieldInfo(f.name)
+			console.log(`validf: ${f.name}, ${fieldInfo}`)
+			return fieldInfo == null
+		}
+		getFieldType2 = (f: Field) => {
+			let fieldInfo = classInfo?.getFieldInfo(f.name)
+			if (fieldInfo != null) {
+				let fieldName = fieldInfo.getFieldType()
+				return fieldName
+			} else {
+				return getFieldType(f);
+			}
+		}
+	} else {
+		isValidField = (f: Field) => true;
+		getFieldType2 = getFieldType
+	}
+	let validFields = fields.filter(f => isValidField(f))
+	let mmpPrefix = isOverwriteWithProto ? "[MemoryPackable]" : ""
+	let extendClass = isOverwriteWithProto ? ` : ${classNameOrigin}` : ""
+	let usingProtoNamespace = isOverwriteWithProto ? "\nusing DXTS.BattleProto;" : ""
+
 	let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1
 	let mmpNamespace = isMMPEnabled ? useMMPNamespace : ""
 
 	let temp = `
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;${usingProtoNamespace}
 ${mmpNamespace}
 
 namespace ${exportNamespace}{
-[System.Serializable]
-public partial class ${RowClass} {
+[System.Serializable]${mmpPrefix}
+public partial class ${RowClass}${extendClass} {
 
 	public static List<${RowClass}> Configs = new List<${RowClass}>()
 	{
@@ -60,7 +97,7 @@ ${foreach(datas, data =>
 	};
 
 	public ${RowClass}() { }
-	public ${RowClass}(${st(() => customFields.map(f => `${getFieldType(f)} ${convVarName(f.name)}`).join(", "))})
+	public ${RowClass}(${st(() => customFields.map(f => `${getFieldType2(f)} ${convVarName(f.name)}`).join(", "))})
 	{
 ${foreach(customFields, f =>
 		`		this.${convMemberName(f.name)} = ${convVarName(f.name)};`
@@ -83,14 +120,14 @@ ${foreach(customFields, f =>
 	}
 
 	${cmm(/**生成字段 */)}
-${foreach(fields, f => `
+${foreach(validFields, f => `
 	/// <summary>
 ${foreach(getDescripts(f), line =>
 		`	/// ${line}`
 	)}
 	/// </summary>
 	${getFieldAnnotation(f)}
-	public ${getFieldType(f)} ${convMemberName(f.name)};
+	public ${getFieldType2(f)} ${convMemberName(f.name)};
 
 ${iff(f.rawType.startsWith("@"), () => `
 	/// <summary>
@@ -106,7 +143,7 @@ ${foreach(getDescripts(f), line =>
 #region get字段
 ${foreach(fields, f => {
 		if (f.nameOrigin != f.name) {
-			return `	public ${getFieldType(f)} ${getTitle(f).replace(" ", "_")} => ${convMemberName(f.name)};`
+			return `	public ${getFieldType2(f)} ${getTitle(f).replace(" ", "_")} => ${convMemberName(f.name)};`
 		} else {
 			return ""
 		}
@@ -120,7 +157,7 @@ ${foreach(fields, f => {
 			let memberName = convMemberName(f.name);
 			let paraName = convVarName(memberName);
 			let tempDictByMemberName = `TempDictBy${memberName}`;
-			let memberType = getFieldType(f);
+			let memberType = getFieldType2(f);
 			return `
 		protected static Dictionary<${memberType}, ${RowClass}> ${tempDictByMemberName};
 		public static ${RowClass} GetConfigBy${memberName}(${memberType} ${paraName})
@@ -147,7 +184,7 @@ ${foreach(fields, f => {
 			let memberName = convMemberName(f.name);
 			let paraName = convVarName(memberName);
 			let tempRecordsDictByMemberName = `TempRecordsDictBy${memberName}`;
-			let memberType = getFieldType(f);
+			let memberType = getFieldType2(f);
 			return `
 		protected static Dictionary<${memberType}, ${RowClass}[]> ${tempRecordsDictByMemberName};
 		public static ${RowClass}[] GetConfigsBy${memberName}(${memberType} ${paraName})
@@ -243,6 +280,10 @@ export class ExportPlugin extends PluginBase {
 	name = "csharp"
 	tags: string[] = ["cs"]
 
+	handleBatch(paras: HandleBatchParams): void {
+		console.log(`try parse proto: ${overwriteWithProtoPath}`)
+		protoParser.parseProtoFile(overwriteWithProtoPath)
+	}
 	handleSheet(paras: HandleSheetParams) {
 		let content = export_stuff(paras)
 		if (content != null) {

package/test/testCSWithProto.bat

@@ -0,0 +1 @@
+node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:cs --libs E:\DATA\Projects\netease\quicktable --WithProto src/wasmproto.proto --scenes client %*