export-table-pulgin-csharp 1.1.82 → 1.1.84

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,EAAqC,MAAM,kBAAkB,CAAA;AAMxJ,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;CAgC3C"}
+{"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;AAMxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+CnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuFzE;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;CAmC3C"}

package/dist/ExportUnityCSJsonPlugin.js

@@ -67,7 +67,12 @@ function exportUJson(paras) {
 }
 exports.exportUJson = exportUJson;
 function exportUJsonLoader(paras) {
-    let { datas, fields, name, objects, table, } = paras;
+    let { datas, fields, name, objects, table, exportNamespace, } = paras;
+    let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--JsonToolNamespace");
+    let jsonToolNamespace = "lang.json";
+    if (jsonToolNamespaceIndex >= 0 && process.argv.length > jsonToolNamespaceIndex + 1) {
+        jsonToolNamespace = process.argv[jsonToolNamespaceIndex + 1];
+    }
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
     // !!!必须开头没有空格
@@ -75,9 +80,9 @@ function exportUJsonLoader(paras) {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using lang.json;
+using ${jsonToolNamespace};
 
-namespace MEEC.ExportedConfigs
+namespace ${exportNamespace}
 {
 	public partial class ${RowClass}
 	{
@@ -166,7 +171,7 @@ class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
     }
     handleBatch(paras) {
         var _a;
-        let moreOptions = paras.moreOptions;
+        let { moreOptions, tables, exportNamespace, } = paras;
         let isSkipIndexLoader = (_a = !!moreOptions.SkipIndexLoader) !== null && _a !== void 0 ? _a : false;
         if (isSkipIndexLoader0) {
             isSkipIndexLoader = true;
@@ -174,13 +179,12 @@ class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
         if (isSkipIndexLoader) {
             return;
         }
-        var tables = paras.tables;
         var temp = `
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace MEEC.ExportedConfigs
+namespace ${exportNamespace}
 {
 	public static class DefaultConfigLoader{
 		public static IEnumerable<Func<Task>> Load(){

package/package.json

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

package/src/ExportUnityCSJsonPlugin.ts

@@ -61,8 +61,15 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 		name,
 		objects,
 		table,
+		exportNamespace,
 	} = paras;
 
+	let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--JsonToolNamespace")
+	let jsonToolNamespace = "lang.json";
+	if(jsonToolNamespaceIndex>=0 && process.argv.length>jsonToolNamespaceIndex+1){
+		jsonToolNamespace = process.argv[jsonToolNamespaceIndex+1]
+	}
+
 	let RowClass = firstLetterUpper(name)
 	var fullName = `${table.workbookName}-${name}`
 	// !!!必须开头没有空格
@@ -70,9 +77,9 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using lang.json;
+using ${jsonToolNamespace};
 
-namespace MEEC.ExportedConfigs
+namespace ${exportNamespace}
 {
 	public partial class ${RowClass}
 	{
@@ -161,7 +168,11 @@ export class ExportUJsonPlugin extends PluginBase {
 
 	handleBatch(paras: HandleBatchParams): void {
 
-		let moreOptions = paras.moreOptions
+		let {
+			moreOptions,
+			tables,
+			exportNamespace,
+		} = paras
 		let isSkipIndexLoader = !!moreOptions.SkipIndexLoader ?? false
 		if (isSkipIndexLoader0) {
 			isSkipIndexLoader = true
@@ -170,13 +181,12 @@ export class ExportUJsonPlugin extends PluginBase {
 			return;
 		}
 
-		var tables = paras.tables;
 		var temp = `
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace MEEC.ExportedConfigs
+namespace ${exportNamespace}
 {
 	public static class DefaultConfigLoader{
 		public static IEnumerable<Func<Task>> Load(){

package/dist/ExportUnityCSJsonPluginV1.d.ts

@@ -1,8 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,149 +0,0 @@
-"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;