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

# Conflicts:
#	assets/script/game/module/reward/Reward.ts

assets/resources/module/speedUpUI/productReward.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 83
-      },
-      {
         "__id__": 84
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 86
+      },
+      {
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 82
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -183,11 +183,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -1618,16 +1618,16 @@
         "__id__": 44
       },
       {
-        "__id__": 56
+        "__id__": 57
       },
       {
-        "__id__": 66
+        "__id__": 67
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 79
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -1698,10 +1698,13 @@
     "_components": [
       {
         "__id__": 54
+      },
+      {
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -2107,6 +2110,25 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 44
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2126,20 +2148,20 @@
     },
     "_children": [
       {
-        "__id__": 57
+        "__id__": 58
       },
       {
-        "__id__": 60
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -2193,17 +2215,17 @@
     "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 56
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -2257,7 +2279,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2300,20 +2322,20 @@
     "_name": "进度文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 56
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 62
       },
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2367,7 +2389,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     "_enabled": true,
     "_materials": [
@@ -2377,8 +2399,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "10/15",
-    "_N$string": "10/15",
+    "_string": "",
+    "_N$string": "",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2400,7 +2422,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     "_enabled": true,
     "_color": {
@@ -2429,7 +2451,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 57
     },
     "_enabled": true,
     "_materials": [
@@ -2476,16 +2498,16 @@
     },
     "_children": [
       {
-        "__id__": 67
+        "__id__": 68
       },
       {
-        "__id__": 70
+        "__id__": 71
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 78
+      "__id__": 79
     },
     "_opacity": 255,
     "_color": {
@@ -2539,17 +2561,17 @@
     "_name": "描述2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 66
+      "__id__": 67
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2603,7 +2625,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 67
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2647,27 +2669,27 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 66
+      "__id__": 67
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 72
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
-      },
-      {
         "__id__": 75
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2721,17 +2743,17 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 70
+      "__id__": 71
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -2785,7 +2807,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 71
+      "__id__": 72
     },
     "_enabled": true,
     "_materials": [
@@ -2828,7 +2850,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2860,7 +2882,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 71
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2879,7 +2901,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 71
     },
     "_enabled": true,
     "panel_name": "module/redBagTask/redBagTask",
@@ -3057,13 +3079,13 @@
       "__id__": 49
     },
     "lbl_progress": {
-      "__id__": 61
+      "__id__": 62
     },
     "sp_taskProgress": {
-      "__id__": 58
+      "__id__": 59
     },
     "node_complete": {
-      "__id__": 66
+      "__id__": 67
     },
     "node_Uncomplete": {
       "__id__": 44

assets/resources/module/speedUpUI/productReward2.prefab

@@ -202,8 +202,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 588,
-      "height": 603
+      "width": 610,
+      "height": 777
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -215,7 +215,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        153.583,
+        56.583,
         0,
         0,
         0,
@@ -266,8 +266,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 431,
-      "height": 244
+      "width": 683,
+      "height": 680
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -285,8 +285,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.5,
+        0.5,
         1
       ]
     },
@@ -319,7 +319,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "ac027582-1e62-4e8f-828d-2b08b9dc20bb"
+      "__uuid__": "b6ea2776-3ce8-48ab-a74e-f552254f6b9a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -388,8 +388,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        269.57,
-        265.127,
+        267.716,
+        433.864,
         0,
         0,
         0,
@@ -502,8 +502,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 346,
-      "height": 193
+      "width": 463,
+      "height": 154
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -521,8 +521,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.5,
+        0.5,
         1
       ]
     },
@@ -547,7 +547,7 @@
       "__id__": 11
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 13
@@ -662,7 +662,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a77e227e-90a3-4144-956d-473fbcdabe70"
+      "__uuid__": "61755aab-48ef-4144-81d8-99bf853f0fb6"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -733,7 +733,7 @@
       "ctor": "Float64Array",
       "array": [
         150,
-        -403,
+        -513,
         0,
         0,
         0,
@@ -1386,7 +1386,7 @@
       "ctor": "Float64Array",
       "array": [
         -150,
-        -403,
+        -513,
         0,
         0,
         0,
@@ -1688,9 +1688,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 138,
-      "g": 67,
-      "b": 18,
+      "r": 255,
+      "g": 220,
+      "b": 79,
       "a": 255
     },
     "_contentSize": {
@@ -1708,7 +1708,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -125.752,
+        -277.752,
         0,
         0,
         0,
@@ -1756,7 +1756,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -1784,7 +1784,7 @@
       "__id__": 3
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 48
@@ -1908,7 +1908,7 @@
         "__id__": 67
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 71
@@ -2668,7 +2668,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "5bb7db0c-36f9-42c2-a664-c982a39d1553"
+      "__uuid__": "65280d6a-2bbf-45b8-98f9-eb6f07f3a7d7"
     },
     "_type": 0,
     "_sizeMode": 1,

assets/resources/module/speedUpUI/texture/bg_hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "496993af-5178-4e14-a55a-3c64c38919a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 610,
+  "height": 777,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_hb": {
+      "ver": "1.0.4",
+      "uuid": "65280d6a-2bbf-45b8-98f9-eb6f07f3a7d7",
+      "rawTextureUuid": "496993af-5178-4e14-a55a-3c64c38919a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 610,
+      "height": 777,
+      "rawWidth": 610,
+      "rawHeight": 777,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/speedUpUI/texture/lucky.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1636e0f6-c923-47ee-b56b-3811ad9232a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 463,
+  "height": 154,
+  "platformSettings": {},
+  "subMetas": {
+    "lucky": {
+      "ver": "1.0.4",
+      "uuid": "61755aab-48ef-4144-81d8-99bf853f0fb6",
+      "rawTextureUuid": "1636e0f6-c923-47ee-b56b-3811ad9232a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 463,
+      "height": 154,
+      "rawWidth": 463,
+      "rawHeight": 154,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/speedUpUI/texture/lucky_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d4585e7e-d5d9-4c9d-81f4-d06976666c2e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 772,
+  "platformSettings": {},
+  "subMetas": {
+    "lucky_2": {
+      "ver": "1.0.4",
+      "uuid": "b6ea2776-3ce8-48ab-a74e-f552254f6b9a",
+      "rawTextureUuid": "d4585e7e-d5d9-4c9d-81f4-d06976666c2e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 6.5,
+      "offsetY": -7,
+      "trimX": 40,
+      "trimY": 53,
+      "width": 683,
+      "height": 680,
+      "rawWidth": 750,
+      "rawHeight": 772,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/game/data/GameData.ts

@@ -485,7 +485,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                await this.updateNewTaskProgress();
+                flyRed = await this.updateNewTaskProgress();
                 break;
             case 2:
                 gData.pastureSystem.btnMake();
@@ -493,7 +493,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                await this.updateNewTaskProgress();
+                flyRed = await this.updateNewTaskProgress();
                 break;
             case 3:
                 gData.factorySystem.btnMake();
@@ -501,7 +501,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                await this.updateNewTaskProgress();
+                flyRed = await this.updateNewTaskProgress();
                 break;
         }
         return flyRed;
@@ -517,14 +517,17 @@ export class GameData {
             let count = this.playerProp.userFarmTaskInfo.taskCount;
 
             if (com >= count)
-                return;
+            {
+                return false;
+            }
+                
         }
 
         let data = {};
         let response = await mk.http.sendData('farmTask/updateUserFarmTaskInfo', data);
         mk.console.logSingle('refrehTask=>', response);
         if (response.errcode != 0) {
-            return null;
+            return false;
         }
 
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
@@ -534,7 +537,7 @@ export class GameData {
         if (isNeedRefresh) {
             gData.gameData.init_task = true;
         }
-
+        return true;
     }
 
     public setFarmDataMap(id, data, sendToServer = true) {

assets/script/game/game/Game.ts

@@ -433,14 +433,6 @@ export default class Game extends cc.Component {
         //     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) {
             //mk.audio.playEffect('redmoney');
             let pos = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -93,7 +93,7 @@ export default class NewOpenRedBag extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

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

@@ -219,7 +219,7 @@ export default class RedBagTask extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney / 100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

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

@@ -98,7 +98,7 @@ export default class Reward extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_cash.string = cash_data.money / 100 + '元';
         this.lbl_cash_out.string = newRedMoney + '/' + cash_data.redMoney / 100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

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

@@ -34,15 +34,24 @@ 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();
+                // this.node_Uncomplete.scale = 2;
+                // let posY = this.node_Uncomplete.y;
+                // this.node_Uncomplete.y = posY + 200;
+                // cc.tween(this.node_Uncomplete).delay(0.2).to(0.4, {scale: 1, y: posY}).start();
             } else {
                 this.node_Uncomplete.active = false;
                 this.node_complete.active = true;
             }
-            this.lbl_progress.string = `${com}/${count}`;
+            
             let per = com / count;
-            cc.tween(this.sp_taskProgress).to(0.2, {fillRange: per}).start();
+            cc.tween(this.sp_taskProgress).delay(0.2).to(0.3, { fillRange: per }, {
+                onUpdate: () => {
+                    let num = Math.round(this.sp_taskProgress.fillRange * count);
+                    this.lbl_progress.string = `${num}/${count}`;
+                }
+            }).call(()=>{
+                this.lbl_progress.string = `${com}/${count}`;
+            }).start();
             //this.sp_taskProgress.fillRange = 
         }
     }

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

@@ -12,7 +12,7 @@ export default class ProductReward2 extends cc.Component {
     private lbl_value: cc.Label[] = [];
 
     start() {
-        this.showChangePart();
+        //this.showChangePart();
     }
 
     // update() {

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

@@ -60,7 +60,7 @@ export default class SpeedUpUI extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {

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

@@ -50,7 +50,7 @@ export default class Turnablerule extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_reward_value.string = cash_data.money / 100 + '元';
         this.lbl_progress.string = newRedMoney + '/' + cash_data.redMoney/100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / cash_data.redMoney;
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {