1

egret/index.html

@@ -78,7 +78,7 @@
     </script>
 
     <script src="output.js"></script>
-     <div id="debugCanvas" style="position:absolute;opacity: .9;pointer-events: none"></div>
+     <!-- <div id="debugCanvas" style="position:absolute;opacity: .9;pointer-events: none"></div> -->
 </body>
 
 </html>
\ No newline at end of file

egret/libs/new_wx/ctrls/sceneCtrl.ts

@@ -41,7 +41,9 @@ export default class SceneCtrl {
             this._parent.removeChild(oldScene);
         }
         scene.loadSkin();
-        scene.start();
+        scene.once(egret.Event.ADDED_TO_STAGE, () => { 
+            scene.start();
+        }, this);
         this.addToStage(scene);
         onComplete && onComplete();
     }

egret/resource/assets/mc/candy.json

-{"file":"candy.png","frames":{
-"8":{"x":0,"y":0,"w":113,"h":115,"offX":1,"offY":0,"sourceW":115,"sourceH":115},
-"4":{"x":96,"y":232,"w":66,"h":113,"offX":24,"offY":1,"sourceW":115,"sourceH":115},
-"5":{"x":230,"y":0,"w":22,"h":112,"offX":46,"offY":1,"sourceW":115,"sourceH":115},
-"7":{"x":0,"y":117,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
-"6":{"x":164,"y":232,"w":66,"h":113,"offX":24,"offY":1,"sourceW":115,"sourceH":115},
-"2":{"x":115,"y":116,"w":112,"h":114,"offX":1,"offY":0,"sourceW":115,"sourceH":115},
-"3":{"x":0,"y":232,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
-"1":{"x":115,"y":0,"w":113,"h":114,"offX":1,"offY":0,"sourceW":115,"sourceH":115}}}
\ No newline at end of file

egret/resource/assets/mc/gift.json

-{"file":"gift.png","frames":{
-"8":{"x":0,"y":150,"w":118,"h":143,"offX":16,"offY":3,"sourceW":150,"sourceH":150},
-"9":{"x":266,"y":141,"w":126,"h":139,"offX":12,"offY":5,"sourceW":150,"sourceH":150},
-"10":{"x":266,"y":0,"w":126,"h":139,"offX":12,"offY":5,"sourceW":150,"sourceH":150},
-"4":{"x":394,"y":0,"w":116,"h":135,"offX":17,"offY":7,"sourceW":150,"sourceH":150},
-"5":{"x":258,"y":282,"w":104,"h":135,"offX":23,"offY":7,"sourceW":150,"sourceH":150},
-"7":{"x":394,"y":137,"w":112,"h":138,"offX":19,"offY":6,"sourceW":150,"sourceH":150},
-"6":{"x":394,"y":277,"w":100,"h":142,"offX":25,"offY":4,"sourceW":150,"sourceH":150},
-"2":{"x":134,"y":0,"w":130,"h":145,"offX":10,"offY":2,"sourceW":150,"sourceH":150},
-"3":{"x":134,"y":147,"w":122,"h":143,"offX":14,"offY":3,"sourceW":150,"sourceH":150},
-"1":{"x":0,"y":0,"w":132,"h":148,"offX":9,"offY":1,"sourceW":150,"sourceH":150}}}
\ No newline at end of file

egret/resource/default.res.json

@@ -223,12 +223,6 @@
 			"name": "gift2_json",
 			"subkeys": "礼盒0000,礼盒0001,礼盒0002,礼盒0003,礼盒0004,礼盒0005,礼盒0006,礼盒0007,礼盒0008,礼盒0009,礼盒0010,礼盒0011,礼盒0012,礼盒0013,礼盒0014,礼盒0015"
 		},
-		{
-			"url": "assets/mc/gift.json",
-			"type": "sheet",
-			"name": "gift_json",
-			"subkeys": "1,10,2,3,4,5,6,7,8,9"
-		},
 		{
 			"url": "assets/mc/egg.json",
 			"type": "sheet",
@@ -253,12 +247,6 @@
 			"name": "candy2_json",
 			"subkeys": "礼盒0000,礼盒0001,礼盒0002,礼盒0003,礼盒0004,礼盒0005,礼盒0006,礼盒0007,礼盒0008,礼盒0009,礼盒0010,礼盒0011,礼盒0012,礼盒0013,礼盒0014,礼盒0015"
 		},
-		{
-			"url": "assets/mc/candy.json",
-			"type": "sheet",
-			"name": "candy_json",
-			"subkeys": "1,2,3,4,5,6,7,8"
-		},
 		{
 			"url": "assets/mc/boom.json",
 			"type": "sheet",

egret/resource/skins/StartSkin.exml

@@ -3,7 +3,7 @@
 	<w:Config id="16705cb4eec"/>
 	<e:Group id="group" x="0" y="0">
 		<e:Image id="bg" source="startscenebg_jpg" x="0" y="0" locked="true"/>
-		<e:Group id="lights" x="-3.04" y="700.53" locked="true">
+		<e:Group id="lights" x="-3.04" y="700.53">
 			<e:Image id="lights1" source="灯1_png" y="0" x="0"/>
 			<e:Image id="lights2" source="灯2_png" x="0" y="0"/>
 		</e:Group>
@@ -15,24 +15,24 @@
 		<e:Image id="leftbasket" source="垃圾桶后盖_png" x="44.2" y="1329"/>
 		<e:Image id="arrow" source="arrow_png" y="1173" anchorOffsetX="275" anchorOffsetY="279" rotation="0" horizontalCenter="-2"/>
 		<e:Image id="pipeline" source="bg3_png" y="0" horizontalCenter="0"/>
-		<e:Image source="前景_png" bottom="0" horizontalCenter="0" locked="true"/>
+		<e:Image source="前景_png" x="0" y="1333"/>
+		<e:Button id="leftBtn" label="" y="1362" scaleX="1" scaleY="1" left="43" alpha="1">
+			<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="btnLeft_png" source.down="btnLeft_png" source.disabled="btnLeft_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" size="26"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
+		<e:Button id="rightBtn" label="" y="1362" scaleX="1" scaleY="1" alpha="1" x="550.33">
+			<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="btnRight_png" source.down="btnRight_png" source.disabled="btnRight_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" size="26"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
 	</e:Group>
-	<e:Button id="leftBtn" label="" y="1292.3" scaleX="1" scaleY="1" left="43" alpha="1" visible="false">
-		<e:skinName>
-		<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="btnLeft_png" source.down="btnLeft_png" source.disabled="btnLeft_png"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" size="26"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
-	<e:Button id="rightBtn" label="" y="1292.3" scaleX="1" scaleY="1" alpha="1" x="550.33" visible="false">
-		<e:skinName>
-		<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="btnRight_png" source.down="btnRight_png" source.disabled="btnRight_png"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" size="26"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
 	<e:Label id="exemptionTxt" text="*兑换项与活动均与设备制造商Apple Inc.公司无关*" width="100%" verticalAlign="middle" textAlign="center" size="18" y="1601" x="0" textColor="0x000000" visible="false"/>
 	<e:Button id="recordBtn" label="奖品记录" y="16" scaleX="1" scaleY="1" right="23" visible="false">
 		<e:skinName>

egret/src/startScene/LabelType.ts

 enum LabelType {
-    Coin,
-    Boom,
-    Gift,
-    Candy,
-    Gift2,
-    Gift3,
-    Candy2,
-    IceCream,
-    Donut,
-    Egg,
+    Coin='Coin',
+    Boom='Boom',
+    Gift2='Gift2',
+    Gift3='Gift3',
+    Candy2='Candy2',
+    IceCream='IceCream',
+    Donut='Donut',
+    Egg='Egg',
 }
 
 export default LabelType
\ No newline at end of file

egret/src/startScene/StartScene.ts

@@ -17,6 +17,8 @@ export default class StartScene extends StartSceneBase {
     egretRenderContainer: egret.Sprite;
     async start(data?) {
         super.start();
+
+        
         egret.lifecycle.onPause = () => {
             console.log("app 进入后台");
             egret.ticker.pause(); // 关闭渲染与心跳
@@ -34,7 +36,7 @@ export default class StartScene extends StartSceneBase {
         //创建egret渲染
         this.egretRenderContainer = new egret.Sprite();
         this._egretRender = new EgretRender(this.egretRenderContainer, this._engine);
-        this.once(egret.Event.ADDED_TO_STAGE, () => { this['group'].y = this.stage.stageHeight - 1624; }, this);
+        this['group'].y = this.stage.stageHeight - 1624;
         this['group'].addChildAt(this.egretRenderContainer, 5);
         // [this['basket_bottom'], this['basket_top'], this['glass']].forEach(item =>
         //     egret.Tween.get(item).set({ alpha: 0 }).to({ alpha: 1 }, 500));
@@ -89,15 +91,6 @@ export default class StartScene extends StartSceneBase {
         const { seesaw } = createBox(this);
         this._seesaw = seesaw;
 
-        const reslist = ['boom', 'gift', 'gift2', 'gift3', 'candy', 'candy2',
-            'coin',
-            'donut',
-            'egg',
-            'icecream']
-        await Promise.all(
-            reslist.map(res => RES.getResAsync(`${res}_json`))
-        );
-
         createItems(this);
 
         let touchLeft = false;
@@ -122,20 +115,18 @@ export default class StartScene extends StartSceneBase {
             return false;
         }
 
-        this.stage.addEventListener(egret.TouchEvent.TOUCH_BEGIN, (e: egret.TouchEvent) => {
-            touchLeft = e.stageX < 375;
-            touchRight = !touchLeft;
-            ontick();
-            egret.startTick(ontick, this);
-        }, this);
-
-        this.stage.addEventListener(egret.TouchEvent.TOUCH_END, (e: egret.TouchEvent) => {
-            egret.stopTick(ontick, this);
-        }, this);
-
         [this['leftBtn'], this['rightBtn']].forEach(btn => {
-            btn.addEventListener(egret.TouchEvent.TOUCH_TAP, (e: egret.TouchEvent) => {
+            btn.addEventListener(egret.TouchEvent.TOUCH_BEGIN, (e: egret.TouchEvent) => {
+                touchLeft = e.stageX < 375;
+                touchRight = !touchLeft;
+                ontick();
+                egret.startTick(ontick, this);
+            }, this);
+        });
 
+        [this['leftBtn'], this['rightBtn']].forEach(btn => {
+            btn.addEventListener(egret.TouchEvent.TOUCH_END, (e: egret.TouchEvent) => {
+                egret.stopTick(ontick, this);
             }, this);
         });
     }

egret/src/startScene/check.ts

@@ -2,48 +2,64 @@ import { award } from "./collisionConfig";
 import StartScene from "./StartScene";
 import { playBoom, playSuccess, playScoreAni } from "./playMovieClip";
 import vibrate from "./vibrate";
+import LabelType from "./LabelType";
 
 const check = (_this: StartScene) => {
-    const center = 382;
-    const paddingX = 50;
-    const ypos = 440;
-    const h = 40;
+    const center = 109;
+    const paddingX = 30;
+    const ypos = 1386;
+    const h = 100;
+
+    const center2 = 643;
+    const paddingX2 = 40+5;
+    const ypos2 = 1386-20-5;
+    const h2 = 50;
+
     // _this._egretRender._root.graphics.beginFill(0xff0000, 1);
     // _this._egretRender._root.graphics.drawRect(center - paddingX, ypos, paddingX * 2, h);
     // _this._egretRender._root.graphics.endFill();
+    // _this._egretRender._root.graphics.beginFill(0xff0000, 1);
+    // _this._egretRender._root.graphics.drawRect(center2 - paddingX2, ypos2, paddingX2 * 2, h2);
+    // _this._egretRender._root.graphics.endFill();
+
+    const bodies = Matter.Composite.allBodies(_this._engine.world);
+    const isAward = (i: Matter.Body) => { return i.collisionFilter.group == award }
+    bodies.forEach(i => {
+        if (!isAward(i)) return;
+        if (i['timer']) {
+            const t0 = Date.now() - i['timer'];
+            if (t0 > 3000)//3s之内不可再用
+            {
+                delete i['timer'];
+                console.log('重新可用', Date.now() / 1000)
+            }
+        }
+        const { x, y } = i.position;
+        const xResult = x > (center - paddingX) && x < (center + paddingX);
+        const yResult = y > ypos && y < (ypos + h);
+        const xResult2 = x > (center2 - paddingX2) && x < (center2 + paddingX2);
+        const yResult2 = y > ypos2 && y < (ypos2 + h2);
+        const fallingIn = xResult && yResult || xResult2 && yResult2;
+        if (fallingIn && i.velocity.y > 0 && !i['timer']) {
+            i['timer'] = Date.now();
+            console.log(i.label);
+            if (i.label == LabelType.Boom) {
+                _this._egretRender.remove(i);
+                vibrate(_this, 2);
+                // playBoom(_this.egretRenderContainer);
+                // playScoreAni(_this.egretRenderContainer, -1);
+            }
+            else {
+                console.log('不是boom', Date.now() / 1000);
+                _this._egretRender.remove(i);
+                // playScoreAni(_this.egretRenderContainer, 1)
+                // playSuccess(_this.egretRenderContainer);
+            }
+            // _this.onGetAward();
+        }
+    })
+
 
-    // const bodies = Matter.Composite.allBodies(_this._engine.world);
-    // const isAward = (i: Matter.Body) => { return i.collisionFilter.group == award }
-    // bodies.forEach(i => {
-    //     if (!isAward(i)) return;
-    //     if (i['timer']) {
-    //         const t0 = Date.now() - i['timer'];
-    //         if (t0 > 3000)//3s之内不可再用
-    //         {
-    //             delete i['timer'];
-    //             console.log('重新可用', Date.now() / 1000)
-    //         }
-    //     }
-    //     const { x, y } = i.position;
-    //     const xResult = x > (center - paddingX) && x < (center + paddingX);
-    //     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');
-    //             _this._egretRender.remove(i);
-    //             vibrate(_this, 2);
-    //             playBoom(_this.egretRenderContainer);
-    //             playScoreAni(_this.egretRenderContainer, -1);
-    //         }
-    //         else {
-    //             console.log('不是boom，重用', Date.now() / 1000);
-    //             playScoreAni(_this.egretRenderContainer, 1)
-    //             playSuccess(_this.egretRenderContainer);
-    //         }
-    //         // _this.onGetAward();
-    //     }
-    // })
 }
 
 export default check
\ No newline at end of file

egret/src/startScene/createBox.ts

@@ -3,7 +3,7 @@ import StartScene from "./StartScene";
 
 const createBox = (_this: StartScene) => {
     _this._egretRender.rectangle(750 / 2, 1624, 750, 10, null, { isStatic: true, collisionFilter: { group: wall, category: wall, mask: wallMask } });
-    _this._egretRender.rectangle(0, 1624 / 2, 10, 1624, null, { isStatic: true, collisionFilter: { group: wall, category: wall, mask: wallMask } });
+    _this._egretRender.rectangle(0, 1624 / 2, 40, 1624, null, { isStatic: true, collisionFilter: { group: wall, category: wall, mask: wallMask } });
     _this._egretRender.rectangle(750, 1624 / 2, 10, 1624, null, { isStatic: true, collisionFilter: { group: wall, category: wall, mask: wallMask } });
 
 
@@ -13,12 +13,23 @@ const createBox = (_this: StartScene) => {
         collisionFilter: { group: basket, category: basket, mask: basketMask },
     });
 
-    // const basketPath = Matter.Vertices.fromPath('0 0 1 0 10 90 190 90 199 0 200 0 200 100 0 100', null);
-    // const basketBody = Matter.Bodies.fromVertices(150, 900 + 500, [basketPath], { isStatic: true, collisionFilter: { group: basket, category: basket, mask: basketMask } }, true);
-    // Matter.World.add(_this._engine.world, basketBody);
+    const basketLeft = Matter.Bodies.circle(558 - 5, 1353, 6, { isStatic: true, friction: 0, collisionFilter: { group: basket, category: basket, mask: basketMask } })
+    Matter.World.add(_this._engine.world, basketLeft);
+    const basketRight = Matter.Bodies.circle(721, 1353, 6, { isStatic: true, friction: 0, collisionFilter: { group: basket, category: basket, mask: basketMask } })
+    Matter.World.add(_this._engine.world, basketRight);
 
-    // const rightBasketBody = Matter.Bodies.fromVertices(600, 900 + 500, [basketPath], { isStatic: true, collisionFilter: { group: basket, category: basket, mask: basketMask } }, true);
-    // Matter.World.add(_this._engine.world, rightBasketBody);
+    const basketLeft1 = Matter.Bodies.circle(60, 1353, 5, { isStatic: true, friction: 0, collisionFilter: { group: basket, category: basket, mask: basketMask } })
+    Matter.World.add(_this._engine.world, basketLeft1);
+    const basketRight1 = Matter.Bodies.circle(161, 1353, 5, { isStatic: true, friction: 0, collisionFilter: { group: basket, category: basket, mask: basketMask } })
+    Matter.World.add(_this._engine.world, basketRight1);
+
+    const basketPath = Matter.Vertices.fromPath('62 1363 72 1453 144 1450 157 1361 155 1361 133 1444 80 1445', null);
+    const basketBody = Matter.Bodies.fromVertices(100+10-10+3+5, 8+900 + 500+20, [basketPath], { isStatic: true, collisionFilter: { group: basket, category: basket, mask: basketMask } }, true);
+    Matter.World.add(_this._engine.world, basketBody);
+
+    const basketRightPath = Matter.Vertices.fromPath('556 1355 603 1430 632 1439 665 1435 705 1406 719 1366 643 1432 ', null);
+    const rightBasketBody = Matter.Bodies.fromVertices(600+30+10, 8+900 + 500, [basketRightPath], { isStatic: true, collisionFilter: { group: basket, category: basket, mask: basketMask } }, true);
+    Matter.World.add(_this._engine.world, rightBasketBody);
 
     //钉子约束
     const nailConstraint = Matter.Constraint.create({

egret/src/startScene/createItems.ts

@@ -7,11 +7,9 @@ export default (_this: StartScene) => {
     const startY = 984;
     const startX = 100;
     setInterval(() => {
-        // const funcs = [createBoom, createIceCream, createDonut, createCandy2, createGift2, createGift3, createEgg];
-        // const types = [LabelType.Egg];
         const types = [LabelType.Boom,LabelType.IceCream,LabelType.Donut,LabelType.Candy2,LabelType.Gift2,LabelType.Gift3,LabelType.Egg];
         const i = Math.floor(Math.random() * types.length);
-
+        const restitution = 0.7;
         const type = types[i];
         if (type == LabelType.Candy2) {
             const forceScale = 15;
@@ -25,7 +23,8 @@ export default (_this: StartScene) => {
                     isStatic: false,
                     force: { x: start.forceX, y: 0 },
                     friction: 0,
-                    restitution: 0.7,
+                    restitution: restitution,
+                    label:type,
                     collisionFilter: { group: award, category: award, mask: awardMask }
                 }
             );
@@ -39,10 +38,11 @@ export default (_this: StartScene) => {
             const baseItem = createItem(size / maxsize, type);
             _this._egretRender.circle(start.x, start.y, size / 2, baseItem,
                 {
+                    label:type,
                     isStatic: false,
                     force: { x: start.forceX, y: 0 },
                     friction: 0,
-                    restitution: .7,
+                    restitution: restitution,
                     collisionFilter: { group: award, category: award, mask: awardMask }
                 }
             );

egret/src/startScene/items/createCandy.ts

-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*scale);
-    // const baseItem = new BaseItem(animation);
-    // baseItem.scaleX = baseItem.scaleY = scale;
-    return animation
-}
-
-const createMovieClip = (spritesheet: egret.SpriteSheet, scale = 1) => {
-    const list = ['礼盒0000', '礼盒0001', '礼盒0002', '礼盒0003', '礼盒0004', '礼盒0005', '礼盒0006',
-        '礼盒0007', '礼盒0008', '礼盒0009', '礼盒0010', '礼盒0011', '礼盒0012', '礼盒0013', '礼盒0014', '礼盒0015'];
-    const movieclip = new MovieClip({
-        spritesheet: spritesheet,
-        frameInterval: 4,
-        frames: list,
-        position: [0, 0],
-        scale: scale,
-        anchor: [.5, .5]
-    });
-    movieclip.lable = LabelType.Candy
-    return movieclip
-}
-
-export default createCandy
\ No newline at end of file

egret/src/startScene/items/createGift.ts

-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*scale);//礼物纹理大概130
-    // const baseItem = new BaseItem(animation, 'gift');
-    // baseItem.scaleX = baseItem.scaleY = scale;
-    return animation
-}
-
-const createGiftMovieClip = (spritesheet, scale)=> {
-    const list = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'];
-    const movieclip = new MovieClip({
-        spritesheet: spritesheet,
-        frameInterval: 4,
-        frames: list,
-        position: [0, 0],
-        scale: scale,
-        anchor: [.5, .5]
-    });
-    movieclip.lable = LabelType.Gift
-    return movieclip
-}
-
-export default createGift
\ No newline at end of file

egret/src/startScene/items/createGift2.ts

@@ -4,11 +4,11 @@ import LabelType from "../LabelType";
 const createGift2 = (scale) => {
     //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
     const texture = RES.getRes('gift2_json');
-    const animation = createGiftMovieClip(texture, 98/87 * scale);//中间物体尺寸140px
+    const animation = createMovieClip(texture, 98/120 * scale);//中间物体尺寸140px
     return animation
 }
 
-const createGiftMovieClip = (spritesheet, scale) => {
+const createMovieClip = (spritesheet, scale) => {
     const list = ['礼盒0000', '礼盒0001', '礼盒0002', '礼盒0003', '礼盒0004', '礼盒0005', '礼盒0006',
         '礼盒0007', '礼盒0008', '礼盒0009', '礼盒0010', '礼盒0011', '礼盒0012', '礼盒0013', '礼盒0014', '礼盒0015'];
     const movieclip = new MovieClip({

egret/src/startScene/items/createGift3.ts

@@ -4,7 +4,7 @@ import LabelType from "../LabelType";
 const createGift3 = (scale) => {
     //气泡纹理种气泡的尺寸默认100（总体还包含气泡周围的阴影效果）
     const texture = RES.getRes('gift3_json');
-    const animation = createGiftMovieClip(texture, 98/87 * scale);//中间物体尺寸140px
+    const animation = createGiftMovieClip(texture, 98/120 * scale);//中间物体尺寸140px
     return animation
 }