战令：修改一键领取逻辑

shared/domain/activityField/taskPassField.ts

@@ -49,6 +49,7 @@ export class TaskPassRewardItem {
     lv: number;
     reward: string;
     needShow: boolean;
+    pageIndex: number;
 
     hasReceived: boolean = false;
 
@@ -201,16 +202,24 @@ export class TaskPassData extends ActivityBase {
 
     // 领取道具
     public receiveItems(pageIndex: number, lv: number) {
+        let rewards: TaskPassReward[] = [];
+        if(pageIndex == 0) {
+            rewards = this.rewards;
+        } else {
             let reward = this.findRewardByPageIndex(pageIndex);
-        if(!reward) return false;
+            rewards.push(reward)
-
+        }
-        if(!reward.canReceiveItems()) return false;
 
         let items: TaskPassRewardItem[] = [];
+        for(let reward of rewards) {
+            if(!reward) continue;
+            if(!reward.canReceiveItems()) continue;
+
             if(lv == 0) {
                 for(let item of reward.items) {
                     if(item.lv <= this.lv && !item.hasReceived) {
                         item.setHasReceived(true);
+                        item.pageIndex = reward.pageIndex;
                         items.push(item);
                     }
                 }
@@ -218,9 +227,12 @@ export class TaskPassData extends ActivityBase {
                 let item = reward.findItemByLv(lv);
                 if(!item.hasReceived) {
                     item.setHasReceived(true);
+                    item.pageIndex = reward.pageIndex;
                     items.push(item);
                 }
             }
+        }
+
         if(items.length <= 0) return false;
         return items
     }