Skip to content

Commit cfed4d2

Browse files
yyc-gityyc-git
committed
feat(editor): add Big Skill Object ui
1 parent 60f949c commit cfed4d2

74 files changed

Lines changed: 172 additions & 99 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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.47",
3+
"version": "1.3.50",
44
"publisher": "meta3d",
55
"protocol": {
66
"name": "meta3d-action-mod-unit-init-protocol"

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,18 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
256256
selectedSmallSkillObjectActionIndex: 0,
257257
selectedSmallSkillObjectEmitterParticleImageIndex: api.nullable.getEmpty(),
258258
selectedSmallSkillObjectEmitterInstanceIndex: api.nullable.getEmpty(),
259-
// selectedBigSkillObjectActionIndex: api.nullable.getEmpty(),
259+
selectedBigSkillObjectActionIndex: 0,
260+
selectedBigSkillObjectEmitterParticleImageIndex: api.nullable.getEmpty(),
261+
selectedBigSkillObjectEmitterInstanceIndex: api.nullable.getEmpty(),
260262

261263
// isShowModelWindow: false,
262264
// isShowSkillWindow: false,
263265
currentTabKey: "Model",
264266

265267
isShowModelModal: false,
266268
isShowUnitValueModal: false,
267-
isShowSkillModal: false,
269+
isShowSmallSkillModal: false,
270+
isShowBigSkillModal: false,
268271
isShowFeatureModal: false,
269272
isShowRewardModal: false,
270273
isShowSmallSkillObjectActionValueModal: false,
@@ -274,7 +277,13 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
274277
isShowSmallSkillObjectEmitterInstanceModal: false,
275278
isShowSmallSkillObjectEmitterValueModal: false,
276279
isShowSmallSkillObjectEmitterSubEffectModal: false,
277-
// isShowBigSkillObjectActionValueModal: false,
280+
isShowBigSkillObjectActionValueModal: false,
281+
isShowBigSkillObjectDamageValueModal: false,
282+
isShowBigSkillObjectDamageSubEffectModal: false,
283+
isShowBigSkillObjectEmitterParticleImageModal: false,
284+
isShowBigSkillObjectEmitterInstanceModal: false,
285+
isShowBigSkillObjectEmitterValueModal: false,
286+
isShowBigSkillObjectEmitterSubEffectModal: false,
278287
isShowPropModal: false,
279288

280289
excitement: excitement.Level5,
@@ -314,7 +323,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
314323
s_emitterLife: emitterLife.Level5,
315324
s_emitterSize: emitterSize.Level5,
316325
s_emitterCollisionSize: emitterCollisionSize.Level5,
317-
s_emitterCount: emitterCount.Level1,
326+
// s_emitterCount: emitterCount.Level1,
318327
s_explodeRange: explodeRange.Level5,
319328

320329

@@ -342,7 +351,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
342351
b_emitterLife: emitterLife.Level5,
343352
b_emitterSize: emitterSize.Level5,
344353
b_emitterCollisionSize: emitterCollisionSize.Level5,
345-
b_emitterCount: emitterCount.Level1,
354+
// b_emitterCount: emitterCount.Level1,
346355
b_explodeRange: explodeRange.Level5,
347356

348357

‎contributes/meta3d-action-mod-unit-quicktest/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-quicktest",
3-
"version": "1.3.10",
3+
"version": "1.3.13",
44
"publisher": "meta3d",
55
"protocol": {
66
"name": "meta3d-action-mod-unit-quicktest-protocol"

‎contributes/meta3d-action-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-action-mod-unit-select-action",
3-
"version": "1.3.5",
3+
"version": "1.3.6",
44
"publisher": "meta3d",
55
"protocol": {
66
"name": "meta3d-action-mod-unit-select-action-protocol"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
1111
let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
1212

1313
return new Promise((resolve, reject) => {
14-
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, index, [fieldName]) => {
14+
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, index, [fieldName, isShowSkillModalFieldName]) => {
1515
meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
1616
...api.nullable.getExn(api.action.getActionState<initState>(meta3dState, initActionName)),
1717
[fieldName]: index,
18-
isShowSkillModal: false
18+
[isShowSkillModalFieldName]: false
1919
})
2020

2121
return Promise.resolve(meta3dState)

‎contributes/meta3d-action-mod-unit-set-emittertype/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-set-emittertype",
3-
"version": "1.3.2",
3+
"version": "1.3.4",
44
"publisher": "meta3d",
55
"repoLink": "",
66
"protocol": {

‎contributes/meta3d-action-mod-unit-set-emittertype/src/Main.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
1111
let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
1212

1313
return new Promise((resolve, reject) => {
14-
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, index: number, [emitterTypeFieldName]) => {
14+
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState, index: number, [emitterTypeFieldName, selectedSkillObjectEmitterParticleImageIndexFieldName, selectedSkillObjectEmitterInstanceIndexFieldName]) => {
1515
let state = api.nullable.getExn(api.action.getActionState<any>(meta3dState, initActionName))
1616

1717
meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
1818
...state,
19-
selectedSmallSkillObjectEmitterParticleImageIndex: api.nullable.getEmpty(),
20-
selectedSmallSkillObjectEmitterInstanceIndex: api.nullable.getEmpty(),
19+
[selectedSkillObjectEmitterParticleImageIndexFieldName]: api.nullable.getEmpty(),
20+
[selectedSkillObjectEmitterInstanceIndexFieldName]: api.nullable.getEmpty(),
2121
[emitterTypeFieldName]: state.allEmitterTypes.get(index)
2222
})
2323

‎contributes/meta3d-input-mod-unit-show-emitter-window/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-show-emitter-window",
3-
"version": "1.3.6",
3+
"version": "1.3.8",
44
"publisher": "meta3d",
55
"description": "",
66
"protocol": {

‎contributes/meta3d-input-mod-unit-show-emitter-window/src/Main.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ import { actionName as initActionName, state as initState } from "meta3d-action-
77

88
let _isNotShowAnySkillModalExceptEmitter = (api: api, meta3dState: meta3dState) => {
99
let {
10-
isShowSkillModal,
10+
isShowSmallSkillModal,
11+
isShowBigSkillModal,
1112
isShowSmallSkillObjectActionValueModal,
1213
isShowSmallSkillObjectDamageValueModal,
1314
isShowSmallSkillObjectDamageSubEffectModal,
14-
// isShowSmallSkillObjectEmitterParticleImageModal,
15-
// isShowSmallSkillObjectEmitterInstanceModal,
16-
// isShowSmallSkillObjectEmitterValueModal,
17-
// isShowSmallSkillObjectEmitterSubEffectModal,
15+
isShowBigSkillObjectActionValueModal,
16+
isShowBigSkillObjectDamageValueModal,
17+
isShowBigSkillObjectDamageSubEffectModal,
1818
} = api.nullable.getExn(api.action.getActionState<initState>(meta3dState, initActionName))
1919

20-
return !isShowSkillModal
20+
return !isShowSmallSkillModal
21+
&& !isShowBigSkillModal
2122
&& !isShowSmallSkillObjectActionValueModal
2223
&& !isShowSmallSkillObjectDamageValueModal
2324
&& !isShowSmallSkillObjectDamageSubEffectModal
24-
// && !isShowSmallSkillObjectEmitterParticleImageModal
25-
// && !isShowSmallSkillObjectEmitterInstanceModal
26-
// && !isShowSmallSkillObjectEmitterValueModal
27-
// && !isShowSmallSkillObjectEmitterSubEffectModal
25+
&& !isShowBigSkillObjectActionValueModal
26+
&& !isShowBigSkillObjectDamageValueModal
27+
&& !isShowBigSkillObjectDamageSubEffectModal
2828
}
2929

3030
export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ src\log 0x1.a5a64897c2f18p+30
1818
src\copy 0x1.a5a64897c0e59p+30
1919
src\contract 0x1.a5a64897bfdf9p+30
2020
===
21-
D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe 0x1.a6f3aeb086adap+30
21+
D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe 0x1.a6f8350ff5e84p+30

0 commit comments

Comments
 (0)