1

egret/src/startScene/StartScene.ts

@@ -9,7 +9,7 @@ import createBox from "./createBox";
 import createBtns from "./createBtns";
 import createBubblePic from "./createBubblePic";
 import createItems from "./createItems";
-import { addLvScore, getCurrentPercent, onLvBoom, getCurrentLevel, getLevelAniTag, setLevelAniTag } from "./levels";
+import {  getCurrentPercent, onLvBoom, getCurrentLevel, getLevelAniTag, setLevelAniTag, addCurrentScore } from "./levels";
 import random from "./random";
 import { startStandbyBubblesLeft, startStandbyBubblesRight, stopStandbyBubblesLeft, stopStandbyBubblesRight } from "./standbyBubbles";
 import updateLVProgress from "./updateLVProgress";
@@ -73,7 +73,7 @@ export default class StartScene extends StartSceneBase {
     }
 
     addScore(): any {
-        addLvScore();
+        addCurrentScore();
         this.updateProgress();
     }
 

egret/src/startScene/check.ts

@@ -4,6 +4,9 @@ import { playBoom, playSuccess, playScoreAni } from "./playMovieClip";
 import vibrate from "./vibrate";
 import LabelType from "./items/LabelType";
 import { createNewBubble } from "./createItems";
+import { getCurrentScore, getLevelData } from "./levels";
+import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
 
 const check = (_this: StartScene) => {
     const center = 382;
@@ -35,34 +38,38 @@ const check = (_this: StartScene) => {
                 _this._egretRender.remove(i);
                 vibrate(_this, 2);
                 playBoom(_this.egretRenderContainer);
-                // playScoreAni(_this.egretRenderContainer, -1);
                 _this.onBoom();
             }
-            else if(i.label ==LabelType.egg){
-
+            else if (i.label == LabelType.egg) {
+                _this._egretRender.remove(i);
+            }
+            else if (i.label == LabelType.candy) {
+                _this._egretRender.remove(i);
+                PanelCtrl.instance.show(ModuleTypes.TREASURE_PANEL);
             }
-            else {
+            else if (i.label == LabelType.gift) {
+                _this._egretRender.remove(i);
+            } else {
                 // console.log('不是boom，重用', Date.now() / 1000);
                 playScoreAni(_this.egretRenderContainer, 1)
                 playSuccess(_this.egretRenderContainer);
-                const oldscore = _this.addScore();
-                checkAdd(_this, oldscore);
+                _this.addScore();
+                checkAdd(_this);
             }
-            // _this.onGetAward();
         }
     })
 }
 
-const checkAdd = (that: StartScene, oldscore) => {
-    // if (oldscore === 5) {
-    //     createNewBubble(that, LabelType.candy);
-    // }
-    // else if (oldscore === 20) {
-    //     createNewBubble(that, LabelType.egg);
-    // }
-    // else if (oldscore === that.MAX_SCORE) {
-    //     createNewBubble(that, LabelType.gift);
-    // }
+const checkAdd = (that: StartScene) => {
+    const oldscore = getCurrentScore();
+    const awards = getLevelData().awards;
+    for (const award of awards) {
+        if (award[0] == oldscore) {
+            const type = award[1];
+            createNewBubble(that, type);
+            break;
+        }
+    }
 }
 
 export default check
\ No newline at end of file

egret/src/startScene/createItems.ts

@@ -6,10 +6,10 @@ import LabelType from "./items/LabelType";
 import { getCurrentItems } from "./levels";
 
 export const createNewBubble = (_this: StartScene, type: LabelType) => {
-    createBubble(_this, type, Math.random() > 0.5 ? 180 : 750 - 180, 220);
+    createBubble(_this, type, 750/2, 220,0.001*100);
 }
 
-const createBubble = (_this: StartScene, type: LabelType, x: number, y: number) => {
+const createBubble = (_this: StartScene, type: LabelType, x: number, y: number,density=0.001) => {
     let scale;
     const size = random(70, 100);
     const maxsize = 100;
@@ -25,7 +25,8 @@ const createBubble = (_this: StartScene, type: LabelType, x: number, y: number)
             collisionFilter: { group: award, category: award, mask: awardMask },
             angle: angle,
             label: baseItem.type,
-            friction: 0
+            friction: 0,
+            density:density
         });
 }
 

egret/src/startScene/items/createCoin.ts

@@ -6,7 +6,7 @@ const createCoin = (scale) => {
     //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
     const texture = RES.getRes('coin_json') as egret.SpriteSheet;
     const animation = createMovieClip(texture, 0.6);
-    const baseItem = new BaseItem(animation,LabelType.candy);
+    const baseItem = new BaseItem(animation,LabelType.coin);
     baseItem.scaleX = baseItem.scaleY = scale;
     return baseItem
 }

egret/src/startScene/levels.ts

 import LabelType from "./items/LabelType";
 
 const levels = {
-    '1': { max: 5, items: [[LabelType.boom, 1], [LabelType.coin, 5]] }
+    '1': { max: 5, items: [[LabelType.boom, 1], [LabelType.coin, 5]], awards: [[5, LabelType.candy]] }
 }
 
 const MAX_LEVELS = 4;
@@ -48,10 +48,6 @@ export const onLvBoom = () => {
     clearCurrentScore();
 }
 
-export const addLvScore = () => {
-    addCurrentScore();
-}
-
 export const getLevelData = () => {
     return levels[getCurrentLevel()]
 }