fix
All checks were successful
Create and publish a Docker image 🚀 / build-and-push-image (push) Successful in 1m20s
All checks were successful
Create and publish a Docker image 🚀 / build-and-push-image (push) Successful in 1m20s
This commit is contained in:
@@ -2,12 +2,29 @@ import Phaser from "phaser";
|
|||||||
|
|
||||||
export class RemotePlayer {
|
export class RemotePlayer {
|
||||||
sprite: Phaser.GameObjects.Rectangle;
|
sprite: Phaser.GameObjects.Rectangle;
|
||||||
|
label: Phaser.GameObjects.Text;
|
||||||
|
|
||||||
targetX: number;
|
targetX: number;
|
||||||
targetY: number;
|
targetY: number;
|
||||||
|
|
||||||
constructor(scene: Phaser.Scene, x: number, y: number, color: number) {
|
constructor(
|
||||||
|
scene: Phaser.Scene,
|
||||||
|
x: number,
|
||||||
|
y: number,
|
||||||
|
name: string,
|
||||||
|
color: number,
|
||||||
|
) {
|
||||||
this.sprite = scene.add.rectangle(x, y, 32, 32, color);
|
this.sprite = scene.add.rectangle(x, y, 32, 32, color);
|
||||||
|
|
||||||
|
this.label = scene.add
|
||||||
|
.text(x, y - 26, name, {
|
||||||
|
fontSize: "12px",
|
||||||
|
color: "#ffffff",
|
||||||
|
stroke: "#000000",
|
||||||
|
strokeThickness: 3,
|
||||||
|
})
|
||||||
|
.setOrigin(0.5);
|
||||||
|
|
||||||
this.targetX = x;
|
this.targetX = x;
|
||||||
this.targetY = y;
|
this.targetY = y;
|
||||||
}
|
}
|
||||||
@@ -18,12 +35,17 @@ export class RemotePlayer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
// магия сглаживания
|
// интерполяция позиции
|
||||||
this.sprite.x = Phaser.Math.Linear(this.sprite.x, this.targetX, 0.15);
|
this.sprite.x = Phaser.Math.Linear(this.sprite.x, this.targetX, 0.15);
|
||||||
this.sprite.y = Phaser.Math.Linear(this.sprite.y, this.targetY, 0.15);
|
this.sprite.y = Phaser.Math.Linear(this.sprite.y, this.targetY, 0.15);
|
||||||
|
|
||||||
|
// ник всегда над игроком
|
||||||
|
this.label.x = this.sprite.x;
|
||||||
|
this.label.y = this.sprite.y - 26;
|
||||||
}
|
}
|
||||||
|
|
||||||
destroy() {
|
destroy() {
|
||||||
this.sprite.destroy();
|
this.sprite.destroy();
|
||||||
|
this.label.destroy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
|
declare global {
|
||||||
|
interface Window {
|
||||||
|
Telegram?: {
|
||||||
|
WebApp: {
|
||||||
|
initData: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class GameSocket {
|
export class GameSocket {
|
||||||
private socket: WebSocket;
|
private socket: WebSocket;
|
||||||
playerId: string | null = null;
|
playerId: string | null = null;
|
||||||
@@ -6,6 +16,17 @@ export class GameSocket {
|
|||||||
constructor(url: string) {
|
constructor(url: string) {
|
||||||
this.socket = new WebSocket(url);
|
this.socket = new WebSocket(url);
|
||||||
|
|
||||||
|
this.socket.onopen = () => {
|
||||||
|
const initData = window.Telegram?.WebApp?.initData ?? "";
|
||||||
|
|
||||||
|
this.socket.send(
|
||||||
|
JSON.stringify({
|
||||||
|
type: "auth",
|
||||||
|
initData,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
this.socket.onmessage = (e) => {
|
this.socket.onmessage = (e) => {
|
||||||
const msg = JSON.parse(e.data);
|
const msg = JSON.parse(e.data);
|
||||||
|
|
||||||
@@ -17,6 +38,10 @@ export class GameSocket {
|
|||||||
this.onState?.(msg.payload);
|
this.onState?.(msg.payload);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.socket.onerror = (e) => {
|
||||||
|
console.error("WebSocket error", e);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
sendInput(dx: number, dy: number) {
|
sendInput(dx: number, dy: number) {
|
||||||
@@ -24,6 +49,7 @@ export class GameSocket {
|
|||||||
|
|
||||||
this.socket.send(
|
this.socket.send(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
|
type: "input",
|
||||||
dx,
|
dx,
|
||||||
dy,
|
dy,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
|
import Phaser from "phaser";
|
||||||
import { RemotePlayer } from "../entities/RemotePlayer";
|
import { RemotePlayer } from "../entities/RemotePlayer";
|
||||||
import { TouchInput } from "../input/TouchInput";
|
import { TouchInput } from "../input/TouchInput";
|
||||||
import { GameSocket } from "../net/Socket";
|
import { GameSocket } from "../net/Socket";
|
||||||
|
|
||||||
|
type ServerPlayerState = {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
name: string;
|
||||||
|
};
|
||||||
|
|
||||||
export class GameScene extends Phaser.Scene {
|
export class GameScene extends Phaser.Scene {
|
||||||
players = new Map<string, RemotePlayer>();
|
players = new Map<string, RemotePlayer>();
|
||||||
socket!: GameSocket;
|
socket!: GameSocket;
|
||||||
@@ -24,7 +31,8 @@ export class GameScene extends Phaser.Scene {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
syncPlayers(serverPlayers: Record<string, { x: number; y: number }>) {
|
syncPlayers(serverPlayers: Record<string, ServerPlayerState>) {
|
||||||
|
// добавление / обновление
|
||||||
for (const id in serverPlayers) {
|
for (const id in serverPlayers) {
|
||||||
const data = serverPlayers[id];
|
const data = serverPlayers[id];
|
||||||
let player = this.players.get(id);
|
let player = this.players.get(id);
|
||||||
@@ -32,13 +40,22 @@ export class GameScene extends Phaser.Scene {
|
|||||||
if (!player) {
|
if (!player) {
|
||||||
const isMe = id === this.socket.playerId;
|
const isMe = id === this.socket.playerId;
|
||||||
const color = isMe ? 0x00ff00 : 0xff4444;
|
const color = isMe ? 0x00ff00 : 0xff4444;
|
||||||
player = new RemotePlayer(this, data.x, data.y, color);
|
|
||||||
|
player = new RemotePlayer(
|
||||||
|
this,
|
||||||
|
data.x,
|
||||||
|
data.y,
|
||||||
|
data.name, // 👈 username от сервера
|
||||||
|
color,
|
||||||
|
);
|
||||||
|
|
||||||
this.players.set(id, player);
|
this.players.set(id, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setTarget(data.x, data.y);
|
player.setTarget(data.x, data.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// удаление отключившихся
|
||||||
for (const [id, player] of this.players) {
|
for (const [id, player] of this.players) {
|
||||||
if (!serverPlayers[id]) {
|
if (!serverPlayers[id]) {
|
||||||
player.destroy();
|
player.destroy();
|
||||||
|
|||||||
Reference in New Issue
Block a user