diff --git a/index.js b/index.js index 071cd2d..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, @@ -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; @@ -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, }); }