Kziwws 1 долоо хоног өмнө
parent
commit
15bfb78f63

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 366 - 328
assets/prefabs/ui/settleUI.prefab


+ 1 - 1
assets/scripts/items/item/TaskEnemyItem.ts

@@ -26,7 +26,7 @@ export class TaskEnemyItem extends ListItem {
         //敌人头像
         //敌人头像
         ResUtil.setSpriteFrame(data.enemyData.headshot,this.enemy_header);
         ResUtil.setSpriteFrame(data.enemyData.headshot,this.enemy_header);
         //剩余敌人数量
         //剩余敌人数量
-        this.num_label.string = `${data.total - data.count} / ${data.total}`;
+        this.num_label.string = `${data.count} / ${data.total}`;
         //敌人名字
         //敌人名字
         this.enemy_name_label.string = data.enemyData.name_lang;
         this.enemy_name_label.string = data.enemyData.name_lang;
     }
     }

+ 8 - 2
assets/scripts/ui/SettleUI.ts

@@ -130,7 +130,12 @@ export class SettleUI extends BaseExp {
         ResUtil.setSpriteFrame(itemData.icon,reward_icon_1);
         ResUtil.setSpriteFrame(itemData.icon,reward_icon_1);
         //任务奖励数量
         //任务奖励数量
         this.task_reward_btn.getChildByName("reward_num_lable").getComponent(Label).string = `x${num_1}`;
         this.task_reward_btn.getChildByName("reward_num_lable").getComponent(Label).string = `x${num_1}`;
-        this.video_btn.getChildByName("reward_num_lable").getComponent(Label).string = `x${num_1}`;
+        //看视频双倍奖励
+        this.video_btn.active = this.param.isWin;
+        if(this.param.isWin){
+           const doubleNum: number = Number(num_1) * 2;
+           this.video_btn.getChildByName("reward_num_lable").getComponent(Label).string = `x${doubleNum}`;
+        }
         //延迟0.5播放奖励动画
         //延迟0.5播放奖励动画
         this.scheduleOnce(() => {
         this.scheduleOnce(() => {
             this.flyReward(itemData,Number(num_1),this.task_reward_btn);
             this.flyReward(itemData,Number(num_1),this.task_reward_btn);
@@ -214,8 +219,9 @@ export class SettleUI extends BaseExp {
                         //视频再奖励一次
                         //视频再奖励一次
                         const reward:string = this.param.isWin ? this.levelData.reward_1 : this.levelData.reward_2;
                         const reward:string = this.param.isWin ? this.levelData.reward_1 : this.levelData.reward_2;
                         let [g_id_1,num_1] = reward.split('_');
                         let [g_id_1,num_1] = reward.split('_');
+                        const doubleNum: number = Number(num_1) * 2;
                         const itemData:any = userIns.itemTable.find(e=>e.id == g_id_1);
                         const itemData:any = userIns.itemTable.find(e=>e.id == g_id_1);
-                        this.flyReward(itemData,Number(num_1),this.video_btn);
+                        this.flyReward(itemData,doubleNum,this.video_btn);
                     },0.3)
                     },0.3)
                 }
                 }
             });
             });

+ 1 - 1
profiles/v2/packages/reference-image.json

@@ -3,6 +3,6 @@
   "config": {
   "config": {
     "images": [],
     "images": [],
     "sceneUUID": {},
     "sceneUUID": {},
-    "scene": "ea775253-49d0-4ed3-b61d-b95637b22a14"
+    "scene": "10795865-5525-41fc-8bf7-0e8d6983b214"
   }
   }
 }
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно