l

egret/libs/new_wx/MainBase.ts

@@ -456,7 +456,7 @@ export default class MainBase extends eui.UILayer {
             this.hcHome(),
             this.hc_userInfo(),
             // this.getBackReward(),
-            this.hcRedBoobBaseInfo(),
+            // this.hcRedBoobBaseInfo(),
         ]);
 
         MapScene.adData = DataManager.ins.getData('hc_advert');

egret/src/mainScene/MainScene.ts

@@ -66,6 +66,7 @@ import { CurScoreNum } from '../something/uis/CurScoreNum';
 import { FestivalTarget } from '../something/uis/FestivalTarget';
 import getRedBombAward, { getRedBombTimes } from '../getRedBombAward';
 import { FesRedBombShowAni } from '../something/anisCall/FesRedBombShowAni';
+import { RectsWaveAni } from '../something/anisCall/RectsWaveAni';
 
 const aniClass = {
     "BoomAni": BoomAni,
@@ -702,7 +703,7 @@ export default class MainScene extends Scene {
         //添加节日元素，条件可能会变
         if (fesChapterData.indexOf(this.chapter >> 0) > -1 &&
             getRedBombTimes() &&
-            Math.random() > 0.5 &&
+            // Math.random() > 0.5 &&
             this.lattices[festivalIndex] &&   //格子必须有
             (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element)  //没有元素也行
         ) {
@@ -728,6 +729,7 @@ export default class MainScene extends Scene {
             this.lattices[festivalIndex].element.visible = false;
             ani.play(p, () => {
                 this.lattices[festivalIndex].element.visible = true;
+                RectsWaveAni(this.lattices,this.map)
                 //检查三消
                 if (this.threeMatch()) {
                     this.eliminate();

egret/src/panels/RedBombAlertPanel.ts

@@ -6,6 +6,7 @@ import RedBombRule from "./RedBombRule";
 import { getRedBombTimes } from "../getRedBombAward";
 import { loadSvga } from "../loadSvga";
 import getResPath from "../../libs/new_tc/getResPath";
+import { DataManager } from "../../libs/tw/manager/DataManager";
 
 export default class RedBombAlertPanel extends Panel {
     async start(data) {
@@ -24,7 +25,12 @@ export default class RedBombAlertPanel extends Panel {
             mv.once(egret.Event.COMPLETE, () => {
                 mv.stop();
                 this.removeChild(mv);
+                const data = DataManager.ins.getData('hc_redBombAward').data;
+                if(data){
+                    this.playPrizeAni();
+                }else{
                     this.playNoPrizeAni();
+                }
             }, this);
         });
 
@@ -33,6 +39,8 @@ export default class RedBombAlertPanel extends Panel {
     
     playNoPrizeAni(){
         loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => {
+            //去掉文案
+            egret.Tween.get(this['group']).to({alpha:0},300);
             this.addChild(mv);
             mv.once(egret.Event.COMPLETE, () => {
                 mv.stop();
@@ -40,6 +48,21 @@ export default class RedBombAlertPanel extends Panel {
         });
     }
 
+    playPrizeAni(){
+        loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => {
+            //去掉文案
+            egret.Tween.get(this['group']).to({alpha:0},300);
+            this.addChild(mv);
+            mv.once(egret.Event.COMPLETE, () => {
+                mv.stop();
+            }, this);
+            setTimeout(()=>{
+                mv.setImage("img_2349","//yun.dui88.com/images/201910/e6pmpk2pne.png")
+            },100)
+            
+        });
+    }
+
     showlog() {
     }
 

egret/src/something/anisCall/FesRedBombShowAni.ts

@@ -32,7 +32,5 @@ export class FesRedBombShowAni extends egret.DisplayObjectContainer {
                 Pool.recover(RecoverName.FESREDBOMBSHOW_ANI, this);
                 callback()
             })
-
-        //波纹动效再说，现在来不及
     }
 }
\ No newline at end of file

egret/src/something/anisCall/RectsWaveAni.ts

@@ -21,15 +21,18 @@ export function RectsWaveAni(
     var num = 0;
     var maxNum = Math.max(rc[0], rc[1], Tool.rowNum - rc[0] - 1, Tool.colNum - rc[1] - 1)
     //所有格子都填上
-    while (num < maxNum) {
+    while (num <= maxNum) {
         //每一圈所有格子索引
         var indexs: number[] = [];
+
+        if (num) {
+
             var rowMax = rc[0] + num;
             var rowMin = rc[0] - num;
             var colMax = rc[1] + num;
             var colMin = rc[1] - num;
 
-        num++;
+
 
             var colIndexs = rangeIndexs(
                 colMin >= 0 ? colMin : 0,
@@ -57,17 +60,20 @@ export function RectsWaveAni(
             //左边
             if (colMin >= 0) {
                 for (var i = 0; i < rowIndexs.length; i++) {
-                var index = Tool.rcToIndex(colMin, rowIndexs[i]);
+                    var index = Tool.rcToIndex(rowIndexs[i], colMin);
                     if (lattices[index]) indexs.push(index)
                 }
             }
             //右边
             if (colMax < Tool.colNum) {
                 for (var i = 0; i < rowIndexs.length; i++) {
-                var index = Tool.rcToIndex(colMax, rowIndexs[i]);
+                    var index = Tool.rcToIndex(rowIndexs[i], colMax);
                     if (lattices[index]) indexs.push(index)
                 }
             }
+        }else{
+            indexs.push(centerIndex)
+        }
         var loop = []
         //根据索引
         for (var i = 0; i < indexs.length; i++) {
@@ -83,9 +89,33 @@ export function RectsWaveAni(
         }
         //总
         loops.push(loop);
+        // console.log(indexs)
+
+        num++;
     }
 
     //动画
+    let loopsLen = loops.length
+    for (let m = 0; m < loops.length; m++) {
+        let loop = loops[m];
+        let wait = m * 100;
+        let loopLen = loop.length;
+        for (let n = 0; n < loop.length; n++) {
+            let rect = loop[n];
+            egret.Tween.get(rect)
+                .wait(wait)
+                .to({ alpha: 1 }, 150)
+                .to({ alpha: 0 }, 150)
+                .call(() => {
+                    //回收
+                    if(rect.parent){
+                        rect.parent.removeChild(rect);
+                        whiteRectPool.push(rect);
+                    }
+                    if (m == loopsLen-1 && n == loopLen-1 && callback) callback();
+                })
+        }
+    }
 }
 
 class WhiteRect extends egret.Bitmap {
@@ -93,8 +123,8 @@ class WhiteRect extends egret.Bitmap {
         super();
         var texture: egret.Texture = RES.getRes("rectLatWhite_png");
         this.texture = texture;
-        this.x = -texture.textureWidth / 2;
-        this.y = -texture.textureHeight / 2;
+        this.anchorOffsetX = texture.textureWidth / 2;
+        this.anchorOffsetY = texture.textureHeight / 2;
     }
 }