ad

assets/javascripts/rooms.coffee

@@ -57,7 +57,7 @@ class Servers extends Spine.Controller
       for room in rooms
         if room._deleted
           Room.find(room.id).destroy() if Room.exists(room.id)
-      Room.refresh (room for room in rooms when !room._deleted)
+      Room.refresh ($.extend({rule: 0, mode: 0, enable_priority: false, no_check_deck: false, no_shuffle_deck: false,start_lp: 8000, start_hand: 5, draw_count: 1}, room) for room in rooms when !room._deleted)
     websocket.onerror = (evt)->
       console.log('websocket: Error occured: ' + evt.data);
 

assets/javascripts/rooms.js

@@ -112,7 +112,16 @@
           for (_j = 0, _len1 = rooms.length; _j < _len1; _j++) {
             room = rooms[_j];
             if (!room._deleted) {
-              _results.push(room);
+              _results.push($.extend({
+                rule: 0,
+                mode: 0,
+                enable_priority: false,
+                no_check_deck: false,
+                no_shuffle_deck: false,
+                start_lp: 8000,
+                start_hand: 5,
+                draw_count: 1
+              }, room));
             }
           }
           return _results;

assets/stylesheets/rooms.less

@@ -170,6 +170,9 @@ html, body {
   display: -ms-flexbox;
   display: box;
   .card_form {
+    width: 400px;
+  }
+  .ad_top{
     -webkit-box-flex: 1;
     -moz-box-flex: 1;
     -ms-flex: 1;
@@ -188,20 +191,16 @@ html, body {
     -ms-flex: 1;
     box-flex: 1;
     .room {
-      border: #cccccc 1px solid;
-      &:hover {
-        background: #eeeeee;
-      }
       float: left;
       width: 150px;
       height: 100px;
-      border-radius: 5px;
       margin: 5px;
-      background-color: white;
     }
   }
 }
 
+/*细节*/
+
 /*按钮*/
 .logging_button, #reconnect {
   cursor: pointer
@@ -257,3 +256,66 @@ html, body {
     li{height:25px}
   }
 }
+
+
+/* 房间内部 */
+.room{
+  border: #cccccc 1px solid;
+  &:hover {
+    background: #eeeeee;
+  }
+  cursor: default;
+  border-radius: 5px;
+  background-color: white;
+  .user{
+    overflow-x:hidden;
+    white-space:nowrap;
+  }
+  .room_users{
+    line-height:20px;
+    height: 40px;
+    overflow-y: auto;
+    .user{
+      height:20px;
+      &:hover {
+        background: lightskyblue;
+      }
+    }
+  }
+}
+/*
+.room.match {
+  border-color: orange;
+}
+.room.tag {
+  border-color: green;
+}
+.room.pvp {
+  border-color: red;
+}
+.room.special {
+  border-color: purple;
+} */
+.ad_top{
+  padding-top: 8px;
+  overflow-x: hidden;
+}
+
+.advertisement{
+  display: block;
+  z-index: 999;
+  width: 468px;
+  height: 60px;
+  border: 1px solid #dddddd;
+  bottom: 25px;
+  left: 8px;
+  background: #F9F9F9;
+  border-radius: 6px;
+  text-align: center;
+  line-height: 60px;
+  font-weight: bold;
+  color: #999999;
+  font-size: 16px;
+  letter-spacing: 2px;
+  cursor: pointer;
+}
\ No newline at end of file

rooms/index.html

@@ -58,7 +58,17 @@
     </script>
 
     <script id="room_template" type="text/x-jquery-tmpl">
-        <div class="room" id="room_${id}">
+        <div class="room
+        {{if (rule != 0) || enable_priority || no_check_deck || no_shuffle_deck || (start_lp != 8000) || (start_hand != 5) || (draw_count != 1)}}
+          special
+        {{else}}{{if pvp}}
+          pvp
+        {{/if}}{{if mode == 1}}
+          match
+        {{/if}}{{if mode == 2}}
+          tag
+        {{/if}}{{/if}}
+        ${status}" id="room_${id}">
             <span class="room_name">${name}</span>
             <span class="room_id">${id}</span>
             {{if private}}
@@ -122,6 +132,9 @@
             </ul>
         </div>
     </div>
+    <div class="ad_top">
+        <div class="advertisement" onclick="window.open('https://docs.google.com/forms/d/1otewQK8YfyWQH-8VABTfksbJdzYvWqW6OS89fPWh8OY/viewform')">调查: 如果在这里放置广告, 能够接受吗</div>
+    </div>
     <div class="log_reg not_logged">
         <a href="http://my-card.in/register">注册</a>
         <span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>