1

assets/script/before/view/uiItem/PlantItem.ts

@@ -123,11 +123,10 @@ export default class PlantItem extends cc.Component {
         }
         let flyRed = await gData.gameData.updateNewTaskProgress(true);
 
-        if(flyRed)
-        {
+        if (flyRed) {
             let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
-        gData.gameData.gameStyle.dpFlyRedAni(pos);
-        }     
+            gData.gameData.gameStyle.dpFlyRedAni(pos);
+        }
     }
 
     getDesByType() {

assets/script/game/data/GameData.ts

@@ -524,6 +524,7 @@ export class GameData {
             let count = this.playerProp.userFarmTaskInfo.taskCount;
 
             if (com >= count) {
+                mk.tip.pop('任务红包进度已满，快去提现');
                 return false;
             }
 

assets/script/game/module/gradeReward/GradeReward.ts

@@ -184,7 +184,7 @@ export class GradeReward extends cc.Component {
     }
 
     private clickCloseBtn() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 
     onDisable() {

assets/script/game/module/inviteFriends/FriendsDetails.ts

@@ -50,6 +50,6 @@ export default class FriendsDatails extends cc.Component{
     }
 
     private onClickClose(){
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/game/module/inviteFriends/InviteFriends.ts

@@ -82,7 +82,7 @@ export default class InviteFriends extends cc.Component{
     }
 
     private onClickClose(){
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 
     private onKeyDown(key: cc.Event.EventKeyboard)

assets/script/game/module/newCashUI/NewCashUI.ts

@@ -52,7 +52,7 @@ export default class NewCashUI extends cc.Component {
     }
 
     private clickCloseBtn(){
-        mk.audio.playEffect('closeButton');
+        mk.audio.playEffect('button');
         mk.audio.setResumeMusic();
 
         // gData.gameData.init_redBagTask = true;

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -293,7 +293,7 @@ export default class WalletCashOut extends cc.Component {
     }
 
     private clickCloseBtn() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 
     onDisable() {

assets/script/game/module/newNotice/LineUpUI.ts

@@ -41,6 +41,6 @@ export default class LineUpUI extends cc.Component {
     }
     private clickCloseBtn(){
 
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -299,6 +299,6 @@ export default class RedBagTask extends cc.Component {
 
     private clickCloseBtn() {
 
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/game/module/reward/Reward.ts

@@ -137,7 +137,7 @@ export default class Reward extends cc.Component {
 
     onDestroy() {
         if (this.cur_stage === LidType.none) {
-            mk.audio.playEffect("closeButton");
+            mk.audio.playEffect("button");
         }
     }
 

assets/script/game/module/speedUpUI/CompleteImmediately.ts

@@ -17,6 +17,6 @@ export default class CompleteIMmediately extends cc.Component {
 
     private clickCloseBtn()
     {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -108,7 +108,7 @@ export default class ProductReward extends cc.Component {
     }
 
     private clickCloseBtn() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
         mk.ui.closePanel(this.node.name);
     }
 }

assets/script/game/module/speedUpUI/ProductReward2.ts

@@ -50,7 +50,7 @@ export default class ProductReward2 extends cc.Component {
     }
 
     private clickCloseBtn() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 
     private clickExitBtn() {

assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -110,6 +110,6 @@ export default class SpeedUpUI extends cc.Component {
     }
 
     private clickCloseBtn() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/game/module/turntable/Turnablerule.ts

@@ -75,7 +75,7 @@ export default class Turnablerule extends cc.Component {
         mk.ui.removeRefreshEvent(this);
     }
     private onClickClose() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
         mk.ad.destoryBanner();
     }
 }

assets/script/mk/system/JsbSystem.ts

@@ -76,7 +76,7 @@ export default class JsbSystem {
     /** 获取手机授权 */
     public static checkPermission() {
         if (CC_DEBUG) {
-            gData.appData.mac = '53:16:ec:c3:d3:55,16:46:dc:dd:b7:67';
+            gData.appData.mac = '33:16:ec:c3:d3:55,16:46:dc:dd:b7:57';
             gData.appData.machineInfo.mac = gData.appData.mac;
             gData.appData.getDeviceInfoCompelete = true;
         }