l

egret/src/panels/RedBombAlertPanel.ts

@@ -2,11 +2,7 @@ import getResPath from "../../libs/new_tc/getResPath";
 import Panel from "../../libs/new_wx/components/Panel";
 import { getRedBombTimes } from "../getRedBombAward";
 import { loadSvga } from "../loadSvga";
-<<<<<<< HEAD
-import getResPath from "../../libs/new_tc/getResPath";
 import { DataManager } from "../../libs/tw/manager/DataManager";
-=======
->>>>>>> 9f8160d0a4c64b32d674e876fa7c9c5680a3de02
 
 export default class RedBombAlertPanel extends Panel {
     async start(data) {
@@ -25,33 +21,16 @@ export default class RedBombAlertPanel extends Panel {
             mv.once(egret.Event.COMPLETE, () => {
                 mv.stop();
                 this.removeChild(mv);
-<<<<<<< HEAD
                 const data = DataManager.ins.getData('hc_redBombAward').data;
                 if(data){
                     this.playPrizeAni();
                 }else{
                     this.playNoPrizeAni();
                 }
-=======
-                egret.Tween.get(this['group']).to({ alpha: 0 }, 300).call(() => {
-                    this.removeChild(this['group']);
-                });
-                // this.playNoPrizeAni();
-                this.playPrizeAni();
->>>>>>> 9f8160d0a4c64b32d674e876fa7c9c5680a3de02
             }, this);
         });
     }
 
-    playPrizeAni() {
-        loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => {
-            this.addChild(mv);
-            mv.once(egret.Event.COMPLETE, () => {
-                mv.stop();
-                this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this);
-            }, this);
-        });
-    }
     playNoPrizeAni() {
         loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => {
             //去掉文案
@@ -71,6 +50,7 @@ export default class RedBombAlertPanel extends Panel {
             this.addChild(mv);
             mv.once(egret.Event.COMPLETE, () => {
                 mv.stop();
+                this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this);
             }, this);
             setTimeout(()=>{
                 mv.setImage("img_2349","//yun.dui88.com/images/201910/e6pmpk2pne.png")