Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

This commit is contained in:
Mashy
2019-02-22 13:00:38 +10:00
11 changed files with 120 additions and 1329 deletions
-1
View File
@@ -67,7 +67,6 @@ class MenuNavigation extends Phaser.Scene {
pveText.destroy();
pvp.destroy();
pvpText.destroy();
ws.sendGameJoinableList();
});
const cancel = this.add
-20
View File
@@ -77,10 +77,6 @@ function createSocket(events) {
send({ method: 'game_join', params: { game_id: gameId, cryp_ids: crypIds } });
}
function sendGameJoinableList() {
send({ method: 'game_joinable_list', params: { } });
}
function sendSpecForget(id, spec) {
send({ method: 'cryp_unspec', params: { id, spec } });
}
@@ -105,18 +101,10 @@ function createSocket(events) {
send({ method: 'player_vbox_combine', params: { instance_id: instanceId, indices } });
}
function sendVboxDrop(instanceId, index) {
send({ method: 'player_vbox_drop', params: { instance_id: instanceId, index } });
}
function sendPressR() {
send({ method: 'press_r', params: { } });
}
window.pressR = sendPressR;
function sendGameSkill(gameId, crypId, targetCrypId, skill) {
send({
method: 'game_skill',
@@ -154,7 +142,6 @@ function createSocket(events) {
account = login;
events.setAccount(login);
sendAccountCryps();
// sendGameJoinableList();
}
function accountCryps(response) {
@@ -167,11 +154,6 @@ function createSocket(events) {
events.setGame(game);
}
function gameJoinableList(response) {
const [structName, gameList] = response;
events.setGameList(gameList);
}
function crypSpawn(response) {
const [structName, cryp] = response;
}
@@ -202,7 +184,6 @@ function createSocket(events) {
cryp_learn: () => true,
game_pve: gamePve,
game_state: gameState,
game_joinable_list: gameJoinableList,
account_login: accountLogin,
account_create: accountLogin,
account_cryps: accountCryps,
@@ -290,7 +271,6 @@ function createSocket(events) {
sendGamePve,
sendGamePvp,
sendGameJoin,
sendGameJoinableList,
sendGameSkill,
sendGameTarget,
sendCrypSpawn,