Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge

Conflicts:
_server/vm.js
drawMapGUI.html
index.html
libs/core.js
libs/data.js
libs/enemys.js
libs/icons.js
libs/items.js
libs/maps.js
main.js
project/floors/sample1.js
project/images/yewai.png
project/images/常用素材：如需使用请直接替换目录中的对应文件/items1：圆形宝石.png
styles.css

_server/css/editor.css

@@ -47,6 +47,7 @@ body{
   white-space: pre;
   border: 1px solid #ddd;
   border-radius: 2px;
+  overflow: auto;
 }
 #editTip{
   position: absolute;
@@ -68,7 +69,6 @@ body{
   margin-right: 20px;
   margin-top: 5px;
 }
-
 #mid{
   position: absolute;
   left: 448px;