Commit 5a330d56 authored by 神楽坂玲奈's avatar 神楽坂玲奈

private

parent a8029d9c
...@@ -87,7 +87,7 @@ $(document).ready -> ...@@ -87,7 +87,7 @@ $(document).ready ->
room_id = $(this).data('room_id') room_id = $(this).data('room_id')
if Room.exists room_id if Room.exists room_id
room = Room.find(room_id) room = Room.find(room_id)
mycard.join(room.server().ip, room.server().port, mycard.room_name(room.name, null, room.pvp, room.rule, room.mode, room.start_lp)) mycard.join(room.server().ip, room.server().port, mycard.room_name(room.name, @password.value, room.pvp, room.rule, room.mode, room.start_lp))
else else
alert '房间已经关闭' alert '房间已经关闭'
......
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
room_id = $(this).data('room_id'); room_id = $(this).data('room_id');
if (Room.exists(room_id)) { if (Room.exists(room_id)) {
room = Room.find(room_id); room = Room.find(room_id);
return mycard.join(room.server().ip, room.server().port, mycard.room_name(room.name, null, room.pvp, room.rule, room.mode, room.start_lp)); return mycard.join(room.server().ip, room.server().port, mycard.room_name(room.name, this.password.value, room.pvp, room.rule, room.mode, room.start_lp));
} else { } else {
return alert('房间已经关闭'); return alert('房间已经关闭');
} }
......
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