From 469245c02eb5d3776a61d5bbc4ef7520b5b2b63b Mon Sep 17 00:00:00 2001 From: gonnavis Date: Fri, 27 May 2022 01:43:57 +0800 Subject: [PATCH 1/3] fix wearupdate event no player bug. --- index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 071cd2d..f75d895 100644 --- a/index.js +++ b/index.js @@ -403,7 +403,7 @@ export default e => { let wearing = false; useWear(e => { - const {wear} = e; + const {wear, player} = e; for (const subApp of subApps) { subApp.position.copy(app.position); subApp.quaternion.copy(app.quaternion); @@ -412,6 +412,7 @@ export default e => { subApp.dispatchEvent({ type: 'wearupdate', + player, wear, }); } From 577f22e274a43136be3bff0392c34f37d1bb2073 Mon Sep 17 00:00:00 2001 From: gonnavis Date: Fri, 27 May 2022 01:53:24 +0800 Subject: [PATCH 2/3] consider targetApp's vincibility. --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index f75d895..3ae8ef9 100644 --- a/index.js +++ b/index.js @@ -352,7 +352,7 @@ export default e => { bulletPointLight.startTime = performance.now(); bulletPointLight.endTime = bulletPointLight.startTime + bulletSparkTime; - if (targetApp) { + if (targetApp && targetApp.getComponent('vincibility') !== 'invincible') { const localPlayer = useLocalPlayer(); const damage = 2; From a20dca346595e34f10e7152086b96dad2c23330c Mon Sep 17 00:00:00 2001 From: gonnavis Date: Fri, 28 Oct 2022 22:06:41 +0800 Subject: [PATCH 3/3] Links don't need add `@proxy` now. --- index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 3ae8ef9..82bd27a 100644 --- a/index.js +++ b/index.js @@ -115,9 +115,9 @@ export default e => { e.waitUntil((async () => { { let u2 = `https://webaverse.github.io/pixelsplosion/`; - if (/^https?:/.test(u2)) { - u2 = '/@proxy/' + u2; - } + // if (/^https?:/.test(u2)) { + // u2 = '/@proxy/' + u2; + // } const m = await metaversefile.import(u2); // console.log('group objects 3', u2, m); explosionApp = metaversefile.createApp({ @@ -140,9 +140,9 @@ export default e => { { let u2 = `${baseUrl}uzi.glb`; - if (/^https?:/.test(u2)) { - u2 = '/@proxy/' + u2; - } + // if (/^https?:/.test(u2)) { + // u2 = '/@proxy/' + u2; + // } const m = await metaversefile.import(u2); gunApp = metaversefile.createApp({ name: u2,