|
|
@@ -294,6 +294,12 @@ async function trySynthesize() {
|
|
|
if (!activityData) {
|
|
|
return;
|
|
|
}
|
|
|
+ let nowTime = Date.now() / 1000;
|
|
|
+ let diffTimeSec = 5;
|
|
|
+ if (nowTime < activityData.startTime - diffTimeSec) {
|
|
|
+ magicJS.notification.appendNotifyInfo(`活动[${activityData.name}]未开始,距离开始时间${activityData.startTime - nowTime}秒,请在活动开始前${diffTimeSec}秒内执行!`);
|
|
|
+ return;
|
|
|
+ }
|
|
|
magicJS.logger.info(`[2]活动任务开始执行...`);
|
|
|
let activityId = activityData.hashId || activityData.activityId;
|
|
|
let retCvtData = null;
|
|
|
@@ -327,6 +333,12 @@ async function trySynthesize() {
|
|
|
setActivityDisabled(activityId, true);
|
|
|
} else {
|
|
|
if (isConcurrentExcute) {
|
|
|
+ nowTime = Date.now() / 1000;
|
|
|
+ let waittingMSec = (activityData.startTime - nowTime) * 1000;
|
|
|
+ if (waittingMSec > 0) {
|
|
|
+ magicJS.logger.info(`等待${waittingMSec}毫秒后开始执行...`);
|
|
|
+ await magicJS.utils.sleep(waittingMSec - 80);
|
|
|
+ }
|
|
|
magicJS.logger.info(`[4]活动任务开始执行...`);
|
|
|
for (let n = 0; n < nRuns; n++) {
|
|
|
let startTime = Date.now();
|
|
|
@@ -370,6 +382,12 @@ async function trySynthesize() {
|
|
|
setSynthesisAmount(willCount - nSuccCount);
|
|
|
}
|
|
|
} else {
|
|
|
+ nowTime = Date.now() / 1000;
|
|
|
+ let waittingMSec = (activityData.startTime - nowTime) * 1000;
|
|
|
+ if (waittingMSec > 0) {
|
|
|
+ magicJS.logger.info(`等待${waittingMSec}毫秒后开始执行...`);
|
|
|
+ await magicJS.utils.sleep(waittingMSec - 80);
|
|
|
+ }
|
|
|
let nSuccCount = 0;
|
|
|
let nFailCount = 0;
|
|
|
for (let n = 0; n < nRuns; n++) {
|