xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(gvg): 修复农场帮收无收入

Browse Source
This commit is contained in:
luying
2023-03-14 15:42:02 +08:00
parent d5fa352d06
commit 1ff234d885
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
game-server/app/servers/guild/handler/gvgProduceHandler.ts
View File

@@ -294,8 +294,9 @@ export class GVGProduceHandler {
// 活跃 // 活跃
await addGVGActive(myLeague.leagueCode, targetRoleId, GVG_ACTIVE_TYPE.COST_PRODUCE_COIN, activeSum); await addGVGActive(myLeague.leagueCode, targetRoleId, GVG_ACTIVE_TYPE.COST_PRODUCE_COIN, activeSum);
const leagueFarm = resultField.filter(cur => cur.farmId == dicFarm.id && cur.unlockTime >= nowSeconds()); // 已种植单位 const leagueFarms = await GVGLeagueFarmModel.findByFarmId(configId, myLeague.leagueCode, farmId);
const canHarvestFarms = resultField.filter(cur => dicFarm.type == GVG_RESOURCE_TYPE.FOOD && cur.farmId == dicFarm.id && cur.harvestTime > 0 && cur.harvestTime <= nowSeconds()); const leagueFarm = leagueFarms.filter(cur => cur.farmId == dicFarm.id && cur.unlockTime >= nowSeconds()); // 已种植单位
const canHarvestFarms = leagueFarms.filter(cur => dicFarm.type == GVG_RESOURCE_TYPE.FOOD && cur.farmId == dicFarm.id && cur.harvestTime > 0 && cur.harvestTime <= nowSeconds());
let obj = new LeagueFarmListInfo(dicFarm.id, leagueFarm.length, canHarvestFarms.length > 0); let obj = new LeagueFarmListInfo(dicFarm.id, leagueFarm.length, canHarvestFarms.length > 0);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {

2
shared/db/GVGLeagueFarm.ts
View File

@@ -148,7 +148,7 @@ export default class GVGLeagueFarm extends BaseModel {
const result = await GVGLeagueFarmModel.updateMany({ _id: { $in: _ids } }, const result = await GVGLeagueFarmModel.updateMany({ _id: { $in: _ids } },
{ $set: { unlockTime: 0, harvestTime: 0, lockRoleId: '', lockRoleName: '', seedType: 0, index: 0 }}, { new: true }); { $set: { unlockTime: 0, harvestTime: 0, lockRoleId: '', lockRoleName: '', seedType: 0, index: 0 }}, { new: true });
if(result.modifiedCount == 0) return []; if(result.modifiedCount == 0) return [];
return fieldResult.map(cur => ({ ...cur, unlockTime: 0, harvestTime: 0, lockRoleId: '', lockRoleName: '', seedType: 0, index: 0 })) return fieldResult
} }
public static async releaseLock(configId: number, leagueCode: string, farmId: number, roleId: string) { public static async releaseLock(configId: number, leagueCode: string, farmId: number, roleId: string) {