1

egret/libs/new_wx/components/StartSceneBase.ts

@@ -4,6 +4,7 @@ import { DataManager } from "../../tw/manager/DataManager";
 import PanelCtrl from "../ctrls/panelCtrl";
 import { ModuleTypes } from "../types/sceneTypes";
 import Scene from "./Scene";
+import { TwFun } from "../../tw/util/TwFun";
 
 export default class StartSceneBase extends Scene {
     ruleBtn: eui.Button;
@@ -77,6 +78,7 @@ export default class StartSceneBase extends Scene {
     }
 
     onTap_recordBtn(e: egret.Event) {
+        window.location.href = TwFun.getRecordUrl('00');
     }
 
     onTap_rankBtn(e: egret.Event) {

egret/resource/TextureMerger/preload.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/startScene/scorebg.png","../assets/startScene/progressbg.png","../assets/startScene/progressfront.png","../assets/startScene/progress_f3.png","../assets/startScene/progress_f2.png","../assets/startScene/progress_f1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/start.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/basket_bottom.png","../assets/startScene/basket_top.png","../assets/startScene/bubble.png","../assets/startScene/glass.png","../assets/startScene/optionBtn.png","../assets/startScene/rankBtn.png","../assets/startScene/recordbtn.png","../assets/startScene/ruleBtn.png","../assets/startScene/start_btn_gray.png","../assets/startScene/start_btn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/start_btn.png","../assets/startScene/start_btn_gray.png","../assets/startScene/ruleBtn.png","../assets/startScene/recordbtn.png","../assets/startScene/rankBtn.png","../assets/startScene/optionBtn.png","../assets/startScene/glass.png","../assets/startScene/bubble.png","../assets/startScene/basket_top.png","../assets/startScene/basket_bottom.png"]}
\ No newline at end of file

egret/resource/assets/startScene/egg.json

+{"file":"egg.png","frames":{
+"0":{"x":0,"y":0,"w":55,"h":74,"offX":22,"offY":13,"sourceW":100,"sourceH":100},
+"1":{"x":57,"y":0,"w":55,"h":72,"offX":22,"offY":14,"sourceW":100,"sourceH":100},
+"2":{"x":0,"y":136,"w":56,"h":60,"offX":22,"offY":20,"sourceW":100,"sourceH":100},
+"3":{"x":58,"y":136,"w":57,"h":56,"offX":21,"offY":22,"sourceW":100,"sourceH":100},
+"4":{"x":171,"y":72,"w":55,"h":69,"offX":22,"offY":15,"sourceW":100,"sourceH":100},
+"5":{"x":114,"y":0,"w":55,"h":71,"offX":22,"offY":14,"sourceW":100,"sourceH":100},
+"6":{"x":171,"y":0,"w":55,"h":70,"offX":22,"offY":15,"sourceW":100,"sourceH":100},
+"7":{"x":176,"y":143,"w":56,"h":56,"offX":22,"offY":22,"sourceW":100,"sourceH":100},
+"8":{"x":117,"y":143,"w":57,"h":56,"offX":21,"offY":22,"sourceW":100,"sourceH":100},
+"9":{"x":57,"y":74,"w":56,"h":60,"offX":22,"offY":20,"sourceW":100,"sourceH":100}}}
\ No newline at end of file

egret/resource/default.res.json

@@ -10,7 +10,7 @@
 		},
 		{
 			"name": "preload",
-			"keys": "scorebg_png"
+			"keys": "scorebg_png,progressbg_png,progressfront_png,egg_json,progress_f3_png,progress_f2_png,progress_f1_png"
 		}
 	],
 	"resources": [
@@ -279,6 +279,37 @@
 			"name": "scorebg_png",
 			"type": "image",
 			"url": "assets/startScene/scorebg.png"
+		},
+		{
+			"name": "progressbg_png",
+			"type": "image",
+			"url": "assets/startScene/progressbg.png"
+		},
+		{
+			"name": "progressfront_png",
+			"type": "image",
+			"url": "assets/startScene/progressfront.png"
+		},
+		{
+			"name": "egg_json",
+			"type": "sheet",
+			"url": "assets/startScene/egg.json",
+			"subkeys": "0,1,2,3,4,5,6,7,8,9"
+		},
+		{
+			"name": "progress_f3_png",
+			"type": "image",
+			"url": "assets/startScene/progress_f3.png"
+		},
+		{
+			"name": "progress_f2_png",
+			"type": "image",
+			"url": "assets/startScene/progress_f2.png"
+		},
+		{
+			"name": "progress_f1_png",
+			"type": "image",
+			"url": "assets/startScene/progress_f1.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/StartSkin.exml

@@ -2,6 +2,8 @@
 <e:Skin class="StartSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16705cb4eec"/>
 	<e:Image source="startscenebg_jpg" x="0" y="0"/>
+	<e:Image source="scorebg_png" horizontalCenter="0" top="0"/>
+	<e:Label id="scoreTxt" text="得分:0" height="48" width="750" horizontalCenter="0" top="0" textAlign="center" verticalAlign="middle" textColor="0xfcdf9b"/>
 	<e:Label id="exemptionTxt" text="*兑换项与活动均与设备制造商Apple Inc.公司无关*" width="100%" horizontalCenter="0" bottom="5"
 	         verticalAlign="middle" textAlign="center" size="18"  textColor="0xffffff"/>
 	<e:Button id="recordBtn" label="" y="16" scaleX="1" scaleY="1" right="23">
@@ -22,7 +24,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="ruleBtn" label="" y="16" scaleX="1" scaleY="1" left="30">
+	<e:Button id="ruleBtn" label="" y="16" scaleX="1" scaleY="1" left="28">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 				<e:Image width="100%" height="100%" source="ruleBtn_png" source.down="ruleBtn_png" source.disabled="ruleBtn_png" />
@@ -58,6 +60,11 @@
 	<e:Image id="basket_bottom" source="basket_bottom_png" x="291.5" y="163.88"/>
 	<e:Image id="basket_top" source="basket_top_png" x="291.6" y="426.08"/>
 	<e:Image source="bubble_png" x="268" y="1082" visible="false"/>
-	<e:Image source="scorebg_png" horizontalCenter="0" top="0"/>
-	<e:Label id="score" text="得分:1234" height="48" width="750" horizontalCenter="0" top="0" textAlign="center" verticalAlign="middle" textColor="0xfcdf9b"/>
+	<e:Group y="74" width="386" height="36" horizontalCenter="0">
+		<e:Image source="progressbg_png" y="0" x="0" locked="true"/>
+		<e:Image id="progressfront" source="progressfront_png" scale9Grid="18,7,8,17" width="380" horizontalCenter="0" verticalCenter="-1"/>
+		<e:Image source="progress_f1_png" verticalCenter="0" x="43" anchorOffsetX="32.5"/>
+		<e:Image source="progress_f2_png" verticalCenter="0.5" anchorOffsetX="29.5" x="154.5"/>
+		<e:Image source="progress_f3_png" verticalCenter="0" x="325"/>
+	</e:Group>
 </e:Skin>
\ No newline at end of file

egret/scripts/MyExmlPlugin.ts

-import { ExmlPlugin } from "built-in";
 import { ExmlPlugin2 } from "./ExmlPlugin2";
 
 /**
@@ -14,6 +13,7 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
             'candy.png',
             'success.png',
             'fail.png',
+            'egg.png',
         ];
         if (excludes.indexOf(file.basename) != -1) {
             return file;

egret/src/physics/BaseItem.ts

 import MovieClip from "./movieclip/MovieClip";
+import LabelType from "../startScene/items/LabelType";
 
 export default class BaseItem extends egret.Sprite {
     _mc: MovieClip;
-    type: string
-    constructor(mc: MovieClip, type?: string) {
+    type: LabelType;
+    constructor(mc: MovieClip, type?: LabelType) {
         super();
         this.type = type;
         this._mc = mc;

egret/src/physics/EgretRender.ts

@@ -9,10 +9,12 @@ export default class EgretRender {
         this._engine = engine;
     }
 
-    addBody(body: Matter.Body, display: egret.DisplayObject) {
+    addBody(body: Matter.Body, display: egret.DisplayObject, x, y) {
         if (display) {
             body['display'] = display;
             this._root.addChildAt(display, 0);
+            display.x = x;
+            display.y = y;
         }
         return body;
     }
@@ -80,13 +82,13 @@ export default class EgretRender {
 
     private rectangleToRender(x: number, y: number, width: number, height: number, display: egret.DisplayObject, options?: Matter.IChamferableBodyDefinition) {
         const body = Matter.Bodies.rectangle(x, y, width, height, options);
-        this.addBody(body, display);
+        this.addBody(body, display, x, y);
         return body;
     }
 
     private circleToRender(x: number, y: number, radius: number, display: egret.DisplayObject, options?: Matter.IChamferableBodyDefinition) {
         const body = Matter.Bodies.circle(x, y, radius, options);
-        this.addBody(body, display);
+        this.addBody(body, display, x, y);
         return body;
     }
 }
\ No newline at end of file

egret/src/startScene/StartScene.ts

@@ -16,6 +16,44 @@ export default class StartScene extends StartSceneBase {
     _startStandbyBubblesLeft: number;
     _startStandbyBubblesRight: number;
     egretRenderContainer: egret.Sprite;
+    score =0;
+    MAX_SCORE = 50;
+    private scoreTxt: eui.Label;
+
+    updateProgress() {
+        const percent = this.score / this.MAX_SCORE;
+        const maxwidth = this.progressfront.width;
+        egret.Tween.removeTweens(this.progressfront.mask);
+        egret.Tween.get(this.progressfront.mask).to({ width: percent * maxwidth }, 200);
+    }
+
+    onBoom(): any {
+        this.score = 0;
+        this.updateProgress();
+        this.updateScoreTxt();
+    }
+    // onBoom(): any {
+    //     this.score--;
+    //     if (this.score < 0) this.score = 0;
+    //     this.updateProgress();
+    //     this.updateScoreTxt();
+    // }
+
+    addScore(): any {
+        this.score++;
+        const old = this.score;
+        if (old == this.MAX_SCORE) {
+            this.score = 0;
+        }
+        this.updateScoreTxt();
+        this.updateProgress();
+        return old;
+    }
+
+    updateScoreTxt() {
+        this.scoreTxt.text = `得分:${this.score}`;
+    }
+
     async start(data?) {
         super.start();
         egret.lifecycle.onPause = () => {
@@ -71,7 +109,11 @@ export default class StartScene extends StartSceneBase {
     async runGame() {
         createBox(this);
 
-        const reslist = ['boom', 'gift', 'candy', 'coin']
+        const rect = new egret.Rectangle(0, 0, 380, 28);
+        rect.width = 0;
+        this.progressfront.mask = rect;
+
+        const reslist = ['boom', 'gift', 'candy', 'coin', 'egg']
         await Promise.all(
             reslist.map(res => RES.getResAsync(`${res}_json`))
         );
@@ -132,6 +174,7 @@ export default class StartScene extends StartSceneBase {
 
         [this['leftBtn'], this['rightBtn']].forEach(btn => {
             btn.addEventListener(egret.TouchEvent.TOUCH_TAP, (e: egret.TouchEvent) => {
+                // createNewBubble(this,LabelType.candy)
                 this.addForce = true;
                 this.stageX = e.stageX;
                 if (this.stageX < 375) {
@@ -165,7 +208,10 @@ export default class StartScene extends StartSceneBase {
         const knockout = false;            /// 指定对象是否具有挖空效果，暂未实现
         const glowFilter: egret.GlowFilter = new egret.GlowFilter(color, alpha, blurX, blurY,
             strength, quality, inner, knockout);
-        this['score'].filters = [glowFilter];
+        this['scoreTxt'].filters = [glowFilter];
+
+        this.updateScoreTxt();
+        this.updateProgress();
     }
 
     runEngine() {
@@ -188,6 +234,8 @@ export default class StartScene extends StartSceneBase {
         return false;
     }
 
+    progressfront: egret.DisplayObject;
+
     destroy() {
         super.destroy();
     }

egret/src/startScene/check.ts

@@ -2,6 +2,8 @@ import { award } from "./collisionConfig";
 import StartScene from "./StartScene";
 import { playBoom, playSuccess, playScoreAni } from "./playMovieClip";
 import vibrate from "./vibrate";
+import LabelType from "./items/LabelType";
+import { createNewBubble } from "./createItems";
 
 const check = (_this: StartScene) => {
     const center = 382;
@@ -21,7 +23,7 @@ const check = (_this: StartScene) => {
             if (t0 > 3000)//3s之内不可再用
             {
                 delete i['timer'];
-                console.log('重新可用', Date.now() / 1000)
+                // console.log('重新可用', Date.now() / 1000)
             }
         }
         const { x, y } = i.position;
@@ -29,21 +31,39 @@ const check = (_this: StartScene) => {
         const yResult = y > ypos && y < (ypos + h);
         if (xResult && yResult && i.velocity.y > 0 && !i['timer']) {
             i['timer'] = Date.now();
-            if (i.label == 'boom') {
-                console.log('boom');
+            if (i.label == LabelType.boom) {
+                // console.log('boom');
                 _this._egretRender.remove(i);
                 vibrate(_this, 2);
                 playBoom(_this.egretRenderContainer);
-                playScoreAni(_this.egretRenderContainer, -1);
+                // playScoreAni(_this.egretRenderContainer, -1);
+                _this.onBoom();
             }
+            // else if(i.label ==LabelType.gift){
+
+            // }
             else {
-                console.log('不是boom，重用', Date.now() / 1000);
+                // console.log('不是boom，重用', Date.now() / 1000);
                 playScoreAni(_this.egretRenderContainer, 1)
                 playSuccess(_this.egretRenderContainer);
+                const oldscore = _this.addScore();
+                checkAdd(_this, oldscore);
             }
             // _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);
+    }
+}
+
 export default check
\ No newline at end of file

egret/src/startScene/createItems.ts

@@ -2,30 +2,41 @@ import StartScene from "./StartScene";
 import createItem from "./items/createItem";
 import { award, awardMask } from "./collisionConfig";
 import random from "./random";
+import LabelType from "./items/LabelType";
+
+export const createNewBubble = (_this: StartScene,type:LabelType) => {
+    createBubble(_this, type, Math.random() > 0.5 ? 180 : 750 - 180, 220);
+}
+
+const createBubble = (_this: StartScene, type: LabelType, x: number, y: number) => {
+    let scale;
+    const size = random(70, 100);
+    const maxsize = 100;
+    scale = size / maxsize;
+    const baseItem = createItem(scale, type);
+    let angle;
+    angle = 0;
+    //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
+    //刚体和贴图尺寸比为1:1.12
+    _this._egretRender.circle(x, y, (size - 17) / 2, baseItem,
+        {
+            frictionAir: 0,
+            collisionFilter: { group: award, category: award, mask: awardMask },
+            angle: angle,
+            label: baseItem.type,
+            friction: 0
+        });
+}
 
 export default (_this: StartScene) => {
     let count = 0;
     const coinsFall = setInterval(() => {
         if (count < 14) {
-            let scale;
-            // scale = random(0.7,1);
-            // scale=1;
-            const size = random(70, 100);
-            const maxsize = 100;
-            scale = size / maxsize;
-            const baseItem = createItem(scale);
-            let angle;
-            angle = 0;
-            //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
-            //刚体和贴图尺寸比为1:1.12
-            _this._egretRender.circle(375 + Math.random() * 200 - 100, 400 + 200 + 100, (size - 17) / 2, baseItem,
-                {
-                    frictionAir: 0,
-                    collisionFilter: { group: award, category: award, mask: awardMask },
-                    angle: angle,
-                    label: baseItem.type,
-                    friction: 0
-                });
+            const types = [ LabelType.candy, LabelType.coin, LabelType.gift,LabelType.egg]
+            // const types = [LabelType.boom, LabelType.candy, LabelType.coin, LabelType.gift,LabelType.egg]
+            const i = Math.floor(Math.random() * types.length);
+            const type = types[i];
+            createBubble(_this, type, 375 + Math.random() * 200 - 100, 400 + 200 + 100)
             count++;
         } else {
             //结束

egret/src/startScene/items/LabelType.ts

+enum LabelType {
+    boom='boom',candy='candy',coin='coin',gift='gift',egg='egg'
+}
+
+export default LabelType
\ No newline at end of file

egret/src/startScene/items/createBoom.ts

 import BaseItem from "../../physics/BaseItem";
 import MovieClip from "../../physics/movieclip/MovieClip";
+import LabelType from "./LabelType";
 
 const createBoom = (scale) => {
     //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
@@ -7,7 +8,7 @@ const createBoom = (scale) => {
     //炸弹纹理种炸弹的尺寸默认58，不进行缩放
     //气泡和炸弹的比例为100/58
     const animation = createBoomMovieClip(boomTexture);
-    const baseItem = new BaseItem(animation, 'boom');
+    const baseItem = new BaseItem(animation, LabelType.boom);
     baseItem.scaleX = baseItem.scaleY = scale;
     return baseItem
 }

egret/src/startScene/items/createCandy.ts

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

egret/src/startScene/items/createCoin.ts

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

egret/src/startScene/items/createEgg.ts

+import BaseItem from "../../physics/BaseItem";
+import MovieClip from "../../physics/movieclip/MovieClip";
+import LabelType from "./LabelType";
+
+const createEgg = (scale) => {
+    //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
+    const texture = RES.getRes('egg_json');
+    const animation = createMovieClip(texture, 1);//礼物纹理大概130
+    const baseItem = new BaseItem(animation, LabelType.egg);
+    baseItem.scaleX = baseItem.scaleY = scale;
+    return baseItem
+}
+
+const createMovieClip = (spritesheet, scale) => {
+    const list = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+    const movieclip = new MovieClip({
+        spritesheet: spritesheet,
+        frameInterval: 5,
+        frames: list,
+        position: [0, 0],
+        scale: scale,
+        anchor: [.5, .5]
+    });
+    return movieclip
+}
+
+export default createEgg
\ No newline at end of file

egret/src/startScene/items/createGift.ts

 import BaseItem from "../../physics/BaseItem";
 import MovieClip from "../../physics/movieclip/MovieClip";
+import LabelType from "./LabelType";
 
 const createGift = (scale) =>{
     //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
     const texture = RES.getRes('gift_json');
     const animation = createGiftMovieClip(texture, 0.5);//礼物纹理大概130
-    const baseItem = new BaseItem(animation, 'gift');
+    const baseItem = new BaseItem(animation,LabelType.gift);
     baseItem.scaleX = baseItem.scaleY = scale;
     return baseItem
 }

egret/src/startScene/items/createItem.ts

 import createBoom from "./createBoom";
-import createGift from "./createGift";
 import createCandy from "./createCandy";
 import createCoin from "./createCoin";
+import createEgg from "./createEgg";
+import createGift from "./createGift";
+import LabelType from "./LabelType";
 
-const createItem = (scale) => {
-    const funcs = [createBoom, createGift,createCandy,createCoin];
-    const i = Math.floor(Math.random() * funcs.length);
-    const func = funcs[i];
+const createItem = (scale, type: LabelType) => {
+    const funcs = {
+        'boom': createBoom,
+        'gift': createGift,
+        'candy': createCandy,
+        'egg': createEgg,
+        'coin': createCoin
+    };
+    const func = funcs[type];
+    
     return func(scale);
 }
-export default createItem
-
+export default createItem
\ No newline at end of file
-//56fff9
\ No newline at end of file