diff --git a/drawMapGUI.html b/drawMapGUI.html index 5c983602..309a9165 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -87,7 +87,7 @@

资源即将开始加载

- +
@@ -110,39 +110,39 @@
- +

- +

- +

- +

- +

- +

- +

- +

- +

@@ -157,13 +157,13 @@
- - - - - - - + + + + + + +

diff --git a/index.html b/index.html index d59b0e43..a8d12214 100644 --- a/index.html +++ b/index.html @@ -25,7 +25,7 @@

资源即将开始加载

- +
@@ -48,39 +48,39 @@
- +

- +

- +

- +

- +

- +

- +

- +

- +

@@ -95,13 +95,13 @@
- - - - - - - + + + + + + +

diff --git a/libs/core.js b/libs/core.js index 12ac4980..11a9bc9b 100644 --- a/libs/core.js +++ b/libs/core.js @@ -181,7 +181,7 @@ core.prototype.init = function (dom, statusBar, canvas, images, pngs, bgms, soun core.flags.displayExtraDamage = core.getLocalStorage('extraDamage', core.flags.displayExtraDamage); core.material.ground = new Image(); - core.material.ground.src = "images/ground.png"; + core.material.ground.src = "project/images/ground.png"; core.loader(function () { console.log(core.material); @@ -298,7 +298,7 @@ core.prototype.loadImage = function (imgName, callback) { if (name.indexOf(".png")<0) // 不包含"png" name=name+".png"; var image = new Image(); - image.src = 'images/' + name + "?v=" + main.version; + image.src = 'project/images/' + name + "?v=" + main.version; if (image.complete) { callback(imgName, image); return; @@ -323,7 +323,7 @@ core.prototype.loadMusic = function (callback) { if (core.musicStatus.audioContext!=null) { core.material.bgms[t] = 'loading'; var xhr = new XMLHttpRequest(); - xhr.open('GET', 'sounds/'+t, true); + xhr.open('GET', 'project/sounds/'+t, true); xhr.overrideMimeType("text/plain; charset=x-user-defined"); xhr.onload = function(e) { //下载完成 try { @@ -360,7 +360,7 @@ core.prototype.loadMusic = function (callback) { else { var music = new Audio(); music.preload = core.musicStatus.startDirectly?'auto':'none'; - music.src = 'sounds/'+t; + music.src = 'project/sounds/'+t; music.loop = 'loop'; core.material.bgms[t] = music; } @@ -370,7 +370,7 @@ core.prototype.loadMusic = function (callback) { if (core.musicStatus.audioContext != null) { var xhr = new XMLHttpRequest(); - xhr.open('GET', 'sounds/'+t, true); + xhr.open('GET', 'project/sounds/'+t, true); xhr.responseType = 'arraybuffer'; xhr.onload = function(e) { //下载完成 try { @@ -399,7 +399,7 @@ core.prototype.loadMusic = function (callback) { } else { var music = new Audio(); - music.src = 'sounds/'+t; + music.src = 'project/sounds/'+t; core.material.sounds[t] = music; } @@ -990,8 +990,8 @@ core.prototype.onmousewheel = function (direct) { // 怪物手册 if (core.status.lockControl && core.status.event.id == 'book') { - if (direct==1) core.ui.drawBook(core.status.event.data - 1); - if (direct==-1) core.ui.drawBook(core.status.event.data + 1); + if (direct==1) core.ui.drawBook(core.status.event.data - 6); + if (direct==-1) core.ui.drawBook(core.status.event.data + 6); return; } diff --git a/main.js b/main.js index 8efdf81d..1e3ff0d6 100644 --- a/main.js +++ b/main.js @@ -154,7 +154,7 @@ main.prototype.loaderFloors = function (callback) { main.setMainTipsText('正在加载楼层文件...') if (this.useCompress) { // 读取压缩文件 var script = document.createElement('script'); - script.src = 'libs/project/floors.min.js?v=' + this.version; + script.src = 'project/floors.min.js?v=' + this.version; main.dom.body.appendChild(script); script.onload = function () { main.dom.mainTips.style.display = 'none'; @@ -189,7 +189,7 @@ main.prototype.loadMod = function (modName, callback) { ////// 加载某一个楼层 ////// main.prototype.loadFloor = function(floorId, callback) { var script = document.createElement('script'); - script.src = 'libs/project/floors/' + floorId +'.js?v=' + this.version; + script.src = 'project/floors/' + floorId +'.js?v=' + this.version; main.dom.body.appendChild(script); script.onload = function () { callback(floorId); @@ -200,7 +200,7 @@ main.prototype.loadPureData = function(callback) { var loadedNum = 0; main.pureData.forEach(function(name){ var script = document.createElement('script'); - script.src = 'libs/project/' + name +'.js?v=' + this.version; + script.src = 'project/' + name +'.js?v=' + main.version; main.dom.body.appendChild(script); script.onload = function () { loadedNum++; diff --git a/libs/project/comment.js b/project/comment.js similarity index 100% rename from libs/project/comment.js rename to project/comment.js diff --git a/libs/project/data.js b/project/data.js similarity index 100% rename from libs/project/data.js rename to project/data.js diff --git a/libs/project/enemys.js b/project/enemys.js similarity index 100% rename from libs/project/enemys.js rename to project/enemys.js diff --git a/libs/project/floors/MT0.js b/project/floors/MT0.js similarity index 100% rename from libs/project/floors/MT0.js rename to project/floors/MT0.js diff --git a/libs/project/floors/sample0.js b/project/floors/sample0.js similarity index 99% rename from libs/project/floors/sample0.js rename to project/floors/sample0.js index aee78417..857473d0 100644 --- a/libs/project/floors/sample0.js +++ b/project/floors/sample0.js @@ -65,7 +65,7 @@ main.floors.sample0 = { ], "2,3": [ // 守着第三批怪物的老人 "\t[老人,magician]领域、夹击。\n请注意领域怪需要设置value为伤害数值,可参见样板中初级巫师的写法。", - "\t[老人,magician]夹击和领域同时发生时先计算领域,再夹击。\n自动寻路同样会尽量绕过你设置的这些点。\n\n另:本塔不支持阻击怪。", + "\t[老人,magician]夹击和领域同时发生时先计算领域,再夹击。\n自动寻路同样会尽量绕过你设置的这些点。", {"type": "hide", "time": 500} ], "12,10": { // 隐藏的仙子 diff --git a/libs/project/floors/sample1.js b/project/floors/sample1.js similarity index 100% rename from libs/project/floors/sample1.js rename to project/floors/sample1.js diff --git a/libs/project/floors/sample2.js b/project/floors/sample2.js similarity index 100% rename from libs/project/floors/sample2.js rename to project/floors/sample2.js diff --git a/libs/project/floors/test.js b/project/floors/test.js similarity index 100% rename from libs/project/floors/test.js rename to project/floors/test.js diff --git a/libs/project/icons.js b/project/icons.js similarity index 100% rename from libs/project/icons.js rename to project/icons.js diff --git a/images/animates.png b/project/images/animates.png similarity index 100% rename from images/animates.png rename to project/images/animates.png diff --git a/images/atk.png b/project/images/atk.png similarity index 100% rename from images/atk.png rename to project/images/atk.png diff --git a/images/autotile.png b/project/images/autotile.png similarity index 100% rename from images/autotile.png rename to project/images/autotile.png diff --git a/images/autotile1.png b/project/images/autotile1.png similarity index 100% rename from images/autotile1.png rename to project/images/autotile1.png diff --git a/images/autotile2.png b/project/images/autotile2.png similarity index 100% rename from images/autotile2.png rename to project/images/autotile2.png diff --git a/images/autotile3.png b/project/images/autotile3.png similarity index 100% rename from images/autotile3.png rename to project/images/autotile3.png diff --git a/images/bg.png b/project/images/bg.png similarity index 100% rename from images/bg.png rename to project/images/bg.png diff --git a/images/book.png b/project/images/book.png similarity index 100% rename from images/book.png rename to project/images/book.png diff --git a/images/def.png b/project/images/def.png similarity index 100% rename from images/def.png rename to project/images/def.png diff --git a/images/enemys.png b/project/images/enemys.png similarity index 100% rename from images/enemys.png rename to project/images/enemys.png diff --git a/images/experience.png b/project/images/experience.png similarity index 100% rename from images/experience.png rename to project/images/experience.png diff --git a/images/floor.png b/project/images/floor.png similarity index 100% rename from images/floor.png rename to project/images/floor.png diff --git a/images/fly.png b/project/images/fly.png similarity index 100% rename from images/fly.png rename to project/images/fly.png diff --git a/images/ground.png b/project/images/ground.png similarity index 100% rename from images/ground.png rename to project/images/ground.png diff --git a/images/hero.png b/project/images/hero.png similarity index 100% rename from images/hero.png rename to project/images/hero.png diff --git a/images/hp.png b/project/images/hp.png similarity index 100% rename from images/hp.png rename to project/images/hp.png diff --git a/images/items.png b/project/images/items.png similarity index 100% rename from images/items.png rename to project/images/items.png diff --git a/images/load.png b/project/images/load.png similarity index 100% rename from images/load.png rename to project/images/load.png diff --git a/images/lv.png b/project/images/lv.png similarity index 100% rename from images/lv.png rename to project/images/lv.png diff --git a/images/mdef.png b/project/images/mdef.png similarity index 100% rename from images/mdef.png rename to project/images/mdef.png diff --git a/images/money.png b/project/images/money.png similarity index 100% rename from images/money.png rename to project/images/money.png diff --git a/images/npcs.png b/project/images/npcs.png similarity index 100% rename from images/npcs.png rename to project/images/npcs.png diff --git a/images/save.png b/project/images/save.png similarity index 100% rename from images/save.png rename to project/images/save.png diff --git a/images/settings.png b/project/images/settings.png similarity index 100% rename from images/settings.png rename to project/images/settings.png diff --git a/images/shop.png b/project/images/shop.png similarity index 100% rename from images/shop.png rename to project/images/shop.png diff --git a/images/terrains.png b/project/images/terrains.png similarity index 100% rename from images/terrains.png rename to project/images/terrains.png diff --git a/images/toolbox.png b/project/images/toolbox.png similarity index 100% rename from images/toolbox.png rename to project/images/toolbox.png diff --git a/images/up.png b/project/images/up.png similarity index 100% rename from images/up.png rename to project/images/up.png diff --git a/images/yewai.png b/project/images/yewai.png similarity index 100% rename from images/yewai.png rename to project/images/yewai.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile0.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile0.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile0.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile0.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile1.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile1.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile1.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile1.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile10.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile10.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile10.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile10.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile11.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile11.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile11.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile11.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile12.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile12.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile12.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile12.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile13.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile13.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile13.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile13.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile14.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile14.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile14.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile14.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile2.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile2.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile2.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile2.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile3.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile3.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile3.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile3.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile4.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile4.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile4.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile4.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile5.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile5.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile5.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile5.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile6.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile6.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile6.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile6.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile7.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile7.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile7.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile7.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile8.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile8.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile8.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile8.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/autotile9.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile9.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/autotile9.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/autotile9.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero0.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero0.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero0.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero0.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero1.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero1.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero1.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero1.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero10.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero10.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero10.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero10.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero2.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero2.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero2.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero2.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero3.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero3.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero3.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero3.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero4.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero4.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero4.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero4.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero5.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero5.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero5.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero5.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero6.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero6.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero6.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero6.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero7.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero7.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero7.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero7.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero8.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero8.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero8.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero8.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/hero9.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/hero9.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/hero9.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/hero9.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/items0:经典.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/items0:经典.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/items0:经典.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/items0:经典.png diff --git a/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png b/project/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png similarity index 100% rename from images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png rename to project/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png diff --git a/libs/project/items.js b/project/items.js similarity index 100% rename from libs/project/items.js rename to project/items.js diff --git a/libs/project/maps.js b/project/maps.js similarity index 100% rename from libs/project/maps.js rename to project/maps.js diff --git a/sounds/058-Slow01.mid b/project/sounds/058-Slow01.mid similarity index 100% rename from sounds/058-Slow01.mid rename to project/sounds/058-Slow01.mid diff --git a/sounds/attack.ogg b/project/sounds/attack.ogg similarity index 100% rename from sounds/attack.ogg rename to project/sounds/attack.ogg diff --git a/sounds/bgm.mp3 b/project/sounds/bgm.mp3 similarity index 100% rename from sounds/bgm.mp3 rename to project/sounds/bgm.mp3 diff --git a/sounds/door.ogg b/project/sounds/door.ogg similarity index 100% rename from sounds/door.ogg rename to project/sounds/door.ogg diff --git a/sounds/floor.mp3 b/project/sounds/floor.mp3 similarity index 100% rename from sounds/floor.mp3 rename to project/sounds/floor.mp3 diff --git a/sounds/item.ogg b/project/sounds/item.ogg similarity index 100% rename from sounds/item.ogg rename to project/sounds/item.ogg diff --git a/sounds/qianjin.mid b/project/sounds/qianjin.mid similarity index 100% rename from sounds/qianjin.mid rename to project/sounds/qianjin.mid diff --git a/sounds/star.mid b/project/sounds/star.mid similarity index 100% rename from sounds/star.mid rename to project/sounds/star.mid diff --git a/styles.css b/styles.css index 6523b3b8..b7031156 100644 --- a/styles.css +++ b/styles.css @@ -169,7 +169,7 @@ box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - background: url(images/ground.png) round; + background: url(project/images/ground.png) round; z-index: 7; display: none; } @@ -198,7 +198,7 @@ } #toolBar { position: absolute; - background: url(images/ground.png) round; + background: url(project/images/ground.png) round; z-index: 6; box-sizing: border-box; -moz-box-sizing: border-box;