diff --git a/gm-server/app/controller/upload.ts b/gm-server/app/controller/upload.ts index 78a868bf2..54521350c 100644 --- a/gm-server/app/controller/upload.ts +++ b/gm-server/app/controller/upload.ts @@ -185,7 +185,7 @@ export default class UploadController extends Controller { const writeStream = fs.createWriteStream(target1); await pump(stream, writeStream); fs.copyFileSync(target1, target2); - // files.push(filename); + files.push(filename); } else { let target1 = path.join(this.config.baseDir, this.jsonFolder, filename); let target2 = path.join(this.config.baseDir, this.distJsonFolder, filename); diff --git a/shared/db/ActivityPopUpShopRecord.ts b/shared/db/ActivityPopUpShopRecord.ts index 80a092ec3..94ba5647d 100644 --- a/shared/db/ActivityPopUpShopRecord.ts +++ b/shared/db/ActivityPopUpShopRecord.ts @@ -42,7 +42,7 @@ export default class Activity_Pop_Up_Shop_Record extends BaseModel { } //删除活动统计记录 - public static async deleteActivity(serverId: number, activityId: number, roleId: string, id: number, type: number,) { + public static async deleteActivity(_serverId: number, activityId: number, roleId: string, id: number, type: number,) { await ActivityPopUpShopRecordModel.deleteMany({ roleId, activityId, id, type }); diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index ebbf68156..9270c17c3 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -2,7 +2,6 @@ import moment = require('moment'); import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_CLOSE, SIGNIN_OPEN } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivitySignInModelType } from '../../db/ActivitySignIn'; -import { deltaDays } from '../../pubUtils/util'; import { ActivityBase } from './activityField'; diff --git a/shared/domain/activityField/thirtyDaysField.ts b/shared/domain/activityField/thirtyDaysField.ts index 6c19b4414..ef80395ac 100644 --- a/shared/domain/activityField/thirtyDaysField.ts +++ b/shared/domain/activityField/thirtyDaysField.ts @@ -1,4 +1,3 @@ -import { TASK_TYPE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityThirtyDaysModelType } from '../../db/ActivityThirtyDays'; import { ActivityThirtyDaysPointRewardModelType } from '../../db/ActivityThirtyDaysPointReward'; diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index e1d1e553b..31dbeaafb 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -601,7 +601,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } else if (taskType == TASK_TYPE.EQUIP_QUALITY_COUNT || taskType == TASK_TYPE.GACHA_QUALITY_COUNT) {//每天统计 let recordDate = moment(new Date()).startOf('d').toDate() let recordData: ActivityPopUpShopRecordModelType = await ActivityPopUpShopRecordModel.findRecordData(serverId, activity.activityId, roleId, task.id, task.taskType, recordDate) - let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, null); + let { addCount } = isComplete(roleId, task.taskType, task.taskParam, count, parma, null); if (recordData && (recordData.count < task.condition) && (recordData.count + addCount >= task.condition)) {//完成当天任务 let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(serverId, activity.activityId, roleId, task.id, task.taskType, count, beginTime, endTime); popShopData.setPlayerRecords(playerRecord) @@ -694,7 +694,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: return pushMessage; } - +} /** * 达成任务标准 * @@ -982,4 +982,5 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } return addFuncs; - } \ No newline at end of file + } + \ No newline at end of file