修改

Scripts/hbcpre/hbcpreComposite.js

@@ -295,14 +295,17 @@ async function tryOneComposite(activityId){
         }
         lastTime = Date.now();
         activityData = getActivitDataCache(1, activityId);
-        if(!isCompositeOnlyUseCache()){
+        if(!activityData && !isCompositeOnlyUseCache()){
             magicJS.logger.info(`请求活动[${activityId}]数据[${i}]`);
             let result = await getCompositeList(activityId);
             if(result.code == 200){
                 activityData = result.data;
                 saveActivitDataCache(1, activityData, false);
             }
-            if(result.code == 200 || result.code == 415){
+            if(result.code == 200){
+                break;
+            } else if(result.code == 415){
+                magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}#${activityId}>已结束！`);
                 break;
             }
         }
@@ -314,11 +317,6 @@ async function tryOneComposite(activityId){
     if(!activityData){
         return;
     }
-
-    if(activityData.code == 415){
-        magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}#${activityId}>已结束！`);
-        return;
-    }
     // magicJS.logger.error(JSON.stringify(activityData));
     // 固定材料
     let needList = activityData.needList;