feat(editor): add publish modal ui

as new ui control;

Author: yyc-git

contributes/meta3d-action-mod-unit-init/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-unit-init",
-    "version": "1.3.34",
+    "version": "1.3.38",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-unit-init-protocol"

contributes/meta3d-action-mod-unit-init/src/Main.ts

@@ -320,6 +320,17 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
 
 
                 prop: [],
+
+
+
+                isShowPublishModal: false,
+
+                displayNameCN: "",
+                displayNameEN: "",
+                modIconBase64: api.nullable.getEmpty(),
+                modIconTexture: api.nullable.getEmpty(),
+                isPublic: false,
+                description: "",
             }
         }
     }

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

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-unit-publish-to-game",
-    "version": "1.3.11",
+    "version": "1.3.22",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-unit-publish-to-game-protocol"

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

@@ -2,9 +2,36 @@ import { state as meta3dState, getContribute as getContributeMeta3D, api } from
 // import { language } from "meta3d-action-mod-unit-add-careerfeature-protocol"
 import { actionContribute, service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
 import { actionName, state, uiData } from "meta3d-action-mod-unit-publish-to-game-protocol"
+import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
 import { eventName, inputData } from "meta3d-action-mod-unit-publish-to-game-protocol/src/EventType"
-import { publish } from "meta3d-action-mod-unit-publish-utils/src/Main"
+import { publish, getUserName, checkModData, buildUniqueName } from "meta3d-action-mod-unit-publish-utils/src/Main"
+import { getLanguageTextData, isChinese } from "meta3d-language-utils/src/Main"
+import { languageKey } from "meta3d-language-utils/src/Type"
 
+let _checkPublishData = (api: api, meta3dState: meta3dState, { displayNameCN, displayNameEN, description, modIconBase64 }: initState, isChinese: boolean) => {
+    let message = api.nullable.getEmpty<string>()
+
+    if (isChinese && displayNameCN.length <= 0) {
+        message = api.nullable.return(getLanguageTextData(api, meta3dState, languageKey.NeedDisplayNameCN))
+    }
+    else if (!isChinese && displayNameEN.length <= 0) {
+        message = api.nullable.return(getLanguageTextData(api, meta3dState, languageKey.NeedDisplayNameEN))
+    }
+    else if (description.length <= 0) {
+        message = api.nullable.return(getLanguageTextData(api, meta3dState, languageKey.NeedDescription))
+    }
+    else if (api.nullable.isNullable(modIconBase64)) {
+        message = api.nullable.return(getLanguageTextData(api, meta3dState, languageKey.NeedModIcon))
+    }
+
+    return api.nullable.getWithDefault(
+        api.nullable.map((message) => {
+            api.message.warn(message)
+            return true
+        }, message),
+        false
+    )
+}
 
 export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> = (api) => {
     return {
@@ -16,41 +43,36 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
 
             return new Promise((resolve, reject) => {
                 resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState) => {
-                    // let characterType_ = api.action.getActionState<selectCharacterTypeState>(meta3dState, selectCharacterTypeActionName).characterType
-                    // let features = api.action.getActionState<addCareerFeatureState>(meta3dState, addCareerFeatureActionName).allSelectedCareerFeatureData.filter(d => {
-                    //     return _isCharacterTypeEqual(d.characterType, characterType_)
-                    // })
-
-                    // let assetIconBase64 = api.nullable.getWithDefault(
-                    //     api.action.getActionState<loadModPreviewState>(meta3dState, loadModPreviewActionName).preview,
-                    //     ""
-                    // )
-                    // let careerIconBase64 = api.nullable.getWithDefault(
-                    //     api.action.getActionState<loadCareerPreviewState>(meta3dState, loadCareerPreviewActionName).preview,
-                    //     ""
-                    // )
+                    console.log("publish mod")
 
-                    // let isChinese = api.action.getActionState<languageState>(meta3dState, languageActionName).language == language.Chinese
+                    if (_checkPublishData(api, meta3dState, api.action.getActionState<initState>(meta3dState, initActionName), isChinese(api, meta3dState))
+                        || checkModData(api, [getLanguageTextData, languageKey], meta3dState, api.action.getActionState<initState>(meta3dState, initActionName))
+                    ) {
+                        return Promise.resolve(meta3dState)
+                    }
 
-                    // if (_check(api, api.action.getActionState<state>(meta3dState, actionName), isChinese, features)) {
-                    //     return Promise.resolve(meta3dState)
-                    // }
+                    api.flow.deferExec(api, (meta3dState) => {
+                        let initState = api.action.getActionState<initState>(meta3dState, initActionName)
 
-                    console.log("publish mod")
 
+                        let author = getUserName(api)
+                        return publish(api,
+                            meta3dState,
+                            buildUniqueName(author, initState.displayNameCN, initState.displayNameEN, isChinese(api, meta3dState)),
+                            author,
+                            initState.displayNameCN,
+                            initState.displayNameEN,
+                            initState.description,
+                            initState.isPublic,
+                            api.nullable.getExn(initState.modIconBase64)
+                        ).then(meta3dState => {
+                            meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
+                                ...api.action.getActionState<initState>(meta3dState, initActionName),
+                                isShowPublishModal: false
+                            })
 
-                    // meta3dState = api.action.setActionState<state>(meta3dState, actionName, {
-                    //     ...api.action.getActionState<state>(meta3dState, actionName),
-                    //     isShowModal: false
-                    // })
-                    // meta3dState = api.action.setActionState<infoState>(meta3dState, infoActionName, {
-                    //     ...api.action.getActionState<infoState>(meta3dState, infoActionName),
-                    //     info: isChinese ? api.nullable.return("正在发布中...") : api.nullable.return("Publishing...")
-                    // })
-                    api.flow.deferExec(api, (meta3dState) => {
-                        let author =  "Official"
-                        let name = `unit-test1`
-                        return publish(api, meta3dState, name, author)
+                            return meta3dState
+                        })
                     })
 
                     return Promise.resolve(meta3dState)

contributes/meta3d-action-mod-unit-show-publish-modal/.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-unit-show-publish-modal/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-unit-show-publish-modal/loader.d.ts

@@ -0,0 +1,13 @@
+// declare module 'asset-loader!*' {
+//     // const contents: { default: string }
+//     const contents: string
+//     // const contents: ArrayBuffer
+//     export = contents
+// }
+
+declare module '*' {
+    // const contents: { default: string }
+    const contents: string
+    // const contents: ArrayBuffer
+    export = contents
+}

contributes/meta3d-action-mod-unit-show-publish-modal/package.json

@@ -0,0 +1,34 @@
+{
+    "name": "meta3d-action-mod-unit-show-publish-modal",
+    "version": "1.3.2",
+    "publisher": "meta3d",
+    "protocol": {
+        "name": "meta3d-action-mod-unit-show-publish-modal-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"
+    },
+    "keywords": [],
+    "dependencies": {
+        "meta3d-action-mod-unit-show-publish-modal-protocol": "^1.3.0",
+        "meta3d-editor-whole-protocol": "^1.3.0",
+        "meta3d-type": "^1.3.0"
+    },
+    "devDependencies": {
+        "clean-webpack-plugin": "^4.0.0",
+        "clipboardy": "^5.0.2",
+        "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-unit-show-publish-modal/src/Main.ts

@@ -0,0 +1,42 @@
+import { state as meta3dState, getContribute as getContributeMeta3D, api } from "meta3d-type"
+// import { language } from "meta3d-action-mod-unit-add-careerfeature-protocol"
+import { actionContribute, service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
+import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
+import { actionName, state, uiData } from "meta3d-action-mod-unit-show-publish-modal-protocol"
+import { eventName, inputData } from "meta3d-action-mod-unit-show-publish-modal-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) => {
+                    meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
+                        ...api.action.getActionState<initState>(meta3dState, initActionName),
+                        isShowPublishModal: true
+                    })
+
+                    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: []
+                }))
+            })
+        },
+        createState: () => {
+            return null
+        }
+    }
+}

contributes/meta3d-action-mod-unit-show-publish-modal/tsconfig.json

@@ -0,0 +1,27 @@
+{
+	"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": [
+			"node"
+		],
+		// "strict": true
+	},
+	"include": [
+		"./src",
+		"./loader.d.ts"
+	]
+}