shawenguan 1 year ago
parent
commit
6bb3b85495
2 changed files with 4 additions and 7 deletions
  1. 2 5
      Scripts/hbcpre/hbcpreComposite.js
  2. 2 2
      Scripts/hbcpre/hbcpreExchange.js

+ 2 - 5
Scripts/hbcpre/hbcpreComposite.js

@@ -359,7 +359,7 @@ async function tryOneComposite(activityId){
             continue;
         }
         if(cResult.code == 200){
-            magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>合成成功[${i}],合成品:${result.data?.worksName}#${result.data?.worksNo}!`);
+            magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>合成成功[${i}],合成品:${cResult.data?.worksName}#${cResult.data?.worksNo}!`);
             // 刷新合成数据
             let tmpResult = await getCompositeList(activityId);
             if(tmpResult.code == 200){
@@ -368,15 +368,12 @@ async function tryOneComposite(activityId){
             }
             break;
         } else {
-            magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>${result.message}[${i}]`);
+            magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>${cResult.message}[${i}]`);
             if(cResult.code == 415){//活动已结束
                 break;
             }
         }
     }
-    if(!cResult){
-        return;
-    }
     return cResult;
 }
 

+ 2 - 2
Scripts/hbcpre/hbcpreExchange.js

@@ -360,7 +360,7 @@ async function tryOneExchange(activityId){
             return;
         }
         if(cResult.code == 200){
-            magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>兑换成功[${i}],兑换品:${result.data?.worksName}#${result.data?.worksNo}!`);
+            magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>兑换成功[${i}],兑换品:${cResult.data?.worksName}#${cResult.data?.worksNo}!`);
             // 刷新兑换数据
             let tmpResult = await getCompositeList(activityId);
             if(tmpResult.code == 200){
@@ -368,7 +368,7 @@ async function tryOneExchange(activityId){
                 saveActivitDataCache(3, activityData, false);
             }
         } else {
-            magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>${result.message}[${i}]`);
+            magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>${cResult.message}[${i}]`);
         }
     }
     return cResult;