浏览代码

Merge branch 'master' into 'release'

Master

See merge request Isleward/isleward!625
tags/v0.12.0.11
Big Bad Waffle 1年前
父节点
当前提交
5b5dff3d66
共有 3 个文件被更改,包括 6 次插入3 次删除
  1. +1
    -1
      src/server/components/auth.js
  2. +1
    -1
      src/server/config/maps/cave/zone.js
  3. +4
    -1
      src/server/world/atlas.js

+ 1
- 1
src/server/components/auth.js 查看文件

@@ -182,7 +182,7 @@ module.exports = {
clean: true
});

eventEmitter.emit('onAfterGetCharacter', {
await eventEmitter.emit('onAfterGetCharacter', {
obj: this.obj,
character
});


+ 1
- 1
src/server/config/maps/cave/zone.js 查看文件

@@ -171,7 +171,7 @@ module.exports = {
spawnCd: 1714,

regular: {
hpMult: 75,
hpMult: 90,
dmgMult: 2,

drops: {


+ 4
- 1
src/server/world/atlas.js 查看文件

@@ -87,8 +87,11 @@ module.exports = {
objects.removeObject(obj);

const thread = getThreadFromId(obj.zoneId);
if (!thread)
if (!thread) {
callback();

return;
}

if (thread.instanced && (await gePlayerCountInThread(thread)) === 1) {
this.removeObjectFromInstancedZone(thread, playerId, callback);


正在加载...
取消
保存