Skip to content

S
srvpro
Commit f94f36f7 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into tcg_random

parents eca48c5c d4087134
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
data/i18n.json
View file @ f94f36f7
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"invalid_password_existed": "Password invalid (Already Existed)", "invalid_password_existed": "Password invalid (Already Existed)",
"invalid_password_not_found": "Password invalid (Not Found)", "invalid_password_not_found": "Password invalid (Not Found)",
"invalid_password_action": "Password invalid (Invalid Action)", "invalid_password_action": "Password invalid (Invalid Action)",
"invalid_password_checksum": "Password incorrect (Checksum Failed)", "invalid_password_checksum": "Password incorrect (Checksum Failed) (Please re-login your account.)",
"bad_user_name": "Please enter the correct ID", "bad_user_name": "Please enter the correct ID",
"server_full": "Server is full, please try again later.", "server_full": "Server is full, please try again later.",
"too_much_connection": "Too many clients running at the moment! ", "too_much_connection": "Too many clients running at the moment! ",
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
"invalid_password_existed": "主机密码不正确 (Already Existed)", "invalid_password_existed": "主机密码不正确 (Already Existed)",
"invalid_password_not_found": "主机密码不正确 (Not Found)", "invalid_password_not_found": "主机密码不正确 (Not Found)",
"invalid_password_action": "主机密码不正确 (Invalid Action)", "invalid_password_action": "主机密码不正确 (Invalid Action)",
"invalid_password_checksum": "主机密码不正确 (Checksum Failed)", "invalid_password_checksum": "主机密码不正确 (Checksum Failed) (请退出并重新登录你的账号)",
"bad_user_name": "请输入正确的用户名", "bad_user_name": "请输入正确的用户名",
"server_full": "服务器已经爆满，请稍候再试", "server_full": "服务器已经爆满，请稍候再试",
"too_much_connection": "同时开启的客户端数量过多 ", "too_much_connection": "同时开启的客户端数量过多 ",
......
ygopro-server.coffee
View file @ f94f36f7
...@@ -1799,9 +1799,9 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -1799,9 +1799,9 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
room_buffer.write(player_string, buffer_pos, 128, "utf8") room_buffer.write(player_string, buffer_pos, 128, "utf8")
buffer_pos += 128 buffer_pos += 128
if room.started if room.started
room_buffer.writeInt8((if room.scores[room_players[0].name_vpass]? then room.scores[room_players[0].name_vpass] else 0), buffer_pos) room_buffer.writeInt8((if room_players[0] and room.scores[room_players[0].name_vpass]? then room.scores[room_players[0].name_vpass] else 0), buffer_pos)
buffer_pos++ buffer_pos++
room_buffer.writeInt32LE((if room_players[0].lp? then room_players[0].lp else room.hostinfo.start_lp), buffer_pos) room_buffer.writeInt32LE((if room_players[0] and room_players[0].lp? then room_players[0].lp else room.hostinfo.start_lp), buffer_pos)
buffer_pos += 4 buffer_pos += 4
else else
room_buffer.writeInt8(0, buffer_pos) room_buffer.writeInt8(0, buffer_pos)
...@@ -1816,9 +1816,9 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -1816,9 +1816,9 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
room_buffer.write(player_string, buffer_pos, 128, "utf8") room_buffer.write(player_string, buffer_pos, 128, "utf8")
buffer_pos += 128 buffer_pos += 128
if room.started if room.started
room_buffer.writeInt8((if room.scores[room_players[oppo_pos].name_vpass]? then room.scores[room_players[oppo_pos].name_vpass] else 0), buffer_pos) room_buffer.writeInt8((if room_players[oppo_pos] and room.scores[room_players[oppo_pos].name_vpass]? then room.scores[room_players[oppo_pos].name_vpass] else 0), buffer_pos)
buffer_pos++ buffer_pos++
room_buffer.writeInt32LE((if room_players[oppo_pos].lp? then room_players[oppo_pos].lp else room.hostinfo.start_lp), buffer_pos) room_buffer.writeInt32LE((if room_players[oppo_pos] and room_players[oppo_pos].lp? then room_players[oppo_pos].lp else room.hostinfo.start_lp), buffer_pos)
buffer_pos += 4 buffer_pos += 4
else else
room_buffer.writeInt8(0, buffer_pos) room_buffer.writeInt8(0, buffer_pos)
......
ygopro-server.js
View file @ f94f36f7
...@@ -2279,9 +2279,9 @@ ...@@ -2279,9 +2279,9 @@
room_buffer.write(player_string, buffer_pos, 128, "utf8"); room_buffer.write(player_string, buffer_pos, 128, "utf8");
buffer_pos += 128; buffer_pos += 128;
if (room.started) { if (room.started) {
room_buffer.writeInt8((room.scores[room_players[0].name_vpass] != null ? room.scores[room_players[0].name_vpass] : 0), buffer_pos); room_buffer.writeInt8((room_players[0] && (room.scores[room_players[0].name_vpass] != null) ? room.scores[room_players[0].name_vpass] : 0), buffer_pos);
buffer_pos++; buffer_pos++;
room_buffer.writeInt32LE((room_players[0].lp != null ? room_players[0].lp : room.hostinfo.start_lp), buffer_pos); room_buffer.writeInt32LE((room_players[0] && (room_players[0].lp != null) ? room_players[0].lp : room.hostinfo.start_lp), buffer_pos);
buffer_pos += 4; buffer_pos += 4;
} else { } else {
room_buffer.writeInt8(0, buffer_pos); room_buffer.writeInt8(0, buffer_pos);
...@@ -2299,9 +2299,9 @@ ...@@ -2299,9 +2299,9 @@
room_buffer.write(player_string, buffer_pos, 128, "utf8"); room_buffer.write(player_string, buffer_pos, 128, "utf8");
buffer_pos += 128; buffer_pos += 128;
if (room.started) { if (room.started) {
room_buffer.writeInt8((room.scores[room_players[oppo_pos].name_vpass] != null ? room.scores[room_players[oppo_pos].name_vpass] : 0), buffer_pos); room_buffer.writeInt8((room_players[oppo_pos] && (room.scores[room_players[oppo_pos].name_vpass] != null) ? room.scores[room_players[oppo_pos].name_vpass] : 0), buffer_pos);
buffer_pos++; buffer_pos++;
room_buffer.writeInt32LE((room_players[oppo_pos].lp != null ? room_players[oppo_pos].lp : room.hostinfo.start_lp), buffer_pos); room_buffer.writeInt32LE((room_players[oppo_pos] && (room_players[oppo_pos].lp != null) ? room_players[oppo_pos].lp : room.hostinfo.start_lp), buffer_pos);
buffer_pos += 4; buffer_pos += 4;
} else { } else {
room_buffer.writeInt8(0, buffer_pos); room_buffer.writeInt8(0, buffer_pos);
......
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