ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

duplicate events on same construct won't move

Browse Source
This commit is contained in:
Mashy 2019-11-29 00:06:42 +10:00
parent 84e3e776ca
commit 75a1c1b3c4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/events.jsx
View File

@ -93,10 +93,12 @@ function registerEvents(store) {
if (r.stages.includes('START_SKILL') && anims.animSource) { if (r.stages.includes('START_SKILL') && anims.animSource) {
store.dispatch(actions.setAnimSource(anims.animSource)); store.dispatch(actions.setAnimSource(anims.animSource));
store.dispatch(actions.setAnimText(null));
} }
if (r.stages.includes('END_SKILL') && anims.animTarget) { if (r.stages.includes('END_SKILL') && anims.animTarget) {
store.dispatch(actions.setAnimTarget(anims.animTarget)); store.dispatch(actions.setAnimTarget(anims.animTarget));
store.dispatch(actions.setAnimText(null));
if (animations.isCbAnim(anims.animSkill)) store.dispatch(actions.setAnimCb(cb)); if (animations.isCbAnim(anims.animSkill)) store.dispatch(actions.setAnimCb(cb));
} }
@ -107,9 +109,9 @@ function registerEvents(store) {
} else { } else {
setTimeout( setTimeout(
() => store.dispatch(actions.setAnimText(text)), () => store.dispatch(actions.setAnimText(text)),
timeout - TIMES.POST_SKILL_DURATION_MS - 500 timeout - TIMES.POST_SKILL_DURATION_MS - 700
); );
timeout -= 500; timeout -= 700;
} }
} }
@ -117,7 +119,7 @@ function registerEvents(store) {
store.dispatch(actions.setAnimSkill(null)); store.dispatch(actions.setAnimSkill(null));
store.dispatch(actions.setAnimSource(null)); store.dispatch(actions.setAnimSource(null));
store.dispatch(actions.setAnimTarget(null)); store.dispatch(actions.setAnimTarget(null));
store.dispatch(actions.setAnimText(null)); // store.dispatch(actions.setAnimText(null));
store.dispatch(actions.setAnimFocus([])); store.dispatch(actions.setAnimFocus([]));
if (r.stages.includes('END_SKILL') && animations.isCbAnim(anims.animSkill)) return true; if (r.stages.includes('END_SKILL') && animations.isCbAnim(anims.animSkill)) return true;
return cb(); return cb();