diff --git a/.gitignore b/.gitignore index f14f426..c9b0865 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ project/bgms/ project/animates/ _docs/ 常用工具/ -/.vs \ No newline at end of file +/.vs +_server/config.json \ No newline at end of file diff --git a/project/enemys.js b/project/enemys.js index 6bbdac0..ad0b455 100644 --- a/project/enemys.js +++ b/project/enemys.js @@ -66,7 +66,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "evilBat": {"name":"邪恶蝙蝠","hp":1000,"atk":1,"def":0,"money":0,"exp":0,"point":0,"special":[2,3]}, "M300": {"name":"墙妖","hp":50,"atk":420,"def":300,"money":100,"exp":10,"point":0,"special":3}, "M301": {"name":"汪洋","hp":10000,"atk":300,"def":0,"money":1000,"exp":100,"point":0,"special":0,"beforeBattle":[{"type":"animate","name":"hainazhijian","loc":[6,5]}],"afterBattle":[{"type":"setValue","name":"flag:255","value":"1"},{"type":"setValue","name":"flag:bofang","value":"0"},{"type":"trigger","loc":[0,1]}]}, - "M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":0.34,"add":false}, + "M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":null,"add":false,"vampire":0.34}, "M303": {"name":"血尾雕像","hp":5000,"atk":100,"def":0,"money":200,"exp":10,"point":0,"special":[15,11],"value":null,"add":false,"zone":100,"vampire":0.34}, "E340": {"name":"戾鬼","hp":49999,"atk":18973,"def":1800,"money":5000,"exp":500,"point":0,"special":0}, "E341": {"name":"媚儿","hp":25000,"atk":250,"def":180,"money":2500,"exp":250,"point":0,"special":0}, diff --git a/project/plugins.js b/project/plugins.js index c064b9a..a0d544c 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -3699,7 +3699,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = } this.autoBattle = function () { - if (!flags.__autoBattle__) return; + if (!flags.__autoBattle__ || flags.poison) return; // 如果勇士当前点有地图伤害,只清周围 const { x, y } = core.status.hero.loc; const floor = core.floors[core.status.floorId]; @@ -3829,7 +3829,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = } this.autoGetItem = function () { - if (!flags.__autoGetItem__) return; + if (!flags.__autoGetItem__ || flags.poison) return; var canGetItems = {}; if (!core.status.floorId || !core.status.checkBlock.damage || core.status.event.id == 'action' || core.status.lockControl) return;