juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix scoring/damage hook up on beat hit/misses

Browse Source
This commit is contained in:
Kevin Ngo
2018-10-13 08:53:58 -07:00
parent 7960013914
commit 40d99e5df9
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/beat.js
View File

@@ -209,7 +209,7 @@ AFRAME.registerComponent('beat', {
wrongEl.object3D.position.y += 0.2;
wrongEl.object3D.position.z -= 0.5;
wrongEl.object3D.visible = true;
wrongEl.emit('wronghit', null, false);
wrongEl.emit('beatwrong', null, true);
this.destroyed = true;
},
@@ -220,7 +220,7 @@ AFRAME.registerComponent('beat', {
missEl.object3D.position.y += 0.2;
missEl.object3D.position.z -= 0.5;
missEl.object3D.visible = true;
missEl.emit('beatmiss', null, false);
missEl.emit('beatmiss', null, true);
},
destroyBeat: (function () {
@@ -432,7 +432,7 @@ AFRAME.registerComponent('beat', {
saberBoundingBox = saberEls[i].components['saber-controls'].boundingBox;
if (!boundingBox || !saberBoundingBox) { break; }
if (saberBoundingBox.intersectsBox(boundingBox)) {
this.el.emit('goodhit', null, false);
this.el.emit('beathit', null, true);
this.el.parentNode.components['beat-hit-sound'].playSound(this.el);
this.destroyBeat(saberEls[i]);
break;
@@ -441,7 +441,7 @@ AFRAME.registerComponent('beat', {
this.el.parentNode.components['beat-hit-sound'].playSound(this.el);
this.destroyBeat(saberEls[i]);
if (this.data.type === 'dot') {
this.el.emit('goodhit', null, false);
this.el.emit('beathit', null, true);
} else {
this.wrongHit(saberEls[i].getAttribute('saber-controls').hand);
}