Skip to content

Commit 677c156

Browse files
committed
feat(editor): add reward tab ui
1 parent fac8257 commit 677c156

17 files changed

Lines changed: 70 additions & 24 deletions

File tree

contributes/meta3d-action-mod-unit-add-feature/package.json

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

contributes/meta3d-action-mod-unit-add-feature/src/Main.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
2727
return Promise.resolve(meta3dState)
2828
}
2929

30-
let featureData = api.nullable.getExn(state.allFeatureData.get(selectedIndex))
30+
let featureData = api.nullable.getExn(state.allFeatureData.filter(d => {
31+
return state.features.filter(f => f.name == d.name).length == 0
32+
}).get(selectedIndex))
3133

3234
meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
3335
...state,

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
210210
isShowUnitValueModal: false,
211211
isShowSkillModal: false,
212212
isShowFeatureModal: false,
213+
isShowRewardModal: false,
213214
isShowSmallSkillObjectActionValueModal: false,
214215
isShowBigSkillObjectActionValueModal: false,
215216
isShowPropModal: false,

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

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

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { actionName, state, uiData } from "meta3d-action-mod-unit-select-prop-pr
44
import { eventName, inputData } from "meta3d-action-mod-unit-select-prop-protocol/src/EventType"
55
import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
66
import { count, rate } from "meta3d-action-mod-unit-publish-to-game-protocol/src/Type"
7+
import { getLanguageTextVariableData } from "meta3d-language-utils/src/Main"
8+
import { languageVariableKey } from "meta3d-language-utils/src/Type"
79

810
export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> = (api) => {
911
return {
@@ -15,7 +17,15 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
1517
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, index) => {
1618
let state = api.nullable.getExn(api.action.getActionState<initState>(meta3dState, initActionName))
1719

18-
let prop = api.nullable.getExn(state.allPropData.get(index))
20+
if (state.prop.length >= 5) {
21+
api.message.warn(getLanguageTextVariableData(api, meta3dState, languageVariableKey.LimitMaxCount)(5))
22+
23+
return Promise.resolve(meta3dState)
24+
}
25+
26+
let prop = api.nullable.getExn(state.allPropData.filter(d => {
27+
return state.prop.filter(p => p.name == d.name).length == 0
28+
}).get(index))
1929

2030
meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
2131
...state,

contributes/meta3d-input-mod-unit-select-prop/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-prop",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ import { state as meta3dState, getContribute as getContributeMeta3D } from "meta
22
import { data } from "meta3d-input-grid-protocol"
33
import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
44
import { service, inputContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
5+
import { getLanguageTextData } from "meta3d-language-utils/src/Main"
56

67
export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) => {
78
return {
89
inputName: "ModUnitSelectPropInput",
910
func: (meta3dState) => {
1011
let allPropData = api.nullable.getWithDefault(
1112
api.nullable.map(state => {
12-
return state.allPropData.toArray().map((prop) => {
13+
return state.allPropData.toArray().filter(d => {
14+
return state.prop.filter(p => p.name == d.name).length == 0
15+
}).map((prop) => {
1316
return {
14-
name: prop.name,
17+
name: getLanguageTextData(api, meta3dState, prop.name),
1518
imageBase64: prop.snapshotImageBase64
1619
}
1720
}).sort((a, b) => {

contributes/meta3d-ui-control-grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-ui-control-grid",
3-
"version": "1.3.7",
3+
"version": "1.3.8",
44
"displayName": "网格",
55
"publisher": "meta3d",
66
"protocol": {

contributes/meta3d-ui-control-grid/src/Main.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ let _loadImages = (
1616

1717

1818
let promise = null
19-
if (state.gridTextures.length == 0) {
19+
if (state.gridTextures.length == 0 || state.gridTextures.length != itemsWithImageBase64.length) {
20+
meta3dState = api.uiControl.setUIControlState<state>(meta3dState, label, {
21+
gridTextures: [],
22+
})
23+
2024
promise = reducePromise(itemsWithImageBase64, (meta3dState, itemWithImageBase64) => {
2125
return loadImage(meta3dState, itemWithImageBase64.imageBase64).then((texture: any) => {
2226
let state = api.nullable.getExn(api.uiControl.getUIControlState<state>(meta3dState, label))

0 commit comments

Comments
 (0)