diff --git a/package-lock.json b/package-lock.json index 3a27fae..720fbc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3408,9 +3408,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.792", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.792.tgz", - "integrity": "sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==", + "version": "1.4.795", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.795.tgz", + "integrity": "sha512-hHo4lK/8wb4NUa+NJYSFyJ0xedNHiR6ylilDtb8NUW9d4dmBFmGiecYEKCEbti1wTNzbKXLfl4hPWEkAFbHYlw==", "dev": true, "license": "ISC" }, @@ -6591,9 +6591,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.2.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz", - "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==", + "version": "5.2.13", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz", + "integrity": "sha512-SSq1noJfY9pR3I1TUENL3rQYDQCFqgD+lM6fTRAM8Nv6Lsg5hDLaXkjETVeBt+7vZBCMoibD+6IWnT2mJ+Zb/A==", "dev": true, "license": "MIT", "dependencies": { diff --git a/public/assets/avatar/default/1.png b/public/assets/avatar/default/1.png deleted file mode 100644 index 965d5e4..0000000 Binary files a/public/assets/avatar/default/1.png and /dev/null differ diff --git a/public/assets/avatar/default/2.png b/public/assets/avatar/default/2.png deleted file mode 100644 index 0ac3732..0000000 Binary files a/public/assets/avatar/default/2.png and /dev/null differ diff --git a/public/assets/avatar/default/3.png b/public/assets/avatar/default/3.png deleted file mode 100644 index b4c4da6..0000000 Binary files a/public/assets/avatar/default/3.png and /dev/null differ diff --git a/public/assets/avatar/default/4.png b/public/assets/avatar/default/4.png deleted file mode 100644 index dbdeb41..0000000 Binary files a/public/assets/avatar/default/4.png and /dev/null differ diff --git a/public/assets/avatar/default/anim.png b/public/assets/avatar/default/anim.png deleted file mode 100644 index b8fd4e5..0000000 Binary files a/public/assets/avatar/default/anim.png and /dev/null differ diff --git a/public/assets/avatar/default/walk.png b/public/assets/avatar/default/walk.png new file mode 100644 index 0000000..3479ee4 Binary files /dev/null and b/public/assets/avatar/default/walk.png differ diff --git a/public/assets/avatar/default/yeet.png b/public/assets/avatar/default/yeet.png deleted file mode 100644 index 5b876f0..0000000 Binary files a/public/assets/avatar/default/yeet.png and /dev/null differ diff --git a/src/components/Game.vue b/src/components/Game.vue index 02362f3..9b27fa2 100644 --- a/src/components/Game.vue +++ b/src/components/Game.vue @@ -2,8 +2,8 @@
- - + + @@ -40,7 +40,7 @@ const gameConfig = { pixelArt: true } -const bootGame = (game: Phaser.Game) => { +const createGame = (game: Phaser.Game) => { window.addEventListener('resize', () => { game.scale.resize(window.innerWidth, window.innerHeight) }) @@ -58,9 +58,13 @@ const preloadScene = (scene: Phaser.Scene) => { 'character', 'data:image/png;base64,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' ) + scene.load.spritesheet('characterW', '/assets/avatar/default/walk.png', { frameWidth: 36, frameHeight: 94 }) } -const bootScene = (scene: Phaser.Scene) => { +const playScene = (scene: Phaser.Scene) => { +} + +const createScene = (scene: Phaser.Scene) => { // Camera drag system let cam = scene.cameras.main scene.input.on('pointermove', function (pointer: Pointer) { @@ -69,6 +73,14 @@ const bootScene = (scene: Phaser.Scene) => { cam.scrollY -= (pointer.y - pointer.prevPosition.y) / cam.zoom }) + scene.anims.create({ + key: "walk", + frameRate: 7, + frames: scene.anims.generateFrameNumbers("characterW", { start: 0, end: 3 }), + repeat: -1, + }); + + // const grid = scene.add.grid(0, 0, window.innerWidth, window.innerHeight, 64, 32, 0, 0, 0xff0000, 0.5).setOrigin(0, 0); // // window.addEventListener('resize', () => { diff --git a/src/components/World.vue b/src/components/World.vue index 23139ec..c0f3b90 100644 --- a/src/components/World.vue +++ b/src/components/World.vue @@ -14,7 +14,7 @@ import { Container, TilemapLayer as TilemapLayerC, useScene } from 'phavuer' import Character from '@/components/sprites/Character.vue' import { type Character as CharacterType } from '@/types' import { onBeforeMount, ref, type Ref, watch } from 'vue' -import Controls from '@/components/Controls.vue' +import Controls from '@/components/utilities/Controls.vue' import { useSocketStore } from '@/stores/socket' import { useZoneStore } from '@/stores/zone' diff --git a/src/components/game/Hud.vue b/src/components/game/Hud.vue index a43c1d1..bddffa9 100644 --- a/src/components/game/Hud.vue +++ b/src/components/game/Hud.vue @@ -4,12 +4,29 @@
-
+
+
+ {{ socket.getCharacter.name }} + lvl. {{ socket.getCharacter.level }} +
+
+ + 21% +
+
+ + 69% +
+
- +