feat: continue "load custom model"

model can be None;

Author: yyc-git

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.40",
+    "version": "1.3.41",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-unit-publish-to-game-protocol"

contributes/meta3d-action-mod-unit-select-model/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-unit-select-model",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-unit-select-model-protocol"

contributes/meta3d-action-mod-unit-select-model/src/Main.ts

@@ -3,6 +3,8 @@ import { actionContribute, service as editorWholeService } from "meta3d-editor-w
 import { actionName, state, uiData } from "meta3d-action-mod-unit-select-model-protocol"
 import { eventName, inputData } from "meta3d-action-mod-unit-select-model-protocol/src/EventType"
 import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
+import { actionName as uploadModelFileActionName, state as uploadModelFileState } from "meta3d-action-mod-unit-upload-model-file-protocol"
+import { actionName as uploadModelSnapshotActionName, state as uploadModelSnapshotState } from "meta3d-action-mod-unit-upload-model-snapshot-protocol"
 
 export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> = (api) => {
     return {
@@ -18,6 +20,15 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         isShowModelModal: false
                     })
 
+                    meta3dState = api.action.setActionState<uploadModelFileState>(meta3dState, uploadModelFileActionName, {
+                        ...api.nullable.getExn(api.action.getActionState<uploadModelFileState>(meta3dState, uploadModelFileActionName)),
+                        files: api.immutable.createMap()
+                    })
+                    meta3dState = api.action.setActionState<uploadModelSnapshotState>(meta3dState, uploadModelSnapshotActionName, {
+                        ...api.nullable.getExn(api.action.getActionState<uploadModelSnapshotState>(meta3dState, uploadModelSnapshotActionName)),
+                        snapshot: api.nullable.getEmpty()
+                    })
+
                     return Promise.resolve(meta3dState)
                 }, (meta3dState) => {
                     return Promise.resolve(meta3dState)

contributes/meta3d-action-mod-unit-upload-model-file/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-unit-upload-model-file",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-unit-upload-model-file-protocol"

contributes/meta3d-action-mod-unit-upload-model-file/src/Main.ts

@@ -7,6 +7,7 @@ import { nullable } from "meta3d-commonlib-ts/src/nullable"
 import { importFile } from "meta3d-file-ts-utils/src/ImportFileUtils"
 import { getLanguageTextData, getLanguageTextVariableData } from "meta3d-language-utils/src/Main"
 import { languageKey, languageVariableKey } from "meta3d-language-utils/src/Type"
+import { model } from "meta3d-action-mod-unit-publish-to-game-protocol/src/UnitType"
 
 let _loadFBX = (api: api): Promise<[boolean, nullable<fbxName>, nullable<fbxData>]> => {
     return new Promise((resolve, reject) => {
@@ -65,6 +66,12 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         files: state.files.set(key, [fbxName, fbxData]),
                     })
 
+                    meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
+                        ...initState,
+                        selectedModelIndex: api.nullable.getEmpty()
+                    })
+
+
                     return Promise.resolve(meta3dState)
                 }, (meta3dState) => {
                     return Promise.resolve(meta3dState)

doc/1.3.1.org

@@ -2866,21 +2866,34 @@ TODO update ui
 
 TODO update Play
 
-** TODO if upload model, set selectedModel to None
+** DONE if upload model, set selectedModel to None
+
+** DONE if select model to not None, clear upload model data
+
+
+** DONE update 文字、图片: hidden
+
+** DONE play:
+update UnitType->model
+
+update _loadSceneResourceHandler
+
 
-** TODO if select model to not None, clear upload model data
 
-** TODO play: update _loadSceneResourceHandler
 
 
-** TODO update 文字、图片: hidden
 
 ** TODO show fbx name after upload button instead
 
 
 ** TODO after upload model file, show upload snapshot button
 
-** TODO show snapshot after upload snapshot
+** TODO show snapshot image after upload snapshot
+
+** TODO update init
+
+** TODO update publish
+
 
 
 
@@ -2902,7 +2915,7 @@ should has select model
 
 
 
-** TODO update editor
+** TODO pass Play run test
 
 
 # ** TODO refactor: add fbxPaths?

protocols/contribute_protocols/meta3d-action-mod-unit-init-protocol/src/StateType.ts

@@ -59,7 +59,7 @@ export type state = {
     allFeatureData: features,
     allPropData: props,
 
-    selectedModelIndex: number,
+    selectedModelIndex: nullable<number>,
     selectedSmallSkillObjectActionIndex: number,
     selectedSmallSkillObjectEmitterParticleImageIndex: nullable<number>,
     selectedSmallSkillObjectEmitterInstanceIndex: nullable<number>,

protocols/contribute_protocols/meta3d-action-mod-unit-publish-to-game-protocol/src/UnitType.ts

@@ -1,6 +1,7 @@
 import { autoDifficulty } from "./Type";
 
 export enum model {
+    None = "None",
     EliteGiantess1 = "EliteGiantess1",
     EliteGiantess2 = "EliteGiantess2",
     EliteGiantess3 = "EliteGiantess3",

utils/meta3d-action-mod-unit-publish-utils/src/Main.ts

@@ -159,7 +159,12 @@ let _buildDistFileContent = (api: api, meta3dState: meta3dState, name, displayNa
     } = state
 
 
-    let model = api.nullable.getExn(allModelData.get(category_))[api.nullable.getExn(selectedModelIndex)].model
+    let model_ = api.nullable.getWithDefault(
+        api.nullable.map(selectedModelIndex => {
+            return api.nullable.getExn(allModelData.get(category_))[selectedModelIndex].model
+        }, selectedModelIndex),
+        model.None
+    )
 
 
     let updateFuncStr
@@ -306,7 +311,7 @@ let _buildDistFileContent = (api: api, meta3dState: meta3dState, name, displayNa
                 displayNameEN: "${displayNameEN}",
             }
         },
-        getModel: () => "${model}",
+        getModel: () => "${model_}",
         getCategory: () => "${category_}",
         getValue: (api, state) => {
             return api.${updateFuncStr}(state, ${JSON.stringify({
@@ -459,6 +464,11 @@ let _getAssetFiles = (api: api, meta3dState: meta3dState, name) => {
         return result
     }, [])
 
+
+    if (api.nullable.isNullable(api.action.getActionState<uploadModelSnapshotState>(meta3dState, uploadModelSnapshotActionName).snapshot)) {
+        return Promise.resolve(result)
+    }
+
     return _base64ToUint8Array(api.nullable.getExn(api.action.getActionState<uploadModelSnapshotState>(meta3dState, uploadModelSnapshotActionName).snapshot)).then(data => {
         result.push([
             `./${name}_model_snapshot.png`,