From a7e7100032eeeb5044bc484693235421c7b04d42 Mon Sep 17 00:00:00 2001
From: echo <lzq.zheng@qq.com>
Date: Sun, 17 Dec 2017 22:37:21 +0800
Subject: [PATCH] merge form ckcz

---
 README.md    | 1 -
 libs/maps.js | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ba7776ea..9fdc6774 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 ## 简介
 
 HTML5 canvas制作的魔塔样板，支持全平台游戏！
-
 **即使完全不会编程的用户，按照模板和说明文档也能很快做出一个魔塔游戏！**
 
 * [Demo / 样板效果](http://ckcz123.com/games/template/)
diff --git a/libs/maps.js b/libs/maps.js
index 9a96bc2b..e5265838 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -78,18 +78,12 @@ maps.prototype.getBlock = function (x, y, id) {
     if (id == 12) tmp.event = {'cls': 'animates', 'id': 'poisonNet', 'noPass': false, 'trigger': 'passNet'}; // 毒网
     if (id == 13) tmp.event = {'cls': 'animates', 'id': 'weakNet', 'noPass': false, 'trigger': 'passNet'}; // 衰网
     if (id == 14) tmp.event = {'cls': 'animates', 'id': 'curseNet', 'noPass': false, 'trigger': 'passNet'}; // 咒网
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-=======
-=======
+
     if (id == 15) tmp.event = {'cls': 'animates', 'id': 'water', 'noPass': true}; // 水
->>>>>>> a6b50c17abdc856681917e5d3216f29aa9d8f9e1
 
     // autotile: 20
     if (id == 20) tmp.event = {'cls': 'autotile', 'id': 'autotile', 'noPass': true}; // autotile
 
->>>>>>> 0de35b6258ac07977783fbb03f6a2d491faf4cf1
     // 21-80 物品
     if (id == 21) tmp.event = {'cls': 'items', 'id': 'yellowKey'}; // 黄钥匙
     if (id == 22) tmp.event = {'cls': 'items', 'id': 'blueKey'}; // 蓝钥匙