diff --git a/client/animations.test.js b/client/animations.test.js index b447e649..b6cbc772 100644 --- a/client/animations.test.js +++ b/client/animations.test.js @@ -8,7 +8,7 @@ require('./assets/styles/instance.less'); require('./assets/styles/vbox.less'); require('./assets/styles/game.less'); require('./assets/styles/player.less'); -require('./assets/styles/styles.mobile.css'); +require('./assets/styles/styles.mobile.less'); require('./assets/styles/instance.mobile.less'); require('./src/animations.test.jsx'); diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index c9729698..2e3b241c 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -12,6 +12,9 @@ html body { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; + + overflow-x: hidden; + overflow-y: hidden; } #mnml { diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less index 0b88dac7..f54478f2 100644 --- a/client/assets/styles/styles.mobile.less +++ b/client/assets/styles/styles.mobile.less @@ -1,4 +1,8 @@ @media (max-width: 800px) { + body { + overflow-y: initial; + } + #mnml { font-size: 12pt; padding: 0; @@ -11,7 +15,6 @@ height: 100vh; max-height: initial; min-height: initial; - overflow-y: initial; } table td { diff --git a/client/src/components/anims/siphon.jsx b/client/src/components/anims/siphon.jsx index 4ba6102b..cb1b376f 100644 --- a/client/src/components/anims/siphon.jsx +++ b/client/src/components/anims/siphon.jsx @@ -27,12 +27,9 @@ class Siphon extends Component { version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 300 400" + viewBox="0 0 300 300" opacity="0"> - - - - + ); } @@ -53,12 +50,7 @@ class Siphon extends Component { anime({ targets: '#siphon', - keyframes: [ - { r: '110', stroke: '#1FF01F' }, - { r: '80', stroke: '#1FF01F' }, - { r: '50', stroke: '#3050f8' }, - { r: '20', stroke: '#3050f8' }, - ], + r: 0, delay: TIMES.TARGET_DELAY_MS, duration, easing: 'easeInCubic', diff --git a/client/src/components/anims/siphon.tick.jsx b/client/src/components/anims/siphon.tick.jsx index 4a0b82e5..c431d5ca 100644 --- a/client/src/components/anims/siphon.tick.jsx +++ b/client/src/components/anims/siphon.tick.jsx @@ -20,9 +20,7 @@ function projectile(x, y, radius, colour) { cx={x} cy={y} r={radius} - fill="url(#grad1)" - stroke-width="0.1" - stroke={colour} + fill={colour} /> ); } @@ -44,24 +42,16 @@ class SiphonTick extends Component { version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 300 400"> + viewBox="0 0 300 300"> - - - - - - - - {this.charges} ); @@ -84,27 +74,23 @@ class SiphonTick extends Component { }); anime.set('#siphon', { - r: '80', + r: 0, stroke: '#3050f8', }); anime({ targets: '#siphon', - keyframes: [ - { r: '50', stroke: '#3050f8' }, - { r: '20', stroke: '#3050f8' }, - { r: '0', stroke: '#3050f8' }, - ], + r: 600, duration: duration * 2 / 3, - easing: 'easeInCubic', + easing: 'easeInSine', }); const projectiles = document.querySelectorAll('.skill-anim circle'); projectiles.forEach(proj => { anime({ targets: proj, - cx: Math.random() * 250 + 25, - cy: Math.random() * 200 - 100, + cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), + cy: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), delay: (Math.random() * duration * 1 / 2), duration, easing: 'easeInQuad',