export-table-pulgin-csharp 1.1.151 → 1.1.153
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CSParseTool.d.ts +2 -0
- package/dist/CSParseTool.d.ts.map +1 -1
- package/dist/CSParseTool.js +3 -1
- package/dist/ExportCSPlugin.d.ts.map +1 -1
- package/dist/ExportCSPlugin.js +4 -1
- package/dist/ExportLiteDBUnityCSJsonPlugin.d.ts.map +1 -1
- package/dist/ExportUnityCSJsonPlugin.d.ts.map +1 -1
- package/dist/ExportUnityCSJsonPlugin.js +4 -10
- package/dist/ExportUnityMMPPlugin.js +2 -2
- package/package.json +2 -2
- package/src/CSParseTool.ts +4 -1
- package/src/ExportCSPlugin.ts +6 -1
- package/src/ExportLiteDBUnityCSJsonPlugin.ts +0 -1
- package/src/ExportUnityCSJsonPlugin.ts +4 -10
- package/src/ExportUnityMMPPlugin.ts +3 -3
package/dist/CSParseTool.d.ts
CHANGED
|
@@ -28,4 +28,6 @@ export declare const getDescripts: (v: Field) => string[];
|
|
|
28
28
|
export declare const convTupleArrayType: (f: Field) => Field | undefined;
|
|
29
29
|
export declare const convTupleArrayTypeDefine: (f: Field) => string;
|
|
30
30
|
export declare function GetUsingJsonToolNamespace(): string;
|
|
31
|
+
export declare let isEnableMMP: boolean;
|
|
32
|
+
export declare let useMMPNamespace: string;
|
|
31
33
|
//# sourceMappingURL=CSParseTool.d.ts.map
|
|
@@ -1 +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;AAEtK,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"}
|
|
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;AAEtK,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"}
|
package/dist/CSParseTool.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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;
|
|
3
|
+
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;
|
|
4
4
|
const export_table_lib_1 = require("export-table-lib");
|
|
5
5
|
function TryConvValue(value, t, f) {
|
|
6
6
|
try {
|
|
@@ -479,3 +479,5 @@ function GetUsingJsonToolNamespace() {
|
|
|
479
479
|
return useJsonToolNamesapce;
|
|
480
480
|
}
|
|
481
481
|
exports.GetUsingJsonToolNamespace = GetUsingJsonToolNamespace;
|
|
482
|
+
exports.isEnableMMP = process.argv.findIndex(v => v == "--EnableMMPB") >= 0;
|
|
483
|
+
exports.useMMPNamespace = "using LoadTableMMP.Runtime;";
|
|
@@ -1 +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,
|
|
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"}
|
package/dist/ExportCSPlugin.js
CHANGED
|
@@ -28,7 +28,7 @@ const export_table_lib_1 = require("export-table-lib");
|
|
|
28
28
|
const CSParseTool_1 = require("./CSParseTool");
|
|
29
29
|
const fs = __importStar(require("fs-extra"));
|
|
30
30
|
function export_stuff(paras) {
|
|
31
|
-
let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, } = paras;
|
|
31
|
+
let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, allTags, } = paras;
|
|
32
32
|
let isSkipExportDefaults = !!(moreOptions?.SkipDefaults ?? false);
|
|
33
33
|
if (CSParseTool_1.isSkipExportDefaults0) {
|
|
34
34
|
isSkipExportDefaults = true;
|
|
@@ -45,10 +45,13 @@ function export_stuff(paras) {
|
|
|
45
45
|
customFields.push(f3);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
+
let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1;
|
|
49
|
+
let mmpNamespace = isMMPEnabled ? CSParseTool_1.useMMPNamespace : "";
|
|
48
50
|
let temp = `
|
|
49
51
|
using System.Collections.Generic;
|
|
50
52
|
using System.Linq;
|
|
51
53
|
using System.Runtime.InteropServices;
|
|
54
|
+
${mmpNamespace}
|
|
52
55
|
|
|
53
56
|
namespace ${exportNamespace}{
|
|
54
57
|
[System.Serializable]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExportLiteDBUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportLiteDBUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ExportLiteDBUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportLiteDBUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AASxJ,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAiDzE;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,iBAczD;AACD,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAmB5E;AAED,qBAAa,uBAAwB,SAAQ,UAAU;IACtD,IAAI,SAAgB;IACpB,IAAI,EAAE,MAAM,EAAE,CAAkB;IAEhC,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAoB9B,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAqD1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;AAOxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqGzE;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;CA4C3C"}
|
|
@@ -28,7 +28,6 @@ const export_table_lib_1 = require("export-table-lib");
|
|
|
28
28
|
const fs = __importStar(require("fs-extra"));
|
|
29
29
|
const CSParseTool_1 = require("./CSParseTool");
|
|
30
30
|
var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0;
|
|
31
|
-
var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0;
|
|
32
31
|
let firstLetterUpper = export_table_lib_1.makeFirstLetterUpper;
|
|
33
32
|
function exportUJson(paras) {
|
|
34
33
|
let { datas, fields, name, objects, table, } = paras;
|
|
@@ -86,7 +85,6 @@ function exportUJsonLoader(paras) {
|
|
|
86
85
|
let useJsonToolNamesapce = (0, CSParseTool_1.GetUsingJsonToolNamespace)();
|
|
87
86
|
let RowClass = firstLetterUpper(name);
|
|
88
87
|
var fullName = `${table.workbookName}-${name}`;
|
|
89
|
-
var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "";
|
|
90
88
|
// !!!必须开头没有空格
|
|
91
89
|
let temp = `
|
|
92
90
|
using System.Collections.Generic;
|
|
@@ -96,7 +94,6 @@ ${useJsonToolNamesapce}
|
|
|
96
94
|
|
|
97
95
|
namespace ${exportNamespace}
|
|
98
96
|
{
|
|
99
|
-
${mmpMark}
|
|
100
97
|
public partial class ${RowClass}
|
|
101
98
|
{
|
|
102
99
|
#if UNITY_EDITOR && ENABLE_CONFIG_LOG
|
|
@@ -116,17 +113,14 @@ namespace ${exportNamespace}
|
|
|
116
113
|
public static async Task Load()
|
|
117
114
|
{
|
|
118
115
|
var loadUrl = LoadUrl;
|
|
119
|
-
var
|
|
120
|
-
if (
|
|
116
|
+
var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
|
|
117
|
+
if (configLiteral != null)
|
|
121
118
|
{
|
|
122
119
|
Debug.Log($"解析配表: {loadUrl}");
|
|
123
|
-
var obj = new TempA()
|
|
124
|
-
{
|
|
125
|
-
a=${RowClass}.Configs,
|
|
126
|
-
};
|
|
127
120
|
try
|
|
128
121
|
{
|
|
129
|
-
JsonUtility.FromJsonOverwrite("{\\"a\\":"+
|
|
122
|
+
// JsonUtility.FromJsonOverwrite("{\\"a\\":"+configLiteral+"}", obj);
|
|
123
|
+
ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
|
|
130
124
|
}
|
|
131
125
|
catch(System.Exception ex)
|
|
132
126
|
{
|
|
@@ -33,13 +33,13 @@ function exportMMP(paras) {
|
|
|
33
33
|
let { datas, fields, name, objects, table, exportNamespace, } = paras;
|
|
34
34
|
let RowClass = firstLetterUpper(name);
|
|
35
35
|
var fullName = `${table.workbookName}-${name}`;
|
|
36
|
-
var mmpMark =
|
|
36
|
+
var mmpMark = "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
|
|
37
37
|
// TODO: 支持FK类型
|
|
38
38
|
let temp = `
|
|
39
39
|
using System;
|
|
40
40
|
using System.Collections.Generic;
|
|
41
41
|
using System.Runtime.InteropServices;
|
|
42
|
-
|
|
42
|
+
${CSParseTool_1.useMMPNamespace}
|
|
43
43
|
|
|
44
44
|
namespace ${exportNamespace}
|
|
45
45
|
{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "export-table-pulgin-csharp",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.153",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"scripts": {},
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"@types/commander": "2.12.2",
|
|
15
15
|
"@types/node": "^17.0.18",
|
|
16
|
-
"export-table-lib": "^1.0.
|
|
16
|
+
"export-table-lib": "^1.0.65",
|
|
17
17
|
"fs": "^0.0.1-security",
|
|
18
18
|
"fs-extra": "^10.0.0",
|
|
19
19
|
"fse": "^4.0.1"
|
package/src/CSParseTool.ts
CHANGED
|
@@ -403,4 +403,7 @@ export function GetUsingJsonToolNamespace() {
|
|
|
403
403
|
}
|
|
404
404
|
let useJsonToolNamesapce = jsonToolNamespace != null ? `using ${jsonToolNamespace};` : ``
|
|
405
405
|
return useJsonToolNamesapce
|
|
406
|
-
}
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
export let isEnableMMP = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
|
|
409
|
+
export let useMMPNamespace = "using LoadTableMMP.Runtime;"
|
package/src/ExportCSPlugin.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, iff, FieldType, makeFirstLetterLower, DataTable } from "export-table-lib"
|
|
3
|
-
import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isSkipExportDefaults0 } from "./CSParseTool"
|
|
3
|
+
import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isSkipExportDefaults0, useMMPNamespace } from "./CSParseTool"
|
|
4
4
|
import * as fs from "fs-extra"
|
|
5
5
|
|
|
6
6
|
export function export_stuff(paras: HandleSheetParams): string | null {
|
|
@@ -15,6 +15,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
|
|
|
15
15
|
xxtea,
|
|
16
16
|
exportNamespace,
|
|
17
17
|
moreOptions,
|
|
18
|
+
allTags,
|
|
18
19
|
} = paras;
|
|
19
20
|
|
|
20
21
|
let isSkipExportDefaults = !!(moreOptions?.SkipDefaults ?? false)
|
|
@@ -36,10 +37,14 @@ export function export_stuff(paras: HandleSheetParams): string | null {
|
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
39
|
|
|
40
|
+
let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1
|
|
41
|
+
let mmpNamespace = isMMPEnabled ? useMMPNamespace : ""
|
|
42
|
+
|
|
39
43
|
let temp = `
|
|
40
44
|
using System.Collections.Generic;
|
|
41
45
|
using System.Linq;
|
|
42
46
|
using System.Runtime.InteropServices;
|
|
47
|
+
${mmpNamespace}
|
|
43
48
|
|
|
44
49
|
namespace ${exportNamespace}{
|
|
45
50
|
[System.Serializable]
|
|
@@ -4,7 +4,6 @@ import * as fs from "fs-extra"
|
|
|
4
4
|
import { GetUsingJsonToolNamespace, TryConvValue, convMemberName, firstLetterUpper } from "./CSParseTool";
|
|
5
5
|
import path from "path";
|
|
6
6
|
import * as cp from "child_process"
|
|
7
|
-
import program from "commander"
|
|
8
7
|
import { exportUJson } from "./ExportUnityCSJsonPlugin";
|
|
9
8
|
|
|
10
9
|
var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0
|
|
@@ -4,7 +4,6 @@ import * as fs from "fs-extra"
|
|
|
4
4
|
import { GetUsingJsonToolNamespace, TryConvValue, convMemberName, genTupleArrayValue } from "./CSParseTool";
|
|
5
5
|
|
|
6
6
|
var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0
|
|
7
|
-
var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
|
|
8
7
|
|
|
9
8
|
let firstLetterUpper = makeFirstLetterUpper;
|
|
10
9
|
export function exportUJson(paras: HandleSheetParams): string | null {
|
|
@@ -82,7 +81,6 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
|
|
|
82
81
|
|
|
83
82
|
let RowClass = firstLetterUpper(name)
|
|
84
83
|
var fullName = `${table.workbookName}-${name}`
|
|
85
|
-
var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "";
|
|
86
84
|
// !!!必须开头没有空格
|
|
87
85
|
let temp = `
|
|
88
86
|
using System.Collections.Generic;
|
|
@@ -92,7 +90,6 @@ ${useJsonToolNamesapce}
|
|
|
92
90
|
|
|
93
91
|
namespace ${exportNamespace}
|
|
94
92
|
{
|
|
95
|
-
${mmpMark}
|
|
96
93
|
public partial class ${RowClass}
|
|
97
94
|
{
|
|
98
95
|
#if UNITY_EDITOR && ENABLE_CONFIG_LOG
|
|
@@ -112,17 +109,14 @@ namespace ${exportNamespace}
|
|
|
112
109
|
public static async Task Load()
|
|
113
110
|
{
|
|
114
111
|
var loadUrl = LoadUrl;
|
|
115
|
-
var
|
|
116
|
-
if (
|
|
112
|
+
var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
|
|
113
|
+
if (configLiteral != null)
|
|
117
114
|
{
|
|
118
115
|
Debug.Log($"解析配表: {loadUrl}");
|
|
119
|
-
var obj = new TempA()
|
|
120
|
-
{
|
|
121
|
-
a=${RowClass}.Configs,
|
|
122
|
-
};
|
|
123
116
|
try
|
|
124
117
|
{
|
|
125
|
-
JsonUtility.FromJsonOverwrite("{\\"a\\":"+
|
|
118
|
+
// JsonUtility.FromJsonOverwrite("{\\"a\\":"+configLiteral+"}", obj);
|
|
119
|
+
ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
|
|
126
120
|
}
|
|
127
121
|
catch(System.Exception ex)
|
|
128
122
|
{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath, makeFirstLetterUpper, iff } from "export-table-lib"
|
|
3
3
|
import * as fs from "fs-extra"
|
|
4
|
-
import { convMemberName, convVarName, getFieldElementType, getFieldType, isTypeArray } from "./CSParseTool";
|
|
4
|
+
import { convMemberName, convVarName, getFieldElementType, getFieldType, isTypeArray, useMMPNamespace } from "./CSParseTool";
|
|
5
5
|
|
|
6
6
|
var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
|
|
7
7
|
|
|
@@ -19,13 +19,13 @@ export function exportMMP(paras: HandleSheetParams): string | null {
|
|
|
19
19
|
|
|
20
20
|
let RowClass = firstLetterUpper(name)
|
|
21
21
|
var fullName = `${table.workbookName}-${name}`
|
|
22
|
-
var mmpMark =
|
|
22
|
+
var mmpMark = "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
|
|
23
23
|
// TODO: 支持FK类型
|
|
24
24
|
let temp = `
|
|
25
25
|
using System;
|
|
26
26
|
using System.Collections.Generic;
|
|
27
27
|
using System.Runtime.InteropServices;
|
|
28
|
-
|
|
28
|
+
${useMMPNamespace}
|
|
29
29
|
|
|
30
30
|
namespace ${exportNamespace}
|
|
31
31
|
{
|