Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/script/before/main/FactoryIcon.ts

@@ -141,6 +141,9 @@ export class FactoryIcon extends cc.Component {
 
             gData.gameData.isProducting = false;
 
+            gData.gameData.nextMake = null;
+            gData.gameData.setNextProduct(false);
+
             console.log('-----');
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
@@ -149,7 +152,7 @@ export class FactoryIcon extends cc.Component {
             //     gData.gameData.gameStyle.dpFlyRedAni();
             // }
 
-            
+
         }
         else {
             mk.tip.pop('商品已满！')

assets/script/before/main/FarmIcon.ts

@@ -184,6 +184,10 @@ export class FarmIcon extends cc.Component {
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
 
             let flyRed = await gData.gameData.updateNewTaskProgress();
+
+            gData.gameData.nextMake = null;
+            gData.gameData.setNextProduct(false);
+
             return flyRed;
         }
         else {

assets/script/before/main/PastureIcon.ts

@@ -227,6 +227,9 @@ export default class PastureIcon extends cc.Component {
 
             gData.gameData.isProducting = false;
 
+            gData.gameData.nextMake = null;
+            gData.gameData.setNextProduct(false);
+            
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
             // if (flyRed) {

assets/script/game/data/GameData.ts

@@ -227,6 +227,9 @@ export class GameData {
         mk.data.setTAEventUserStr(0, 'now_app_id', gData.appData.appVersion);
         //渠道号
         mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.umengChannel);
+
+        // //test
+        // this.playerProp.completeFarmTaskTimes = 3;
     }
 
     /**
@@ -329,7 +332,10 @@ export class GameData {
     public changeLeftTimes(add) {
 
         gData.gameData.leftTimes += add;
-        gData.gameData.leftTimes = (gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
+        if (add > 0) {
+            gData.gameData.leftTimes = (gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
+        }
+
         if (gData.gameData.leftTimes < 0) {
             gData.gameData.leftTimes = 0;
         }
@@ -492,27 +498,15 @@ export class GameData {
                 break;
             case 1:
                 flyRed = await gData.farmSystem.btnMake();
-                this.nextMake = null;
-                this.setNextProduct(false);
                 gData.adData.checkPopRed();
-
-                //flyRed = await this.updateNewTaskProgress();
                 break;
             case 2:
                 flyRed = await gData.pastureSystem.btnMake();
-                this.nextMake = null;
-                this.setNextProduct(false);
                 gData.adData.checkPopRed();
-
-                //flyRed = await this.updateNewTaskProgress();
                 break;
             case 3:
                 flyRed = await gData.factorySystem.btnMake();
-                this.nextMake = null;
-                this.setNextProduct(false);
                 gData.adData.checkPopRed();
-
-                //flyRed = await this.updateNewTaskProgress();
                 break;
         }
         return flyRed;

assets/script/mk/system/JsbSystem.ts

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