Merge remote-tracking branch 'origin/master'

assets/Bundles/MainGame/MainGame.scene

@@ -199,7 +199,7 @@
     "_priority": 40000,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 724.9590973201692,
+    "_orthoHeight": 596.5439469320066,
     "_near": 0,
     "_far": 2000,
     "_color": {
@@ -2444,7 +2444,7 @@
     "_priority": 50000,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 724.9590973201692,
+    "_orthoHeight": 596.5439469320066,
     "_near": 1,
     "_far": 2000,
     "_color": {
@@ -11267,7 +11267,7 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -489.9995422363281,
+      "x": -1503,
       "y": 126,
       "z": 0
     },
@@ -11292,7 +11292,7 @@
       "y": 180,
       "z": 0
     },
-    "_id": "46u8BDHYRFBpL+rERWH3sg"
+    "_id": "15ntahYuBOlI9axsLvmVn4"
   },
   {
     "__type__": "cc.UITransform",
@@ -11314,7 +11314,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "5aWlDqc9RPhbmHipxKvQPX"
+    "_id": "29mpQoZeRDIILvvM0XrIyd"
   },
   {
     "__type__": "cc.Sprite",
@@ -11350,7 +11350,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "83T8dmcspM0YX+ri+d/7ZZ"
+    "_id": "a4d7Pfm5pBg76Fz5VRrIym"
   },
   {
     "__type__": "cc.Node",
@@ -11398,7 +11398,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "03DY42QN9Mc4WnVY8AvnLB"
+    "_id": "aa5tYYkoFLUohaYXtyytDH"
   },
   {
     "__type__": "cc.UITransform",
@@ -11420,7 +11420,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "0bCemjQj1JQ6e64+shf3LZ"
+    "_id": "37hRnGP1NAXJYZ2CY+mVU/"
   },
   {
     "__type__": "cc.Sprite",
@@ -11456,7 +11456,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "e1DyExHqFOZa9MSEu+LVcA"
+    "_id": "c8YUQpN19KG6QnOuYWicKk"
   },
   {
     "__type__": "cc.Node",
@@ -11504,7 +11504,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "e99Px79RNNlrbJA+XosW7C"
+    "_id": "8e1P/3v3RJ8JfxfGdiKfUh"
   },
   {
     "__type__": "cc.UITransform",
@@ -11526,7 +11526,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "6e5ZxXmE5K/rLlouvI1T6h"
+    "_id": "6cQsM4oEpHkrdmgpuqttul"
   },
   {
     "__type__": "cc.Sprite",
@@ -11562,7 +11562,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "30C+YOj/lH2ZyYw5LOApJV"
+    "_id": "3cdoeEB6dJ24D6ITZZ//0X"
   },
   {
     "__type__": "cc.UITransform",
@@ -13151,6 +13151,12 @@
         "__id__": 332
       }
     ],
+    "top": {
+      "__id__": 250
+    },
+    "topCard": {
+      "__id__": 276
+    },
     "_id": "dfl2fX641H3qOpggystLiY"
   },
   {

assets/Scripts/Scenes/MainGame/Components/Target.ts

@@ -30,6 +30,10 @@ export class Target extends Component {
 
     @property([Node]) bannerArr: Node[] = [];
 
+    @property(Node) top: Node = null;
+
+    @property(Node) topCard: Node = null;
+
     constructor() {
         super();
         Target._ins = this;
@@ -92,10 +96,12 @@ export class Target extends Component {
     }
 
     async showTarget3() {
+        this.showTopCard()
         await this.showBanner(this.bannerArr[2]);
     }
 
     async showTarget2() {
+        this.showTop()
         const { time, length } = Global.stageConfig[1];
 
         this.goalTxt.string = `${time}秒长度达到${length}`;
@@ -106,6 +112,7 @@ export class Target extends Component {
     }
 
     async showTarget1() {
+        this.showTop()
         const { time } = Global.stageConfig[0];
         this.goalTxt.string = `存活${time}秒`;
         this.bannerArr[0].getChildByName("txt")
@@ -114,6 +121,15 @@ export class Target extends Component {
         await this.showBanner(this.bannerArr[0]);
     }
 
+    showTopCard() {
+        this.topCard.active = true;
+        this.top.active = false;
+    }
+
+    showTop() {
+        this.top.active = true;
+        this.topCard.active = false
+    }
 
     private _cd = 0;
 
@@ -137,7 +153,7 @@ export class Target extends Component {
 
     cdTween: Tween<Target> = null;
 
-    startCd(cd: number, onComplete = () => {}) {
+    startCd(cd: number, onComplete = () => { }) {
         this.graphics.node.active = true;
         this.cd = this.totalCd = cd;
         this.cdTween = tween(this as Target)