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

anim cleanup

Browse Source
This commit is contained in:
Mashy 2019-10-24 08:53:04 +10:00
parent d9563f8a9a
commit e0cae50cc6
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/animations.utils.jsx
View File

@ -73,21 +73,6 @@ function getObjects(resolution, game, account) {
};
}
function getSequence(resolution) {
if (!resolution.event) return [];
switch (resolution.stages) {
case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
case 'StartEnd': return ['START_SKILL', 'END_SKILL'];
case 'StartPost': return ['START_SKILL', 'POST_SKILL'];
case 'StartOnly': return ['START_SKILL'];
case 'EndPost': return ['END_SKILL', 'POST_SKILL'];
case 'EndOnly': return ['END_SKILL'];
case 'PostOnly': return ['POST_SKILL'];
case 'NoStages': return [];
default: return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
}
}
function getTime(stages) {
let time = 0;
if (stages.includes('START_SKILL') && stages.includes('END_SKILL')) {
@ -212,7 +197,6 @@ module.exports = {
getFocusTargets,
getObjects,
getTime,
getSequence,
getText,
isCbAnim,
};

2
client/src/events.jsx
View File

@ -63,10 +63,10 @@ function registerEvents(store) {
if (game.resolved.length !== currentGame.resolved.length) {
store.dispatch(actions.setAnimating(true));
store.dispatch(actions.setGameSkillInfo(null));
// stop fetching the game state til animations are done
const newRes = game.resolved.slice(currentGame.resolved.length);
return eachSeries(newRes, (r, cb) => {
if (!r.event) return cb;
const timeout = animations.getTime(r.stages);
const anims = animations.getObjects(r, game, account);
const text = animations.getText(r);