Merge branch 'database' into databasen

ygopro-server.coffee

@@ -681,7 +681,7 @@ init = () ->
 # 获取可用内存
 memory_usage = global.memory_usage = 0
 get_memory_usage = global.get_memory_usage = ()->
-  percentUsed = os.freemem() * os.totalmem() * 100
+  percentUsed = os.freemem() / os.totalmem() * 100
   memory_usage = global.memory_usage = percentUsed
   return
 get_memory_usage()

ygopro-server.js

@@ -879,7 +879,7 @@
 
   get_memory_usage = global.get_memory_usage = function() {
     var percentUsed;
-    percentUsed = os.freemem() * os.totalmem() * 100;
+    percentUsed = os.freemem() / os.totalmem() * 100;
     memory_usage = global.memory_usage = percentUsed;
   };