Merge branch 'master' of http://gitlab2.dui88.com/MrKwon/babycare_xiaoxiao

mock/miniTb/babycare.gameOver.json

@@ -7,7 +7,8 @@
             "image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
         },
         "prize": {
-            "type": "HAMMERS"
+            "type": "HAMMERS",
+            "image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
         }
     },
     "success": true,

src/panels/SuccessPrizePanel.ts

@@ -81,7 +81,7 @@ export class SuccessPrizePanel extends Panel {
                     propImg.texture = RES.getRes('boomBtn.png');
                     propImg.y += 5;
                     propImg.x += 15;
-                    propLabel.text = '步数道具\tx1';
+                    propLabel.text = '炸弹道具\tx1';
                     break;
 
                 case PropType.HAMMERS:
@@ -105,7 +105,8 @@ export class SuccessPrizePanel extends Panel {
 
             this.prop.visible = false;
             this.prizeImg.texture = Texture.fromUrl(this.data.prize.image);
-            this.tipsTex.text = '\t\t闯关成功！获得抽大奖机会！';
+            // this.tipsTex.text = '\t\t闯关成功！获得抽大奖机会！';
+            this.tipsTex.text = '\t闯关成功！有机会抽取如下奖品';
         }
     }