wuwangdong 4 år sedan
förälder
incheckning
5329ea7f76

+ 0 - 1
assets/script/before/main/TouchHelper.ts

@@ -85,7 +85,6 @@ export class TouchHelper extends cc.Component {
         }
         if(this.isScaleAct && this.isStart)
         {
-            mk.audio.playEffect("button");
             cc.tween(this.node).to(0.1, {scale: 1.1}).start();
             console.log(`------start${this.name}`);
         }

+ 4 - 0
assets/script/game/data/GameData.ts

@@ -1270,6 +1270,10 @@ export enum AUDIO_TYPE {
     ef_fly = "ef_fly",
     /**关闭按钮音效*/
     closeButton = "closeButton",
+    //红包界面打开
+    openRedBag = 'congratulations',
+    //红包飞音效
+    redmoney = 'redmoney'
 }
 
 /** ECPM */

+ 3 - 6
assets/script/game/game/AniControl.ts

@@ -153,6 +153,7 @@ export default class AniControl extends cc.Component {
 
     private clickSheepBtn() {
         if (this.sheepMoveEnd) {
+            mk.audio.playEffect("button");
             mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             this.sheepMoveEnd = false;
             this.hb_btn.active = false;
@@ -236,12 +237,7 @@ export default class AniControl extends cc.Component {
         mk.audio.playEffect("button");
         if (customEvenData == 'bird_1') {
             this.flyBirdFinished_1();
-            let add = this.getRewardByHttp("bird_1");
-
-            mk.fly.PlayCoinAnim(1, 5, this.flyBird_1.node, '', () => {
-
-                console.log('--');
-            }, -1, 2);
+            this.getRewardByHttp("bird_1");
         } else if (customEvenData == 'bird_2') {
             this.flyBirdFinished_2();
             this.getRewardByHttp("bird_2");
@@ -276,6 +272,7 @@ export default class AniControl extends cc.Component {
             let intV = Math.floor(add / several);
             let r = add % several;
     
+            mk.audio.playEffect('redmoney');
             if (type == 'bird_1') {
                 for (let i = 0; i != several; ++i) {
                     mk.fly.PlayCoinAnim(1, 1, this.flyBird_1.node, '', null, -1, intV);

+ 1 - 1
assets/script/game/game/Farmer.ts

@@ -67,7 +67,7 @@ export class Farmer extends cc.Component {
             const several = 3;
             let intV = Math.floor(add / several);
             let r = add % several;
-    
+            mk.audio.playEffect('redmoney');
             for (let i = 0; i != several; ++i) {
                 mk.fly.PlayCoinAnim(1, 1, this.fly_node, '', null, -1, intV);
             }

+ 1 - 0
assets/script/game/game/Game.ts

@@ -455,6 +455,7 @@ export default class Game extends cc.Component {
         let flyRed = gData.gameData.makeProduct();
 
         if (flyRed) {
+            mk.audio.playEffect('redmoney');
             let pos = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
             mk.fly.PlayCoinAnim(1, 3, this.btn_product, pos, () => {
                 gData.gameData.init_task = true;

+ 3 - 1
assets/script/game/module/newNotice/LineUpUI.ts

@@ -17,6 +17,7 @@ export default class LineUpUI extends cc.Component {
     {
         if(gData.lineUpUIData.refresh)
         {
+            console.log('lineUp=====>', gData.lineUpUIData.personCount);
             gData.lineUpUIData.refresh = false;
             this.lbl_tip.string = `提现排队中,你前面还有${gData.lineUpUIData.personCount}人`;
         }
@@ -31,7 +32,8 @@ export default class LineUpUI extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 mk.tip.pop('插队成功');
-                gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
+                gData.adData.watchVideo(null);
+                //gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
             }
         });
         

+ 1 - 0
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -29,6 +29,7 @@ export default class NewOpenRedBag extends cc.Component {
 
     data = null
     start() {
+        mk.audio.playEffect("openRedBag");
         if (gData.moreGame.init_newOpenRedBag) {
             gData.moreGame.init_newOpenRedBag = false;
             this.showElectUI();

+ 1 - 0
assets/script/game/module/reward/Reward.ts

@@ -146,6 +146,7 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         cc.log('获取奖励:', gData.reward.data);
+        mk.audio.playEffect('redmoney');
         let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);
         if (gData.reward.callback) {

BIN
build/jsb-link/assets/main/index.jsc


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
build/jsb-link/assets/resources/config.json


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
build/jsb-link/assets/resources/import/c2/c24623b9-b557-420c-bf8c-8927ea736fa1.json


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 219 - 219
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 2 - 2
packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631343336980,
-    "genTime": 1631343336980,
+    "buildTime": 1631347785728,
+    "genTime": 1631347785728,
     "genVersion": null
 }

Vissa filer visades inte eftersom för många filer har ändrats