feat(editor): begin add editor ui

add all needed new actions, inputs;

add menu;

show initing... info;

Author: yyc-git

contributes/meta3d-action-mod-career-add-careerfeature/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-career-add-careerfeature",
-    "version": "1.3.14",
+    "version": "1.3.17",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-career-add-careerfeature-protocol"

contributes/meta3d-action-mod-career-add-careerfeature/src/Main.ts

@@ -2,6 +2,7 @@ import { state as meta3dState, getContribute as getContributeMeta3D, api } from
 import { actionContribute, service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
 import { actionName, characterType, state, uiData } from "meta3d-action-mod-career-add-careerfeature-protocol"
 import { eventName, inputData } from "meta3d-action-mod-career-add-careerfeature-protocol/src/EventType"
+import { actionName as infoActionName, state as infoState } from "meta3d-action-mod-career-info-protocol"
 import { careerFeatureName, getData } from "./CareerFeatureData"
 import { getRandomFloat, getRandomInteger, randomSelect, convertDecimalToPercent, getDecimal } from "./NumberUtils"
 
@@ -59,30 +60,46 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
     return {
         actionName: actionName,
         init: (meta3dState) => {
-            return _buildAllDefaultCareerFeatures(api).then(data => {
-                let allDefaultCareerFeatures = api.immutable.createListOfData(data)
-
-                return api.action.setActionState(meta3dState, actionName, {
-                    ...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
-                    allDefaultCareerFeatures: allDefaultCareerFeatures,
-                })
+            meta3dState = api.action.setActionState(meta3dState, infoActionName, {
+                ...api.nullable.getExn(api.action.getActionState<infoState>(meta3dState, infoActionName)),
+                info: api.nullable.return("加载中...")
             })
-                .then(meta3dState => {
-                    let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
 
-                    return new Promise((resolve, reject) => {
-                        resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState,) => {
-                            meta3dState = api.action.setActionState(meta3dState, actionName, {
-                                ...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
-                                isShowModal: true,
-                            })
+            setTimeout(() => {
+                let meta3dState = api.readState()
+
+                _buildAllDefaultCareerFeatures(api).then(data => {
+                    let allDefaultCareerFeatures = api.immutable.createListOfData(data)
 
-                            return Promise.resolve(meta3dState)
-                        }, (meta3dState) => {
-                            return Promise.resolve(meta3dState)
-                        }))
+                    return api.action.setActionState(meta3dState, actionName, {
+                        ...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
+                        allDefaultCareerFeatures: allDefaultCareerFeatures,
                     })
                 })
+                    .then(meta3dState => {
+                        return api.action.setActionState(meta3dState, infoActionName, {
+                            ...api.nullable.getExn(api.action.getActionState<infoState>(meta3dState, infoActionName)),
+                            info: api.nullable.getEmpty()
+                        })
+                    })
+                    .then(api.writeState)
+            }, 0)
+
+            let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
+
+            return new Promise((resolve, reject) => {
+                resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState,) => {
+                    meta3dState = api.action.setActionState(meta3dState, actionName, {
+                        ...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
+                        isShowModal: true,
+                    })
+
+                    return Promise.resolve(meta3dState)
+                }, (meta3dState) => {
+                    return Promise.resolve(meta3dState)
+                }))
+            })
+
         },
         handler: (meta3dState, uiData) => {
             return new Promise<meta3dState>((resolve, reject) => {

contributes/meta3d-action-mod-career-info/.gitignore

@@ -0,0 +1,33 @@
+.DS_Store
+.merlin
+.log
+.ninja_log
+.cmi
+.ast
+.cmt
+.bsdeps
+.compiler.log
+
+.idea/
+.vscode/
+jest_0/
+reference/
+node_modules/
+mine/
+dist/
+lib/bs/
+.bs.js
+.gen.tsx
+lib/js/
+lib/es6_global/
+
+coverage
+
+dist/
+
+npm-debug
+
+.bsb.lock
+
+yarn.lock
+

contributes/meta3d-action-mod-career-info/gulpfile.js

@@ -0,0 +1,48 @@
+var gulp = require("gulp");
+var path = require("path");
+var fs = require("fs");
+var publish = require("meta3d-tool-publish")
+var bundle = require("meta3d-tool-bundle-to-custom")
+var clipboard = require('clipboardy')
+
+gulp.task("publish_local_env_bundle", function (done) {
+    let filePath = "./src/Main.ts"
+
+    let bundleContent = bundle.bundle(
+        bundle.getLocalModulePath(
+            filePath
+        ),
+        fs.readFileSync(filePath, "utf-8")
+    )
+
+    let clipedBundleContent = `import { api } from "meta3d-type"
+import { service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
+    ` + bundleContent
+    clipedBundleContent = clipedBundleContent.replace(/getContribute\s\=\s\(api\)/g, "getContribute = (api:api)")
+
+    clipboard.default.writeSync(
+        clipedBundleContent
+    )
+
+
+
+    publish.publishBundledContribute(
+        "local",
+        path.join(__dirname, "package.json"),
+        bundleContent
+    ).then(() => {
+        done()
+    })
+});
+
+
+
+// gulp.task("publish_local_env", function (done) {
+//     publish.publishContribute(
+//         "local",
+//         path.join(__dirname, "package.json"),
+//         path.join(__dirname, "dist/static/js", "main.js")
+//     ).then(() => {
+//         done()
+//     })
+// });

contributes/meta3d-action-mod-career-info/package.json

@@ -0,0 +1,35 @@
+{
+    "name": "meta3d-action-mod-career-info",
+    "version": "1.3.1",
+    "publisher": "meta3d",
+    "repoLink": "",
+    "protocol": {
+        "name": "meta3d-action-mod-career-info-protocol"
+    },
+    "license": "MIT",
+    "scripts": {
+        "watch": "tsc -w -noEmit",
+        "webpack": "webpack --config webpack.config.js",
+        "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev",
+        "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env_bundle",
+        "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env_bundle"
+    },
+    "keywords": [],
+    "dependencies": {
+        "meta3d-action-mod-career-info-protocol": "^1.3.0",
+        "meta3d-editor-whole-protocol": "^1.3.0",
+        "meta3d-type": "^1.3.0"
+    },
+    "devDependencies": {
+        "clean-webpack-plugin": "^4.0.0",
+        "cross-env": "^7.0.3",
+        "cz-customizable": "^6.3.0",
+        "gulp": "^4.0.2",
+        "meta3d-tool-publish": "^1.3.0",
+        "source-map-loader": "^3.0.0",
+        "ts-loader": "^9.2.6",
+        "typescript": "^5.1.0",
+        "webpack": "^5.62.1",
+        "webpack-cli": "^4.9.1"
+    }
+}

contributes/meta3d-action-mod-career-info/src/Main.ts

@@ -0,0 +1,44 @@
+import { state as meta3dState, api, getContribute as getContributeMeta3D } from "meta3d-type"
+import { actionContribute, service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
+import { actionName, state, uiData } from "meta3d-action-mod-career-info-protocol"
+import { eventName, inputData } from "meta3d-action-mod-career-info-protocol/src/EventType"
+
+export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> = (api) => {
+    return {
+        actionName: actionName,
+        init: (meta3dState) => {
+            let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
+
+            return new Promise((resolve, reject) => {
+                resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, value) => {
+                    meta3dState = api.action.setActionState(meta3dState, actionName, {
+                        ...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
+                        info: value
+                    })
+
+                    return Promise.resolve(meta3dState)
+                }, (meta3dState) => {
+                    return Promise.resolve(meta3dState)
+                }))
+            })
+        },
+        handler: (meta3dState, uiData) => {
+            return new Promise<meta3dState>((resolve, reject) => {
+                let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
+
+                resolve(eventSourcingService.addEvent<inputData>(meta3dState, {
+                    name: eventName,
+                    isOnlyRead: true,
+                    inputData: [
+                        uiData
+                    ]
+                }))
+            })
+        },
+        createState: (meta3dState) => {
+            return {
+                info: api.nullable.getEmpty()
+            }
+        }
+    }
+}

contributes/meta3d-action-mod-career-info/tsconfig.json

@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+		"target": "ES6",
+		"module": "ES6",
+		"moduleResolution": "node",
+		"sourceMap": true,
+		"resolveJsonModule": true,
+		"esModuleInterop": true,
+		"jsx": "react",
+		// "noEmit": true,
+		// "noUnusedLocals": true,
+		// "noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"lib": [
+			"DOM",
+			"ESNext",
+		],
+		"types": [],
+		"strict": true
+	},
+	"include": [
+		"./src"
+	]
+}

