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

assets/resources/module/speedUpUI/productReward.prefab

@@ -1064,7 +1064,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 340.49,
+      "width": 288.49,
       "height": 50
     },
     "_anchorPoint": {
@@ -1140,7 +1140,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -131.245,
+        -105.245,
         0,
         0,
         0,
@@ -1248,7 +1248,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -65,
+        -39,
         -5,
         0,
         0,
@@ -1344,7 +1344,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 208,
+      "width": 156,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1396,8 +1396,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "次，领取任务红包",
-    "_N$string": "次，领取任务红包",
+    "_string": "次，立即提现",
+    "_N$string": "次，立即提现",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1435,7 +1435,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 340.49,
+      "width": 288.49,
       "height": 50
     },
     "_resize": 1,

assets/script/before/main/FactoryIcon.ts

@@ -123,7 +123,7 @@ export class FactoryIcon extends cc.Component {
         }
     }
 
-    public make(id) {
+    public async make(id) {
         if (this.data.state == FactroyState.Empty) {
             gData.gameData.isProducting = true;
             let config = gData.gameData.getProductMap(id);
@@ -140,6 +140,13 @@ export class FactoryIcon extends cc.Component {
             gData.adData.checkPopRed();
 
             gData.gameData.isProducting = false;
+
+            console.log('-----');
+            // let flyRed = await gData.gameData.updateNewTaskProgress();
+            // if (flyRed) {
+            //     //mk.audio.playEffect('redmoney');
+            //     gData.gameData.gameStyle.dpFlyRedAni();
+            // }
         }
         else {
             mk.tip.pop('商品已满！')

assets/script/before/main/PastureIcon.ts

@@ -181,7 +181,7 @@ export default class PastureIcon extends cc.Component {
         }
     }
 
-    onEat() {
+    async onEat() {
         if (gData.gameData.leftTimes <= 0) {
             mk.ui.openPanel('module/speedUpUI/productReward');
             return;
@@ -200,6 +200,13 @@ export default class PastureIcon extends cc.Component {
             gData.gameData.changeLeftTimes(-1);
 
             gData.gameData.isProducting = false;
+
+            let flyRed = await gData.gameData.updateNewTaskProgress();
+            if (flyRed) {
+                //mk.audio.playEffect('redmoney');
+                let pos = this.eatNode.parent.convertToWorldSpaceAR(this.eatNode.getPosition());
+                gData.gameData.gameStyle.dpFlyRedAni();
+            }
         }
     }
 

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

@@ -97,7 +97,7 @@ export default class PlantItem extends cc.Component {
         }
     }
 
-    clickMake() {
+    async clickMake() {
         mk.audio.playEffect('button');
         if (gData.gameData.leftTimes <= 0) {
             mk.ui.openPanel('module/speedUpUI/productReward');
@@ -121,10 +121,13 @@ export default class PlantItem extends cc.Component {
         else {
             gData.factorySystem.make(this.data.picture);
         }
-        gData.gameData.updateNewTaskProgress(true);
+        let flyRed = await gData.gameData.updateNewTaskProgress(true);
 
-        let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
+        if(flyRed)
+        {
+            let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
         gData.gameData.gameStyle.dpFlyRedAni(pos);
+        }     
     }
 
     getDesByType() {

assets/script/game/data/GameData.ts

@@ -323,6 +323,7 @@ export class GameData {
      * @param add 增减变量
      */
     public changeLeftTimes(add) {
+        
         gData.gameData.leftTimes += add;
         gData.gameData.leftTimes = (gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
         if (gData.gameData.leftTimes < 0) {

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

@@ -57,7 +57,7 @@ export default class ProductReward extends cc.Component {
                 }).start();
             } else {
                 this.node_1.active = false;
-                this.node_2.active = false;
+                this.node_2.active = true;
             }
         }
     }

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -6390,16 +6390,16 @@ return e;
 }
 e.prototype.update = function() {
 if (gData.cashPro.init_load) {
-this.showLoad();
 gData.cashPro.init_load = !1;
+this.showLoad();
 }
 if (gData.cashPro.init_success) {
-this.tixianSuccess();
 gData.cashPro.init_success = !1;
+this.tixianSuccess();
 }
 if (gData.cashPro.init_fail) {
-this.tixianFail();
 gData.cashPro.init_fail = !1;
+this.tixianFail();
 }
 };
 e.prototype.showLoad = function() {
@@ -8121,9 +8121,13 @@ return [ 2 ];
 });
 };
 e.prototype.make = function(t) {
+return r(this, void 0, void 0, function() {
+var e, o;
+return c(this, function() {
 if (this.data.state == s.FactroyState.Empty) {
 gData.gameData.isProducting = !0;
-var e = gData.gameData.getProductMap(t), o = Date.now() + 1e3 * e.time;
+e = gData.gameData.getProductMap(t);
+o = Date.now() + 1e3 * e.time;
 this.data.state = s.FactroyState.Producting;
 this.data.productID = e.picture;
 this.data.growSpan = o;
@@ -8132,7 +8136,11 @@ this.getComponent(l.MoveToCenter).move();
 gData.gameData.changeLeftTimes(-1);
 gData.adData.checkPopRed();
 gData.gameData.isProducting = !1;
+console.log("-----");
 } else mk.tip.pop("商品已满！");
+return [ 2 ];
+});
+});
 };
 e.prototype.clickSpeedUp = function() {
 mk.ui.openPanel("module/speedUpUI/speedUp");
@@ -10896,9 +10904,6 @@ var i = this;
 void 0 === n && (n = null);
 void 0 === a && (a = -1);
 var r = mk.math.random(.3, 1, !1);
-cc.tween(e).to(r, {
-scale: .8
-}).start();
 console.log("---");
 var c = null, l = null;
 if ("string" == typeof o) {
@@ -20622,9 +20627,19 @@ return [ 2 ];
 });
 };
 e.prototype.onEat = function() {
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (this.state == s.PastureState.Empty) {
+return r(this, void 0, void 0, function() {
+var t, e;
+return c(this, function(o) {
+switch (o.label) {
+case 0:
+if (gData.gameData.leftTimes <= 0) {
+mk.ui.openPanel("module/speedUpUI/productReward");
+return [ 2 ];
+}
+if (this.state != s.PastureState.Empty) return [ 3, 2 ];
 gData.gameData.isProducting = !0;
-var t = gData.gameData.getProductMap(this.data.productID), e = Date.now() + 1e3 * t.time;
+t = gData.gameData.getProductMap(this.data.productID);
+e = Date.now() + 1e3 * t.time;
 this.data.state = s.PastureState.Growing;
 this.data.productID = this.data.productID;
 this.data.growSpan = e;
@@ -20633,7 +20648,20 @@ this.eatNode.active = !1;
 this.getComponent(l.MoveToCenter).move();
 gData.gameData.changeLeftTimes(-1);
 gData.gameData.isProducting = !1;
+return [ 4, gData.gameData.updateNewTaskProgress() ];
+
+case 1:
+if (o.sent()) {
+this.eatNode.parent.convertToWorldSpaceAR(this.eatNode.getPosition());
+gData.gameData.gameStyle.dpFlyRedAni();
 }
+o.label = 2;
+
+case 2:
+return [ 2 ];
+}
+});
+});
 };
 e.prototype.clickSpeedUp = function() {
 mk.ui.openPanel("module/speedUpUI/speedUp");
@@ -21411,17 +21439,36 @@ return [ 2 ];
 });
 };
 e.prototype.clickMake = function() {
+return r(this, void 0, void 0, function() {
+var t;
+return c(this, function(e) {
+switch (e.label) {
+case 0:
 mk.audio.playEffect("button");
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else {
+if (gData.gameData.leftTimes <= 0) {
+mk.ui.openPanel("module/speedUpUI/productReward");
+return [ 2 ];
+}
+if (gData.gameData.isProducting) {
+mk.tip.pop("点击太快了");
+return [ 2 ];
+}
 if (this.data.tab == l.ProductType.nzw) {
 gData.farmSystem.plant(this.data.picture);
 gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
 } else gData.factorySystem.make(this.data.picture);
-gData.gameData.updateNewTaskProgress(!0);
-var t = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
+return [ 4, gData.gameData.updateNewTaskProgress(!0) ];
+
+case 1:
+if (e.sent()) {
+t = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
 gData.gameData.gameStyle.dpFlyRedAni(t);
 }
+return [ 2 ];
+}
+});
+});
 };
 e.prototype.getDesByType = function() {
 var t = "";
@@ -22160,7 +22207,7 @@ t.lbl_progress.string = e + "/" + o;
 }).start();
 } else {
 this.node_1.active = !1;
-this.node_2.active = !1;
+this.node_2.active = !0;
 }
 }
 };
@@ -24719,7 +24766,7 @@ var a = "", i = 10, c = -1;
 if (gData.reward.data[n].rewardType === r.RewardType.productTimes) {
 a = "Canvas/主界面层/game/功能按钮/底部按钮/中间按钮";
 i = 5;
-c = .8;
+c = .5;
 }
 mk.fly.PlayCoinAnim(gData.reward.data[n].rewardType, i, t, a, function() {
 e.addReward();

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631782994604,
-    "genTime": 1631782994604,
+    "buildTime": 1631786858191,
+    "genTime": 1631786858191,
     "genVersion": null
 }