export-table-pulgin-csharp 1.1.155 → 1.1.158

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.
Files changed (5) hide show
  1. package/dist/ExportUnityCSJsonPlugin.d.ts.map +1 -1
  2. package/dist/ExportUnityCSJsonPlugin.js +7 -2
  3. package/package.json +2 -2
  4. package/src/ExportUnityCSJsonPlugin.ts +9 -3
  5. package/test/testUJson.bat +2 -1
package/dist/ExportUnityCSJsonPlugin.d.ts.map CHANGED
@@ -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;AAOxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA0GzE;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"}
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;AAQxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2GzE;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"}
package/dist/ExportUnityCSJsonPlugin.js CHANGED
@@ -28,6 +28,7 @@ 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 isWrapObject = process.argv.findIndex(v => v == "--WrapObject") >= 0;
31
32
  let firstLetterUpper = export_table_lib_1.makeFirstLetterUpper;
32
33
  function exportUJson(paras) {
33
34
  let { datas, fields, name, objects, table, } = paras;
@@ -59,6 +60,9 @@ function exportUJson(paras) {
59
60
  // })
60
61
  return newObj;
61
62
  }));
63
+ if (isWrapObject) {
64
+ jsonString = `{"A":${jsonString}}`;
65
+ }
62
66
  return jsonString;
63
67
  // // !!!必须开头没有空格
64
68
  // let temp = `%YAML 1.1
@@ -85,7 +89,7 @@ function exportUJsonLoader(paras) {
85
89
  let useJsonToolNamesapce = (0, CSParseTool_1.GetUsingJsonToolNamespace)();
86
90
  let RowClass = firstLetterUpper(name);
87
91
  let fullName = `${table.workbookName}-${name}`;
88
- let isMMP = allTags.indexOf('csharp:mmp') != -1;
92
+ let isMMP = CSParseTool_1.isEnableMMP || allTags.indexOf('csharp:mmp') != -1;
89
93
  let fileExt = isMMP ? ".bytes" : ".json";
90
94
  // !!!必须开头没有空格
91
95
  let temp = `
@@ -155,7 +159,8 @@ namespace ${exportNamespace}
155
159
  };
156
160
  try
157
161
  {
158
- JsonUtility.FromJsonOverwrite("{\\"a\\":"+configJson+"}", obj);
162
+ // JsonUtility.FromJsonOverwrite("{\\"a\\":"+configJson+"}", obj);
163
+ ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
159
164
  }
160
165
  catch(System.Exception ex)
161
166
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "export-table-pulgin-csharp",
3
- "version": "1.1.155",
3
+ "version": "1.1.158",
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.65",
16
+ "export-table-lib": "^1.0.66",
17
17
  "fs": "^0.0.1-security",
18
18
  "fs-extra": "^10.0.0",
19
19
  "fse": "^4.0.1"
package/src/ExportUnityCSJsonPlugin.ts CHANGED
@@ -1,9 +1,10 @@
1
1
 
2
2
  import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath, makeFirstLetterUpper } from "export-table-lib"
3
3
  import * as fs from "fs-extra"
4
- import { GetUsingJsonToolNamespace, TryConvValue, convMemberName, genTupleArrayValue } from "./CSParseTool";
4
+ import { GetUsingJsonToolNamespace, TryConvValue, convMemberName, genTupleArrayValue, isEnableMMP } from "./CSParseTool";
5
5
 
6
6
  var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0
7
+ var isWrapObject = process.argv.findIndex(v => v == "--WrapObject") >= 0
7
8
 
8
9
  let firstLetterUpper = makeFirstLetterUpper;
9
10
  export function exportUJson(paras: HandleSheetParams): string | null {
@@ -44,6 +45,10 @@ export function exportUJson(paras: HandleSheetParams): string | null {
44
45
  return newObj
45
46
  }));
46
47
 
48
+ if(isWrapObject){
49
+ jsonString = `{"A":${jsonString}}`
50
+ }
51
+
47
52
  return jsonString;
48
53
 
49
54
  // // !!!必须开头没有空格
@@ -83,7 +88,7 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
83
88
  let RowClass = firstLetterUpper(name)
84
89
  let fullName = `${table.workbookName}-${name}`
85
90
 
86
- let isMMP = allTags.indexOf('csharp:mmp') != -1
91
+ let isMMP = isEnableMMP || allTags.indexOf('csharp:mmp') != -1
87
92
  let fileExt = isMMP ? ".bytes" : ".json"
88
93
 
89
94
  // !!!必须开头没有空格
@@ -154,7 +159,8 @@ namespace ${exportNamespace}
154
159
  };
155
160
  try
156
161
  {
157
- JsonUtility.FromJsonOverwrite("{\\"a\\":"+configJson+"}", obj);
162
+ // JsonUtility.FromJsonOverwrite("{\\"a\\":"+configJson+"}", obj);
163
+ ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
158
164
  }
159
165
  catch(System.Exception ex)
160
166
  {
package/test/testUJson.bat CHANGED
@@ -1 +1,2 @@
1
- node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:ujson;csharp:mmp;csharp:cs --libs E:\DATA\Projects\netease\quicktable %*
1
+ node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:mmp;csharp:cs --libs E:\DATA\Projects\netease\quicktable %*
2
+ node E:\DATA\Projects\netease\quicktable\export-table\dist\launch.js export src dist --tags csharp:ujson --EnableMMPB --libs E:\DATA\Projects\netease\quicktable %*