shawenguan 1 год назад
Родитель
Сommit
86ab5e98d8
1 измененных файлов с 18 добавлено и 7 удалено
  1. 18 7
      Scripts/wubian/wubianSynthesis.js

+ 18 - 7
Scripts/wubian/wubianSynthesis.js

@@ -355,7 +355,7 @@ function checkRemoveVerList(srcVerList, removeData) {
 }
 
 async function trySynthesize() {
-    magicJS.logger.info(`[0]活动任务开始执行...`);
+    magicJS.logger.info(`[1]活动任务执行前检查...`);
     let activityData = await getWillActivityData();
     // magicJS.logger.info(`activityData=${JSON.stringify(activityData)}`);
     if (!activityData) {
@@ -364,10 +364,10 @@ async function trySynthesize() {
     let nowTime = Date.now() / 1000;
     let diffTimeSec = getAllowAdvanceTime();
     if (nowTime < activityData.startTime - diffTimeSec) {
-        magicJS.notification.appendNotifyInfo(`活动[${activityData.name}]未开始,距离开始时间${Math.floor(activityData.startTime - nowTime)}秒,请在活动开始前${diffTimeSec}秒内执行!`);
+        magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]未开始,距离开始时间${Math.floor(activityData.startTime - nowTime)}秒,请在活动开始前${diffTimeSec}秒内执行!`);
         return;
     }
-    magicJS.logger.info(`[2]活动任务开始执行...`);
+    magicJS.logger.info(`[2]活动任务执行前检查...`);
     let activityId = activityData.hashId || activityData.activityId;
     let retCvtData = null;
     if (isSynthesisUseCacheEnabled()) {
@@ -382,14 +382,14 @@ async function trySynthesize() {
             retCvtData = await doGetConvertGoodsList(activityId, checkConvertGoodsListReqForceNeed());
         }
     }
-    magicJS.logger.info(`[3]活动任务开始执行...`);
+    magicJS.logger.info(`[3]活动任务执行前检查...`);
     // magicJS.logger.info(`retCvtData=${JSON.stringify(retCvtData)}`);
     if (!retCvtData) {
-        magicJS.notification.appendNotifyInfo(`活动[${activityData.name}]详细合成信息数据不存在`);
+        magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]详细合成信息数据不存在`);
         return;
     }
     if (checkActivityDisable(activityId)) {
-        magicJS.notification.appendNotifyInfo(`活动[${activityData.name}]已禁用,请重新配置`);
+        magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]已禁用,请重新配置`);
         return;
     }
     let willCount = getActivityWillCount();
@@ -405,6 +405,7 @@ async function trySynthesize() {
     if (nExcuteCount == 0) {
         tipsText += `由于缺少可执行的材料组合,该活动自动禁用\n`;
         tipsText += `请检查活动重新配置,或购买相应材料,重新开启活动任务`;
+        tipsText = `❌` + tipsText;
         setActivityDisabled(activityId, true);
     } else {
         if (isConcurrentExcute) {
@@ -414,7 +415,7 @@ async function trySynthesize() {
                 magicJS.logger.info(`等待${waittingMSec}毫秒后开始执行...`);
                 await magicJS.utils.sleep(waittingMSec - 80);
             }
-            magicJS.logger.info(`[4]活动任务开始执行...`);
+            magicJS.logger.info(`活动任务开始执行...`);
             for (let n = 0; n < nRuns; n++) {
                 let startTime = Date.now();
                 for (let i = 0; i < nExcuteCount; i++) {
@@ -463,6 +464,11 @@ async function trySynthesize() {
                     checkUpdateActivityDataCache(activityId);
                 }
             }
+            if (nSuccCount > 0) {
+                tipsText = `🎉` + tipsText;
+            } else {
+                tipsText = `❌` + tipsText;
+            }
         } else {
             nowTime = Date.now() / 1000;
             let waittingMSec = Math.floor((activityData.startTime - nowTime) * 1000);
@@ -504,6 +510,11 @@ async function trySynthesize() {
             } else {
                 setSynthesisAmount(willCount - nSuccCount);
             }
+            if (nSuccCount > 0) {
+                tipsText = `🎉` + tipsText;
+            } else {
+                tipsText = `❌` + tipsText;
+            }
         }
     }
     magicJS.logger.info(`活动任务执行结束`);