jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

merge ckcz123

Browse Source
This commit is contained in:
echo 2017-12-31 01:16:58 +08:00
parent 04eaf07ed1
commit 9ce6ba8d3f
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/maps.js
View File

@ -82,20 +82,12 @@ maps.prototype.getBlock = function (x, y, id) {
// 在这里添加更多地形
// 如果空地不足，可以从180以后开始继续放，只要不和现有的数字冲突即可
<<<<<<< HEAD
=======
>>>>>>> 2d9278f8f68fe9b269b14ae545ac03f67f572815
// Autotile
if (id == 20) tmp.event = {'cls': 'autotile', 'id': 'autotile', 'noPass': true}; // autotile
// 更多的autotile从151到160，只要不和现有的数字冲突即可
if (id == 151) tmp.event = {'cls': 'autotile', 'id': 'autotile1', 'noPass': true};
if (id == 152) tmp.event = {'cls': 'autotile', 'id': 'autotile2', 'noPass': true};
if (id == 153) tmp.event = {'cls': 'autotile', 'id': 'autotile3', 'noPass': true};
<<<<<<< HEAD
=======
>>>>>>> 2d9278f8f68fe9b269b14ae545ac03f67f572815
////////////////////////// 物品部分 //////////////////////////