Commit 61c5fdb7 authored by Vũ Gia Vương's avatar Vũ Gia Vương

build

parent 4ed14930
...@@ -60,7 +60,6 @@ function endGameApi(user) { ...@@ -60,7 +60,6 @@ function endGameApi(user) {
gameLevel: user.towerNumber - 1, gameLevel: user.towerNumber - 1,
details details
}; };
console.log('END GAME');
const res = yield callApi(URL_END_GAME, 'POST', params); const res = yield callApi(URL_END_GAME, 'POST', params);
return res; return res;
} }
......
...@@ -13,20 +13,23 @@ const io = new socket_io_1.Server(server, { ...@@ -13,20 +13,23 @@ const io = new socket_io_1.Server(server, {
path: '/socket', path: '/socket',
cors: { cors: {
methods: ["GET", "POST"], methods: ["GET", "POST"],
origin: (origin, callback) => { origin: [
console.log('origin', origin);
const allowed = [
"https://play.gamee.vn", "https://play.gamee.vn",
"https://dev.gamee.vn", "https://dev.gamee.vn",
"http://localhost:7456" "http://localhost:7456"
]; ]
if (!origin || allowed.includes(origin)) { // origin: (origin, callback) => {
callback(null, origin); // const allowed = [
} // "https://play.gamee.vn",
else { // "https://dev.gamee.vn",
callback(new Error("Not allowed by CORS")); // "http://localhost:7456"
} // ];
}, // if (!origin || allowed.includes(origin)) {
// callback(null, origin);
// } else {
// callback(new Error("Not allowed by CORS"));
// }
// },
// credentials: true, // credentials: true,
} }
}); });
......
...@@ -115,10 +115,14 @@ function passTower(socket, data) { ...@@ -115,10 +115,14 @@ function passTower(socket, data) {
const { direction, nextBlock, towerNumber, position } = user; const { direction, nextBlock, towerNumber, position } = user;
if (towerNumber > MAX_TOWER) { if (towerNumber > MAX_TOWER) {
let speed = INIT_SPEED; let speed = INIT_SPEED;
for (let i = 0; i < data.step; i++) { // data.step = Math.min(data.step, 150);
speed += (Math.min(towerNumber - MAX_TOWER, A_POWER) * DT); // for (let i = 0; i < data.step; i++) {
xDistance_ += speed * DT; // speed += (Math.min(towerNumber - MAX_TOWER, A_POWER) * DT);
} // xDistance_ += speed * DT;
// }
const acceleration = Math.min(towerNumber - MAX_TOWER, A_POWER) * DT;
speed += data.step * acceleration;
xDistance_ += INIT_SPEED * data.step * DT + acceleration * DT * (data.step * (data.step - 1)) / 2;
} }
else { else {
xDistance_ = data.step * INIT_SPEED * DT; xDistance_ = data.step * INIT_SPEED * DT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment