Skip to content

Consider targetApp's vincibility. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gonnavis wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Consider targetApp's vincibility. #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
469245c
fix wearupdate event no player bug.
gonnavis May 26, 2022
577f22e
consider targetApp's vincibility.
gonnavis May 26, 2022
a20dca3
Links don't need add `@proxy` now.
gonnavis Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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,
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand All @@ -412,6 +412,7 @@ export default e => {

subApp.dispatchEvent({
type: 'wearupdate',
player,
wear,
});
}
Expand Down