Skip to content

Commit 53256f5

Browse files
committed
feat(editor): update skill tab ui
1 parent f8cff74 commit 53256f5

10 files changed

Lines changed: 29 additions & 10 deletions

File tree

contributes/meta3d-input-mod-unit-action-name/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-input-mod-unit-action-name",
3-
"version": "1.3.3",
3+
"version": "1.3.4",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

contributes/meta3d-input-mod-unit-action-name/src/Main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { data } from "meta3d-input-text-protocol"
33
import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
44
import { actionName as setCategoryActionName, state as setCategoryState } from "meta3d-action-mod-unit-set-category-protocol"
55
import { service, inputContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
6+
import { getLanguageTextData } from "meta3d-language-utils/src/Main"
67

78
export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) => {
89
return {
@@ -15,7 +16,7 @@ export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) =>
1516

1617
return api.nullable.bind(actionData => {
1718
return api.nullable.bind(selectedActionIndex => {
18-
return Array.from(actionData.keys())[selectedActionIndex]
19+
return getLanguageTextData(api, meta3dState, Array.from(actionData.keys())[selectedActionIndex])
1920
}, data[fieldName])
2021
}, data.allActionData.get(category))
2122
},

contributes/meta3d-input-mod-unit-action-snapshot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-input-mod-unit-action-snapshot",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

contributes/meta3d-input-mod-unit-add-skillobject/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-input-mod-unit-add-skillobject",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

contributes/meta3d-input-mod-unit-add-skillobject/src/Main.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { state as meta3dState, getContribute as getContributeMeta3D } from "meta
33
import { data } from "meta3d-input-popup-protocol"
44
import { inputContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
55
// import { actionName as languageActionName, state as languageState } from "meta3d-action-mod-language-protocol"
6+
import { getLanguageTextData } from "meta3d-language-utils/src/Main"
7+
import { languageKey } from "meta3d-language-utils/src/Type"
68

79
export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) => {
810
return {
@@ -27,8 +29,8 @@ export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) =>
2729
// )
2830
return Promise.resolve(
2931
[
30-
"针对小型目标",
31-
"针对大型目标"
32+
getLanguageTextData(api, meta3dState, languageKey.ForSmallUnit),
33+
getLanguageTextData(api, meta3dState, languageKey.ForBigUnit),
3234
]
3335
)
3436
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-input-mod-unit-select-action",
3-
"version": "1.3.1",
3+
"version": "1.3.2",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { data } from "meta3d-input-grid-protocol"
33
import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
44
import { actionName as setCategoryActionName, state as setCategoryState } from "meta3d-action-mod-unit-set-category-protocol"
55
import { service, inputContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
6+
import { getLanguageTextData } from "meta3d-language-utils/src/Main"
67

78
export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) => {
89
return {
@@ -16,7 +17,7 @@ export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) =>
1617
category
1718
)).entries()).map(([action, actionData]) => {
1819
return {
19-
name: action,
20+
name: getLanguageTextData(api, meta3dState, action),
2021
imageBase64: actionData.snapshotImageBase64
2122
}
2223
}).sort((a, b) => {

doc/1.3.1.org

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,6 +1980,10 @@ TODO update Generate related ui
19801980

19811981

19821982
TODO update Skill related ui
1983+
update
1984+
1985+
fix
1986+
19831987

19841988

19851989

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { state as meta3dState, api } from "meta3d-type"
2-
import { category, feature, model, propName } from "meta3d-action-mod-unit-publish-to-game-protocol/src/UnitType"
2+
import { action, category, feature, model, propName } from "meta3d-action-mod-unit-publish-to-game-protocol/src/UnitType"
33
import { actionName as languageActionName, state as languageState } from "meta3d-action-mod-language-protocol"
44
import { language, languageKey, languageVariableKey } from "./Type"
55

@@ -16,9 +16,14 @@ export let getTextData = (): data => {
1616
[languageKey.AddGenerateDataInAttackCityStage]: "攻击城市关卡增加生成数据",
1717
[languageKey.AddGenerateDataInProtectCityStage]: "防卫城市关卡增加生成数据",
1818
[languageKey.AddGenerateDataInBossStage]: "boss关卡增加生成数据",
19+
[languageKey.ForSmallUnit]: "针对小型单位",
20+
[languageKey.ForBigUnit]: "针对大型单位",
1921

2022
[category.EliteGiantess]: "精英巨大娘",
2123
[model.EliteGiantessMelee1]: "精英巨大娘近战1",
24+
[action.StompLight]: "轻踩",
25+
[action.KickLight]: "轻踢",
26+
[action.Cast]: "施法",
2227
[propName.AddHp1]: "加血(小)",
2328
[propName.AddHp2]: "加血(中)",
2429
[feature.DamageBigger]: "受击变大",
@@ -32,9 +37,14 @@ export let getTextData = (): data => {
3237
[languageKey.AddGenerateDataInAttackCityStage]: "Add generate data in attack city stage",
3338
[languageKey.AddGenerateDataInProtectCityStage]: "Add generate data in protect city stage",
3439
[languageKey.AddGenerateDataInBossStage]: "Add generate data in boss stage",
40+
[languageKey.ForSmallUnit]: "For small unit",
41+
[languageKey.ForBigUnit]: "For big unit",
3542

3643
[category.EliteGiantess]: "Elite Giantess",
3744
[model.EliteGiantessMelee1]: "Elite Giantess Melee 1",
45+
[action.StompLight]: "Stomp Light",
46+
[action.KickLight]: "Kick Light",
47+
[action.Cast]: "Cast",
3848
[propName.AddHp1]: "Add hp(small)",
3949
[propName.AddHp2]: "Add hp(medium)",
4050
[feature.DamageBigger]: "Damage Bigger",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ export enum languageKey {
1010
CountFactor,
1111
DropRate,
1212
Difficulty,
13-
1413
AddGenerateDataInAttackCityStage,
1514
AddGenerateDataInProtectCityStage,
1615
AddGenerateDataInBossStage,
16+
ForSmallUnit,
17+
ForBigUnit,
1718
}
1819

1920
export enum languageVariableKey {

0 commit comments

Comments
 (0)