军团bug和备注
This commit is contained in:
@@ -87,20 +87,28 @@ export class GuildRefineHandler {
|
||||
let guildRefine = await GuildRefineModel.getRefine(code);
|
||||
let nowTime = nowSeconds();
|
||||
for (let scienceTree of guildRefine.scienceTrees) {
|
||||
if (scienceTree.id == id)
|
||||
if (scienceTree.id == id) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_LIGHT_UP_THE_SCIENCETREE);
|
||||
}
|
||||
|
||||
if (scienceTree.endTime > nowTime)
|
||||
if (scienceTree.endTime > nowTime) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_SCIENCETREE_IS_RUNNING);
|
||||
}
|
||||
}
|
||||
for (let prePosition of developConsume.prePositions) {
|
||||
let scienceTree = findWhere(guildRefine.scienceTrees, {id: prePosition});
|
||||
if (!scienceTree||scienceTree.endTime > nowTime)
|
||||
if (!scienceTree||scienceTree.endTime > nowTime) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_PERSITION_TREE_NOT_LIGHT);
|
||||
}
|
||||
}
|
||||
const costResult = await GuildModel.costFund(code, developConsume.fundConsume);
|
||||
if(!costResult)
|
||||
if(!costResult) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
|
||||
}
|
||||
let scienceTree = { id, endTime: nowTime + developConsume.timeConsume, assistRoleIds: []}
|
||||
let { scienceTrees } = await GuildRefineModel.pushRefine(code, scienceTree);
|
||||
res.releaseCallback();
|
||||
@@ -122,16 +130,24 @@ export class GuildRefineHandler {
|
||||
let guildRefine = await GuildRefineModel.getRefine(code);
|
||||
|
||||
let index = findIndex(guildRefine.scienceTrees, { id });
|
||||
if (index == -1)
|
||||
if (index == -1) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
}
|
||||
let scienceTree = guildRefine.scienceTrees[index];
|
||||
if (scienceTree.assistRoleIds.indexOf(roleId) != -1)
|
||||
if (scienceTree.assistRoleIds.indexOf(roleId) != -1) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_IS_ASSISTED_SCIENCETREE);
|
||||
if (scienceTree.assistRoleIds.length >= ARMY.ARMY_DEVELOPMENT_SPEEDTMES)
|
||||
}
|
||||
if (scienceTree.assistRoleIds.length >= ARMY.ARMY_DEVELOPMENT_SPEEDTMES) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.GUILD_REACH_MAX_ASSIST_COUNT);
|
||||
}
|
||||
let result = await handleCost(roleId, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: ARMY.ARMY_DEVELOPMENT_SPEEDCOST}]);
|
||||
if (!result)
|
||||
if (!result) {
|
||||
res.releaseCallback();
|
||||
return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
|
||||
}
|
||||
scienceTree.assistRoleIds.push(roleId);
|
||||
scienceTree.endTime = scienceTree.endTime - ARMY.ARMY_DEVELOPMENT_SPEED * 60;
|
||||
let { scienceTrees } = await GuildRefineModel.updateRefine(code, { scienceTrees: guildRefine.scienceTrees })
|
||||
|
||||
Reference in New Issue
Block a user