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

# Conflicts:
#	assets/script/game/module/login/Login.ts
#	build/jsb-link/assets/main/index.jsc
#	build/jsb-link/assets/resources/config.json
#	build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
#	packages-hot-update/cfg.json

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "2e0acadd-1cf9-412c-8241-7724b9b1f20c",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/cashPro/cashPro.prefab

@@ -27,11 +27,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 96
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 98
     },
     "_opacity": 255,
     "_color": {
@@ -1015,14 +1015,14 @@
         "__id__": 84
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 94
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 96
     },
     "_opacity": 255,
     "_color": {
@@ -1438,77 +1438,22 @@
     "sync": false
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 33
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 0.8,
-    "clickEvents": [
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [
       {
         "__id__": 38
       }
     ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 3,
-    "transition": 3,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_N$hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": {
-      "__id__": 33
-    },
     "_id": ""
   },
   {
@@ -1518,7 +1463,7 @@
     },
     "component": "",
     "_componentId": "7c96b8wPgBPeLS+KI5YpgFP",
-    "handler": "clickClose",
+    "handler": "clickCloseBtn",
     "customEventData": ""
   },
   {
@@ -3105,7 +3050,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3414,10 +3359,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 93
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "7c96b8wPgBPeLS+KI5YpgFP",
+    "handler": "clickCloseBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/farmMap/farmMap.prefab

@@ -133,7 +133,7 @@
         0,
         1,
         1.25,
-        1.35,
+        1.25,
         1
       ]
     },

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -519,7 +519,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 205,
+      "width": 345,
       "height": 100
     },
     "_anchorPoint": {
@@ -564,7 +564,7 @@
       "__id__": 12
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 14
@@ -583,8 +583,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 63,
-      "height": 63
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -700,7 +700,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        70,
         0,
         0,
         0,
@@ -778,7 +778,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 205,
+      "width": 345,
       "height": 100
     },
     "_resize": 1,

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

@@ -114,9 +114,9 @@ export default class PlantItem extends cc.Component {
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
 
-            if (gData.gameData.playerProp.gradeLevel < 2) {
-                mk.tip.pop('生产次数+1');
-            }
+            // if (gData.gameData.playerProp.gradeLevel < 2) {
+            //     mk.tip.pop('生产次数+1');
+            // }
         }
         else {
             gData.factorySystem.make(this.data.picture);

assets/script/game/game/Game.ts

@@ -429,8 +429,16 @@ export default class Game extends cc.Component {
 
         let flyRed = await gData.gameData.makeProduct();
 
-        if (gData.gameData.playerProp.gradeLevel < 2) {
-            mk.tip.pop('生产次数+1');
+        // if (gData.gameData.playerProp.gradeLevel < 2) {
+        //     mk.tip.pop('生产次数+1');
+        // }
+
+        if (gData.gameData.playerProp.userFarmTaskInfo) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+
+            if (com >= count)
+                return;
         }
 
         if (flyRed) {

assets/script/game/module/cashPro/CashPro.ts

@@ -61,4 +61,9 @@ export default class CashPro extends cc.Component {
         this.loadPart.active = false
         mk.ui.closePanel(this.node.name)
     }
+
+    clickCloseBtn()
+    {
+        gData.gameData.init_redBagTask = true;
+    }
 }

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

@@ -181,7 +181,7 @@ export default class RedBagTask extends cc.Component {
             if (gray && com < count) {
 
                 gray.setGray(true);
-                this.openBtn_ani.getComponent(cc.Button).interactable = false;
+                //this.openBtn_ani.getComponent(cc.Button).interactable = false;
             }
 
             this.isCanCash = com >= count;
@@ -276,7 +276,7 @@ export default class RedBagTask extends cc.Component {
         //this.showNewTaskUI();
         //this.isShowNewTask = true;
 
-        mk.ui.closePanel(this.node.name);
+        //mk.ui.closePanel(this.node.name);
         gData.cashPro.cashPro_money = response.data.cashMoney;
         gData.cashPro.init_success = true;
         // gData.receiptNotice.receip_rmb = response.data.cashMoney;

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

@@ -24,7 +24,7 @@ export default class ProductReward extends cc.Component {
             mk.guide.open(4);
         }, 0.5)
 
-        this.lbl_times.string = `生产次数x${gData.gameData.configs.ServerConfig.ProductionAd}`;
+        this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
 
         gData.gameData.init_productTask = false;
         if (gData.gameData.playerProp.userFarmTaskInfo) {
@@ -34,12 +34,16 @@ export default class ProductReward extends cc.Component {
                 this.lbl_taskTimes.string = (count - com).toString();
                 this.node_Uncomplete.active = true;
                 this.node_complete.active = false;
+                this.node_Uncomplete.scale = 2;
+                cc.tween(this.node_Uncomplete).to(0.3, {scale: 1}).start();
             } else {
                 this.node_Uncomplete.active = false;
                 this.node_complete.active = true;
             }
             this.lbl_progress.string = `${com}/${count}`;
-            this.sp_taskProgress.fillRange = com / count;
+            let per = com / count;
+            cc.tween(this.sp_taskProgress).to(0.2, {fillRange: per}).start();
+            //this.sp_taskProgress.fillRange = 
         }
     }