contributes/meta3d-action-mod-career-info/webpack.config.js

@@ -0,0 +1,64 @@
+const path = require('path');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+
+module.exports = {
+	entry: "./src/Main.ts",
+	mode: process.env.NODE_ENV.trim() == 'production' ? 'production' : 'development',
+	output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'static/js/[name].js',
+        library: {
+            name: 'Contribute',
+            type: 'window',
+        },
+    },
+
+	// Enable sourcemaps for debugging webpack's output.
+	// devtool: "source-map",
+
+	resolve: {
+		extensions: ['.ts', '.tsx', '.js', '.jsx', '.scss'],
+		modules: ['node_modules']
+	},
+
+	module: {
+		rules: [
+			// All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
+			{
+				test: /\.tsx?$/,
+				exclude: /node_modules/,
+				use: "ts-loader"
+			},
+			// All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
+			{
+				enforce: 'pre',
+				test: /\.js$/,
+				loader: "source-map-loader"
+			},
+		]
+	},
+	plugins: [
+		/**
+		* All files inside webpack's output.path directory will be removed once, but the
+		* directory itself will not be. If using webpack 4+'s default configuration,
+		* everything under <PROJECT_DIR>/dist/ will be removed.
+		* Use cleanOnceBeforeBuildPatterns to override this behavior.
+		*
+		* During rebuilds, all webpack assets that are not used anymore
+		* will be removed automatically.
+		*
+		* See `Options and Defaults` for information
+		*/
+		new CleanWebpackPlugin(),
+		// new HtmlWebpackPlugin({
+		// 	template: './user.html',
+		// 	filename: 'user.html',
+		// }),
+	],
+	// When importing a module whose path matches one of the following, just
+	// assume a corresponding global variable exists and use that instead.
+	// This is important because it allows us to avoid bundling all of our
+	// dependencies, which allows browsers to cache those libraries between builds.
+	externals: {
+	}
+};

contributes/meta3d-action-mod-career-publish-to-game/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-career-publish-to-game",
-    "version": "1.3.37",
+    "version": "1.3.38",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-career-publish-to-game-protocol"

contributes/meta3d-action-mod-career-publish-to-game/src/Main.ts

@@ -82,7 +82,7 @@ let _buildDistFileContent = (state, characterType, features) => {
                         // title: api.getLanguageDataByData(state, _getTextData(), "Title"),
                         title: "${state.displayName_cn}",
                         iconId: "${_buildIconId(state)}",
-                        needGem: 2000,
+                        needGem: ${state.needGem},
                         getCareerFeatureData: (state) => api.MutableRecordUtils.createFromObject(${_buildFeatures(features)}),
                     };
                 },
@@ -185,6 +185,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                 author: "",
                 readme: "",
                 // version: "0.0.1",
+                needGem: 2000,
             }
         }
     }