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

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/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20010.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 48,
-  "height": 23,
+  "width": 50,
+  "height": 24,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20010": {

assets/script/game/data/GameData.ts

@@ -521,7 +521,7 @@ export class GameData {
         if (response.errcode != 0) {
             return null;
         }
-
+        
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
             mk.guide.open(5);

assets/script/game/game/Game.ts

@@ -231,6 +231,11 @@ export default class Game extends cc.Component {
                     this.node_hand.active = false;
                 }
             }
+            if(gData.gameData.playerProp.completeFarmTaskTimes <1)
+            {
+                mk.tip.pop("百元红包进度+1");
+            }
+            
         }
 
         gData.gameData.init_task = false;