Merge branch 'bugfix' into release
This commit is contained in:
commit
ef60b3ba26
@ -14,7 +14,7 @@ export default async function (call: ApiCall<ReqOnekeyReceive, ResOnekeyReceive>
|
|||||||
if (args.length < 1 || _ids.isDuplication() || heroIds.isDuplication()) return call.error(globalThis.lng.kbzz_1);
|
if (args.length < 1 || _ids.isDuplication() || heroIds.isDuplication()) return call.error(globalThis.lng.kbzz_1);
|
||||||
|
|
||||||
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
||||||
if (event.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
||||||
|
|
||||||
//所有的任务
|
//所有的任务
|
||||||
let taskList = await XstaskFun.getAllTask(call.uid);
|
let taskList = await XstaskFun.getAllTask(call.uid);
|
||||||
|
@ -9,7 +9,7 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
|
|||||||
if (call.req.heroIds.isDuplication()) return call.error(globalThis.lng.xstask_10);
|
if (call.req.heroIds.isDuplication()) return call.error(globalThis.lng.xstask_10);
|
||||||
|
|
||||||
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
||||||
if (event.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
||||||
|
|
||||||
let task = await XstaskFun.getTask(call.uid, call.req._id);
|
let task = await XstaskFun.getTask(call.uid, call.req._id);
|
||||||
let taskConf = G.gc.xstask[task?.taskId];
|
let taskConf = G.gc.xstask[task?.taskId];
|
||||||
|
@ -13,7 +13,7 @@ export default async function (call: ApiCall<ReqRefresh, ResRefresh>) {
|
|||||||
if (delNum < 1) return call.error(globalThis.lng.xstask_11);
|
if (delNum < 1) return call.error(globalThis.lng.xstask_11);
|
||||||
|
|
||||||
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'});
|
||||||
if (event.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11);
|
||||||
|
|
||||||
let change: ResRefresh = {};
|
let change: ResRefresh = {};
|
||||||
let needDel = taskList.filter(task => task.receiveData == undefined || task.receiveData.rec == true);
|
let needDel = taskList.filter(task => task.receiveData == undefined || task.receiveData.rec == true);
|
||||||
|
Loading…
Reference in New Issue
Block a user