shawenguan пре 1 година
родитељ
комит
9c57cfa074
1 измењених фајлова са 8 додато и 5 уклоњено
  1. 8 5
      Scripts/wubian/wubianSynthesis.js

+ 8 - 5
Scripts/wubian/wubianSynthesis.js

@@ -331,6 +331,8 @@ function checkUpdateActivityDataCache(activityId) {
                     for (let goodsId of costGoodsList) {
                     for (let goodsId of costGoodsList) {
                         costGoodsDict[goodsId] = 1;
                         costGoodsDict[goodsId] = 1;
                     }
                     }
+                    magicJS.logger.info(`costGoodsDict=${JSON.stringify(costGoodsDict)}`);
+                    magicJS.logger.info(`goodsListData=${JSON.stringify(goodsListData)}`);
                     for (let i = 0; i < goodsListData.length; i++) {
                     for (let i = 0; i < goodsListData.length; i++) {
                         checkRemoveVerList(goodsListData[i].verList, costGoodsDict);
                         checkRemoveVerList(goodsListData[i].verList, costGoodsDict);
                     }
                     }
@@ -340,7 +342,8 @@ function checkUpdateActivityDataCache(activityId) {
         }
         }
         if (needUpdate) {
         if (needUpdate) {
             magicJS.data.write(key, activityData);
             magicJS.data.write(key, activityData);
-            magicJS.logger.info(`更新活动[${activityData.name}]任务数据缓存成功`);
+            let activityInfo = activityData.activityInfo;
+            magicJS.logger.info(`更新活动[${activityInfo.name}]任务数据缓存成功`);
         }
         }
     }
     }
 }
 }
@@ -389,10 +392,10 @@ async function trySynthesize() {
         magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]详细合成信息数据不存在`);
         magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]详细合成信息数据不存在`);
         return;
         return;
     }
     }
-    // if (checkActivityDisable(activityId)) {
-    //     magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]已禁用,请重新配置`);
-    //     return;
-    // }
+    if (checkActivityDisable(activityId)) {
+        magicJS.notification.appendNotifyInfo(`⚠️活动[${activityData.name}]已禁用,请重新配置`);
+        return;
+    }
     let willCount = getActivityWillCount();
     let willCount = getActivityWillCount();
     willCount = getSynthesisAmount();
     willCount = getSynthesisAmount();
     let combinationLst = getSynthesizeCombination(retCvtData);
     let combinationLst = getSynthesizeCombination(retCvtData);