WIP
This commit is contained in:
@@ -220,7 +220,7 @@ $(async function () {
|
||||
super(emote,data)
|
||||
let speed = randRange(5,15);
|
||||
let fang = 2*Math.PI* (args.angle/360)
|
||||
let ang = randRange(-fang/2, +fang/2)+Math.PI/2 ;//+ 2*(angle/360)*Math.PI;
|
||||
let ang = randRange(-fang/2, +fang/2)+Math.PI/2;
|
||||
this.setPhysics(args.x,args.y,
|
||||
Math.cos(ang)*speed,
|
||||
-Math.sin(ang)*speed,
|
||||
@@ -244,7 +244,7 @@ $(async function () {
|
||||
super.update(tick);
|
||||
if(this.y <= canvas.height/4 && this.time < drt){
|
||||
this.time = drt;
|
||||
genExplosion(this.x,this.y,360)
|
||||
genExplosion(this.x,this.y,360, this.sete)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -263,7 +263,7 @@ $(async function () {
|
||||
super.update(tick);
|
||||
if(this.y >= canvas.height - this.size && this.time < drt){
|
||||
this.time = drt;
|
||||
genExplosion(this.x,this.y,60)
|
||||
genExplosion(this.x,this.y,60, this.sete)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -275,25 +275,25 @@ $(async function () {
|
||||
setTimeout(()=>{particles.pop()}, drt*1000+2000);
|
||||
}
|
||||
|
||||
const genExplosion = (x,y,ang) =>{
|
||||
for(let i=0; i<100; ++i) createParticule(ExplosionP, randEmote(), {},{x:x,y:y,angle:ang});
|
||||
const genExplosion = (x,y,ang,em) =>{
|
||||
for(let i=0; i<100; ++i) createParticule(ExplosionP, em? em:randEmote(), {},{x:x,y:y,angle:ang});
|
||||
}
|
||||
|
||||
const genRain = () => {
|
||||
const genRain = (em) => {
|
||||
let xpos = randRange(0, canvas.width);
|
||||
let time = 0;
|
||||
const interval = setInterval(()=>{
|
||||
for(let i=0; i<10; ++i) createParticule(RainP, randEmote(), {},{});
|
||||
for(let i=0; i<10; ++i) createParticule(RainP, em? em:randEmote(), {},{});
|
||||
++time;
|
||||
if(time > 50) clearInterval(interval);
|
||||
}, 100);
|
||||
}
|
||||
|
||||
const genVolcano = () => {
|
||||
const genVolcano = (em) => {
|
||||
let xpos = randRange(0, canvas.width);
|
||||
let time = 0;
|
||||
const interval = setInterval(()=>{
|
||||
for(let i=0; i<10; ++i) createParticule(ExplosionP, randEmote(), {},{x:xpos,y:canvas.height,angle:30});
|
||||
for(let i=0; i<10; ++i) createParticule(ExplosionP, em? em:randEmote(), {},{x:xpos,y:canvas.height,angle:30});
|
||||
++time;
|
||||
if(time > 50) clearInterval(interval);
|
||||
}, 100);
|
||||
@@ -336,13 +336,25 @@ $(async function () {
|
||||
let rawMessage = e.data,
|
||||
message = JSON.parse(rawMessage);
|
||||
|
||||
if(!message.hasOwnProperty('eventFamily') || message.eventFamily != 'emotewall' ||
|
||||
if(!message.hasOwnProperty('eventFamily') || message.eventFamily != 'emote' ||
|
||||
!message.hasOwnProperty('eventType') || !message.hasOwnProperty('data'))
|
||||
return;
|
||||
|
||||
console.log(message.eventType, message.data)
|
||||
if(message.eventType == 'message') {
|
||||
//....
|
||||
if(message.eventType == 'bounce') {
|
||||
createParticule(BounceP, message.data, {}, {})
|
||||
}else if(message.eventType == 'rain') {
|
||||
genRain(message.data)
|
||||
}else if(message.eventType == 'firework') {
|
||||
genFirework(message.data)
|
||||
}else if(message.eventType == 'volcano') {
|
||||
genVolcano(message.data)
|
||||
}else if(message.eventType == 'bomb') {
|
||||
createParticule(BombP, message.data, {}, {})
|
||||
}else if(message.eventType == 'explosion') {
|
||||
//genExplosion(message.data)
|
||||
}else {
|
||||
console.log("unhandled:", message.eventType)
|
||||
}
|
||||
} catch (ex) {
|
||||
console.log(ex)
|
||||
@@ -353,7 +365,7 @@ $(async function () {
|
||||
jQuery(async ()=>{
|
||||
|
||||
try{
|
||||
socket.addFamilyHandler("overlay", handleSocketMessage);
|
||||
socket.addFamilyHandler("emote", handleSocketMessage);
|
||||
if(socket){
|
||||
while(socket.getReadyState() === 0){
|
||||
await new Promise(r => setTimeout(r, 500));
|
||||
|
Reference in New Issue
Block a user