feat: continue "load custom model"

add lod2;

Author: yyc-git

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

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

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

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

@@ -3,13 +3,15 @@ import { state as meta3dState, getContribute as getContributeMeta3D, api } from
 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 { 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"
 import { actionName as infoActionName, state as infoState } from "meta3d-action-mod-career-info-protocol"
 import { eventName, inputData } from "meta3d-action-mod-unit-publish-to-game-protocol/src/EventType"
 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, { languageTextData, displayNameCN, displayNameEN, description, modIconBase64 }: initState, isChinese: boolean) => {
+let _checkPublishData = (api: api, meta3dState: meta3dState, { selectedModelIndex, languageTextData, displayNameCN, displayNameEN, description, modIconBase64 }: initState, isChinese: boolean) => {
     let message = api.nullable.getEmpty<string>()
 
     if (isChinese && displayNameCN.length <= 0) {
@@ -25,6 +27,19 @@ let _checkPublishData = (api: api, meta3dState: meta3dState, { languageTextData,
     //     message = api.nullable.return(getLanguageTextData(api, meta3dState, languageTextData, languageKey.NeedModIcon))
     // }
 
+    if (api.nullable.isNullable(selectedModelIndex)) {
+        let uploadModelFileState = api.action.getActionState<uploadModelFileState>(meta3dState, uploadModelFileActionName)
+        let uploadModelSnapshotState = api.action.getActionState<uploadModelSnapshotState>(meta3dState, uploadModelSnapshotActionName)
+
+        if (!(
+            uploadModelFileState.files.has("lod1") && uploadModelFileState.files.has("lod2")
+            && !api.nullable.isNullable(uploadModelSnapshotState.snapshot)
+        )
+        ) {
+            message = api.nullable.return(getLanguageTextData(api, meta3dState, languageTextData, languageKey.NeedLOD1LOD2SnapshotModelFile))
+        }
+    }
+
     return api.nullable.getWithDefault(
         api.nullable.map((message) => {
             api.message.warn(message)

defaults/meta3d-commonlib/lib/bs/.bsdeps

@@ -18,4 +18,4 @@ src\log	0x1.a637238e70695p+30
 src\copy	0x1.a637238e70695p+30
 src\contract	0x1.a637238e70695p+30
 ===
-D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a7da50814616ap+30
+D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a7da83d1e9e1ep+30

defaults/meta3d-commonlib/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(-434609648)
-#Done(-434608631)
+#Start(-431326102)
+#Done(-431326095)

doc/1.3.1.org

@@ -2897,25 +2897,25 @@ update _loadSceneResourceHandler
 
 
 
-** TODO add lod2 upload
+** DONE add lod2 upload
 
 
-** TODO after upload model lod1, show upload lod2 button
+** DONE after upload model lod1, show upload lod2 button
 
 
 
-** TODO update publish check
+** DONE update publish check
 if upload:
 should has model lod1, lod2, snapshot
 should has none select model
 
-if select model:
-should has no model lod1, lod2, snapshot
-should has select model
+# if select model:
+# should has no model lod1, lod2, snapshot
+# should has select model
 
 
 
-** TODO pass Play run test
+** DONE pass Play run test
 
 
 # ** TODO refactor: add fbxPaths?

utils/meta3d-language-utils/src/Data.ts

@@ -36,6 +36,7 @@ export let getTextData = (): languageTextData => {
             [languageKey.NeedAtLeastOneGenerateData]: "需要为至少一个关卡加入生成数据",
             [languageKey.NeedSmallSkillObjectEmitterData]: "需要加入针对小型单位的技能->弹药数据",
             [languageKey.NeedBigSkillObjectEmitterData]: "需要加入针对大型单位的技能->弹药数据",
+            [languageKey.NeedLOD1LOD2SnapshotModelFile]: "需要上传LOD1和LOD2的模型FBX文件和模型快照",
 
 
             [category.EliteGiantess]: "精英巨大娘",
@@ -171,6 +172,7 @@ export let getTextData = (): languageTextData => {
             [languageKey.NeedAtLeastOneGenerateData]: "Generation data for at least one level is required",
             [languageKey.NeedSmallSkillObjectEmitterData]: "Ammo data for small unit skills is required",
             [languageKey.NeedBigSkillObjectEmitterData]: "Ammo data for large unit skills is required",
+            [languageKey.NeedLOD1LOD2SnapshotModelFile]: "LOD1 and LOD2 model file and snapshot are required",
 
             [category.EliteGiantess]: "Elite Giantess",
             [model.EliteGiantess1]: "Elite Giantess 1",

utils/meta3d-language-utils/src/Type.ts

@@ -38,6 +38,7 @@ export enum languageKey {
     NeedAtLeastOneGenerateData,
     NeedSmallSkillObjectEmitterData,
     NeedBigSkillObjectEmitterData,
+    NeedLOD1LOD2SnapshotModelFile,
 
 
 }