1

assets/resources/module/newNotice/lineUpUI.prefab

@@ -645,7 +645,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "227XJOxHtHLIKHOndSU8EN",
+    "fileId": "3e3ryRzHNOopnQIuMv5Az8",
     "sync": false
   },
   {
@@ -754,7 +754,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "b9bHtqOzdBbbbU6H0zZWRa",
+    "fileId": "16/+mKVrNHCI8jAqbX0jqK",
     "sync": false
   },
   {
@@ -863,7 +863,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "b5CuNuCbdAjqZSc3qZckr/",
+    "fileId": "8di+Ism8lO9oahiwfciiFm",
     "sync": false
   },
   {
@@ -1641,6 +1641,9 @@
     "lbl_tip": {
       "__id__": 21
     },
+    "node_hb": {
+      "__id__": 31
+    },
     "_id": ""
   },
   {

assets/script/before/main/FactorySystem.ts

@@ -41,27 +41,31 @@ export default class FactorySystem {
                 let productJson = gData.gameData.configs.Product;
                 for (let index = 0; index != orderData.length; ++index) {
                     let dataE = orderData[index];
-                    if (copyData[index] < dataE.taskCount && dataE.Id <= productJson.length) {
-                        let productData = productJson[dataE.Id - 1];
-
-                        let len = this.factoryIcons.length;
-                        for (var j = 0; j < len; j++) {
-                            let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
-                            let max = gData.gameData.getMaxProduct(tab);
-                            if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {
-                                gData.gameData.nextCanProduct = gData.gameData.getProductMap(productData.picture);
-                                gData.gameData.nextMake = this.factoryIcons[i];
-                                gData.gameData.nextType = 3;
-                                return this.factoryIcons[i];
+                    if (dataE.Id <= productJson.length) {
+                        if(copyData[index] < dataE.taskCount)
+                        {
+                            let productData = productJson[dataE.Id - 1];
+                            let len = this.factoryIcons.length;
+                            for (let j = 0; j < len; j++) {
+                                let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
+                                let max = gData.gameData.getMaxProduct(tab);
+                                if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {
+                                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(productData.picture);
+                                    gData.gameData.nextMake = this.factoryIcons[j];
+                                    gData.gameData.nextType = 3;
+                                    console.log("nextFactory ===== successs");
+                                    return this.factoryIcons[j];
+                                }
                             }
-                        }
+                        }       
                     } else {
                         let len = this.factoryIcons.length;
-                        for (var i = 0; i < len; i++) {
+                        for (let i = 0; i < len; i++) {
                             if (this.factoryIcons[i].data.state == FactroyState.Empty) {
                                 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
                                 gData.gameData.nextMake = this.factoryIcons[i];
                                 gData.gameData.nextType = 3;
+                                console.log("nextFactory ===== successs===");
                                 return this.factoryIcons[i];
                             }
                         }

assets/script/before/main/FarmIcon.ts

@@ -151,6 +151,8 @@ export class FarmIcon extends cc.Component {
         this.data.state = FarmState.Empty;
         this.data.productID = 0;
         this.data.growSpan = 0;
+        let child = this.node.getChildByName('hb');
+        this.node.removeChild(child);
         gData.gameData.setFarmDataMap(this.configID, this.data);
         await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, true);
         gData.gameData.setNextProduct(false);
@@ -161,9 +163,6 @@ export class FarmIcon extends cc.Component {
         else {
             gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
-
-        let child = this.node.getChildByName('hb');
-        this.node.removeChild(child);
     }
 
     public async plant(id: number) {

assets/script/before/main/FarmSystem.ts

@@ -65,8 +65,11 @@ export class FarmSystem {
                 let nextProduct = gData.gameData.getRandomPlantConfig(out);
                 if(nextProduct)
                 {
-                    gData.gameData.nextCanProduct = nextProduct
-                    gData.gameData.nextMake = this.farms[i];
+                    if(gData.gameData.nextType == 1)
+                    {
+                        gData.gameData.nextCanProduct = nextProduct
+                        gData.gameData.nextMake = this.farms[i];
+                    }
                     mk.console.logSingle('getCanPlantFarm  ', this.farms[i].data);
                     return this.farms[i];
                 }else{

assets/script/before/main/PastureSystem.ts

@@ -55,6 +55,7 @@ export default class PastureSystem {
 
             //工厂有匹配的
             if (out.state == 1) {
+                console.log("nextPasture=======null");
                 return null;
             } else
             {

assets/script/before/view/ui/PlantPanel.ts

@@ -67,10 +67,10 @@ export default class PlantPanel extends cc.Component {
                 {
                     if(gData.plantData.productIndex <= this.list_data.length-4)
                     {
-                        this.tableView.contentMoveByIndex(gData.plantData.productIndex-1, 0.1);
+                        this.tableView.contentMoveByIndex(gData.plantData.productIndex-1, 0.2);
                     }else{
                         //this.tableView.moveButtom();
-                        this.tableView.contentMoveByIndex(this.list_data.length-4, 0.1);
+                        this.tableView.contentMoveByIndex(this.list_data.length-4, 0.2, true);
                     }  
                 }
                      

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

@@ -73,9 +73,6 @@ export default class PlantItem extends cc.Component {
             if (times >= list_data.value) {
                 unlock = true;
             }
-            console.log(`PlantItem=====>picture===${list_data.picture}`);
-            console.log(`PlantItem=====>times===${times}`);
-            console.log(`PlantItem=====>value===${list_data.value}`);
         }
         //根据农场等级
         else if (list_data.unlock == 2) {

assets/script/game/component/TableView.ts

@@ -625,12 +625,16 @@ export default class TableView extends cc.Component {
      * 内容滚动到指定下标位置
      * @param index 条目index
      */
-    public contentMoveByIndex(index: number, duration: number = 0.5) {
+    public contentMoveByIndex(index: number, duration: number = 0.5, isAddOffset = false) {
         let pos_xOrY = this.itemPosMap.get(index).startPos;
         if (this.direction == Direction.vertical) {
             this.scrollView.scrollToOffset(new cc.Vec2(this.content.x, pos_xOrY), duration);
         }
         else {
+            if(isAddOffset)
+            {
+                pos_xOrY += 20;
+            }
             this.scrollView.scrollToOffset(new cc.Vec2(pos_xOrY, this.content.y), duration);
         }
     }

assets/script/game/data/GameData.ts

@@ -211,8 +211,9 @@ export class GameData {
         //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
-        this.playerProp.completeFarmTaskTimes = 3;//res_data.completeFarmTaskTimes;
+        this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
         this.playerProp.orderData = res_data.userOrderTaskInfo;
+        this.playerProp.lineRedMoney = res_data.lineRedMoney;
         console.log("==============initPlayerProp");
         console.log(res_data.userOrderTaskInfo);
         mk.console.logSingle('userOrderTaskInfo', res_data.userOrderTaskInfo);
@@ -517,6 +518,7 @@ export class GameData {
             let productJson = this.configs.Product;
             for (let i = 0; i != orderData.length; ++i) {
                 let dataE = orderData[i];
+                console.log(`getRandomPlantConfig======= ${this.playerProp.copyOrderData[i]}`);
                 if (this.playerProp.copyOrderData[i] < dataE.taskCount) {
                     if (dataE.Id <= productJson.length) {
                         isNoAllComplete = true;
@@ -553,7 +555,7 @@ export class GameData {
                     id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
                     this.nextType = 1
                 }
-                console.log("订单数据没有匹配成功");
+                console.log("订单数据没有匹配成功====1");
             }
         } else {
             isOrderDataInvalid = true;
@@ -579,7 +581,7 @@ export class GameData {
                         let len = factoryIcon.length;
                         for (var j = 0; j < len; j++) {
                             let tab = this.getTabByConfigID(factoryIcon[j].configID);
-                            if (tab == productType[j] && factoryIcon[j].data.state == FactroyState.Empty) {
+                            if (tab == productType[i] && factoryIcon[j].data.state == FactroyState.Empty) {
                                 isHaveEmpty = true;
                                 out.state = 1;
                                 break;
@@ -602,15 +604,19 @@ export class GameData {
                     }
 
                     if (isHaveEmpty) {
+                        console.log("getRandomPlantConfig====0");
                         return null;
 
                     } else {
+                        console.log("getRandomPlantConfig====1");
                         return this.getProductMap(id);
                     }
                 } else {
+                    console.log("getRandomPlantConfig====2");
                     return this.getProductMap(id);
                 }
             } else {
+                console.log("getRandomPlantConfig====3");
                 return this.getProductMap(id);
             }
         }
@@ -634,12 +640,15 @@ export class GameData {
                             continue;
                         }else if(productData.tab == ProductType.dw)
                         {
+                            console.log(`doJudgeOrderLogic=====${dataE.Id}`);
                             let pastureIcon = gData.pastureSystem.pastureIcons;
                             let len = pastureIcon.length;
                             for (var j = 0; j < len; j++) {
                                 if (pastureIcon[j].data.productID == productData.picture && pastureIcon[j].data.state == PastureState.Empty) {
                                     out.state = 2;
-                                    break;
+                                    console.log("doJudgeOrderLogic====2");
+                                    console.log("doJudgeOrderLogic====22");
+                                    return;
                                 }
                             }
 
@@ -648,9 +657,11 @@ export class GameData {
                             let len = factoryIcon.length;
                             for (var j = 0; j < len; j++) {
                                 let tab = this.getTabByConfigID(factoryIcon[j].configID);
-                                if (tab == productData.tab&& factoryIcon[j].data.state == FactroyState.Empty) {
+                                if (tab == productData.tab && factoryIcon[j].data.state == FactroyState.Empty) {
                                     out.state = 1;
-                                    break;
+                                    console.log("doJudgeOrderLogic====1");
+                                    console.log("doJudgeOrderLogic====11");
+                                    return;
                                 }
                             }
                         }
@@ -695,7 +706,7 @@ export class GameData {
                             if (state == 0) {
                                 switch (ProductType[key]) {
                                     case ProductType.nzw:
-                                        console.log("图鉴数据匹配成功");
+                                        console.log("图鉴数据匹配成功=====1");
                                         this.nextType = 1
                                         return picId;
                                     case ProductType.dw:
@@ -708,7 +719,7 @@ export class GameData {
                                                         isHaveEmpty.state = true;
                                                     }
                                                     if (picId == pastureIconsData[index].data.productID) {
-                                                        console.log("图鉴数据匹配成功");
+                                                        console.log("图鉴数据匹配成功====2");
                                                         this.nextCanProduct = this.getProductMap(pastureIconsData[index].data.productID);
                                                         this.nextMake = pastureIconsData[index];
                                                         this.nextType = 2;
@@ -729,7 +740,7 @@ export class GameData {
                                                     }
                                                     let tab = this.getTabByConfigID(factoryIconsData[index].configID);
                                                     if (tab == ProductType[key]) {
-                                                        console.log("图鉴数据匹配成功");
+                                                        console.log("图鉴数据匹配成功=====3");
                                                         this.nextCanProduct = this.getProductMap(picId);
                                                         this.nextMake = factoryIconsData[index];
                                                         this.nextType = 3;
@@ -1718,6 +1729,9 @@ class PlayerProp {
     orderData = null;
     /** 临时订单数据, 只用于种植优先选择作用 */
     copyOrderData = null;
+
+    //插队看视频次数限制
+    lineRedMoney = 0;
 }
 
 /**

assets/script/game/data/module/LineUpUIData.ts

@@ -9,32 +9,40 @@ export class LineUpUIData extends Data {
     public refresh = false;
     public redMoney = 0;
 
-
-    showTips()
-    {
-        cc.tween(this).delay(0.5).call(()=>{
-            let add = Math.round(this.redMoney / 100);
-            mk.tip.pop(`插队成功,并获得${add}红包币`);
-        }).start();     
+    public refresh2 = false;
+
+    showTips() {
+        console.log(`showTips======${gData.gameData.playerProp.lineRedMoney}`);
+        if (gData.gameData.playerProp.lineRedMoney > 0) {
+            cc.tween(this).delay(0.5).call(() => {
+                let add = Math.round(this.redMoney / 100);
+                mk.tip.pop(`插队成功,并获得${add}红包币`);
+            }).start();
+        } else {
+            console.log("showTips================");
+            cc.tween(this).delay(0.5).call(() => {
+                console.log("showTips================2");
+                mk.tip.pop("插队成功");
+            }).start();
+        }
     }
 
     setAdData(data) {
         //mk.console.logSingle('LineUpUIData  addata ', this.adData);
         super.setAdData(data);
-
+        console.log(`LineUpUIData=========${data}`);
         this.redMoney = 0;
         let rewardData = this.adData.videoRedMoney.videoRewardList;
-        for(let i = 0; i != rewardData.length; ++i)
-        {
-            if(rewardData[i].rewardType == RewardType.redBag)
-            {
+        for (let i = 0; i != rewardData.length; ++i) {
+            if (rewardData[i].rewardType == RewardType.redBag) {
                 this.redMoney = rewardData[i].rewardNum;
                 gData.gameData.playerProp.redMoney += this.redMoney;
                 break;
             }
         }
         this.showTips();
-
+        gData.gameData.playerProp.lineRedMoney = data.lineRedMoney;
+        this.refresh2 = true;
         //gData.reward.data = gData.lineUpUIData.adData.videoRedMoney.videoRewardList;
         // let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
         // gData.reward.getReward(world_Pos);

assets/script/game/data/module/WarnTipData.ts

@@ -7,8 +7,8 @@ export default class WarnTipData {
     curSolution = 0;
     tipArr = ['',
         '您点击广告太频繁了，请降低点击广告频率以免被封！',
-        '您点击广告太频繁了，封禁广告30分钟！',
-        '您点击广告太频繁了，封禁广告12小时！',
+        '您点击广告太频繁了，禁止看广告30分钟！',
+        '您点击广告太频繁了，禁止看广告12小时！',
         '系统检测到您的账号存在异常，禁止登陆游戏！']
 
     setSolution(solution) {

assets/script/game/module/newNotice/LineUpUI.ts

@@ -9,15 +9,22 @@ export default class LineUpUI extends cc.Component {
 
     @property(cc.RichText)
     private lbl_tip: cc.RichText = null;
+    @property(cc.Node)
+    private node_hb: cc.Node = null;
 
 
     start() {
         gData.lineUpUIData.refresh = false;
         this.lbl_tip.string = `<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>${gData.lineUpUIData.personCount}</color><color=#8A4312>人</color>`;
+
+        if (gData.gameData.playerProp.lineRedMoney > 0) {
+            this.node_hb.active = true;
+        } else {
+            this.node_hb.active = false;
+        }
     }
 
-    onEnable()
-    {
+    onEnable() {
         mk.ad.showNative();
     }
 
@@ -26,10 +33,21 @@ export default class LineUpUI extends cc.Component {
             console.log('lineUp=====>', gData.lineUpUIData.personCount);
             gData.lineUpUIData.refresh = false;
             this.lbl_tip.string = `<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>${gData.lineUpUIData.personCount}</color><color=#8A4312>人</color>`;
-            cc.tween( this.lbl_tip.node).to(0.3, {scale: 1.4}).to(0.2, {scale: 1}).call(()=>{
+            cc.tween(this.lbl_tip.node).to(0.3, { scale: 1.4 }).to(0.2, { scale: 1 }).call(() => {
                 //mk.tip.pop(`插队成功,并获得${gData.lineUpUIData.redMoney}红包币`);
             }).start();
         }
+
+        if(gData.lineUpUIData.refresh2)
+        {
+            gData.lineUpUIData.refresh2 = false;
+            if (gData.gameData.playerProp.lineRedMoney > 0) {
+                this.node_hb.active = true;
+            } else {
+                this.node_hb.active = false;
+            }
+        }
+
     }
 
     private clickVideoBtn() {
@@ -40,8 +58,12 @@ export default class LineUpUI extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 mk.data.sendDataEvent(DataEventId.queue, '进行插队人数');
-                mk.ad.videoAdType = VideoAdType.video_init_20;
-                await gData.adData.watchVideo(AdFun.lineUp);
+                if (gData.gameData.playerProp.lineRedMoney > 0) {
+                    mk.ad.videoAdType = VideoAdType.video_init_20;
+                    await gData.adData.watchVideo(AdFun.lineUp);
+                }else{
+                    gData.lineUpUIData.showTips();
+                }
                 gData.walletCashOutData.HttpCashOut2(gData.walletCashOutData.curID);
                 //gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
             }
@@ -50,7 +72,7 @@ export default class LineUpUI extends cc.Component {
 
     }
 
-    onDisable(){
+    onDisable() {
         mk.ad.destroyNativeAd();
     }
     private clickCloseBtn() {

assets/script/mk/system/AdSystem.ts

@@ -203,12 +203,9 @@ export default class AdSystem {
         }
 
         if (gap_time_stamp < needTime) {
-            console.log(`AdSystem======curSolution=>${gData.warnTipData.curSolution}`);
-            console.log(`AdSystem======needTime=>${needTime}====gap_time_stamp=>${gap_time_stamp}`)
             const time = Math.ceil((needTime - gap_time_stamp) / 1000);
-            console.log(`AdSystem======time=>${time}`);
             const leftTime = mk.time.formatWithUnit(time);
-            mk.tip.pop('当前看视频太频繁了，请' + leftTime + '后再试');
+            mk.tip.pop('视频内点击太频繁了，请' + leftTime + '后再试');
 
             return true;
         }

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

@@ -2963,12 +2963,8 @@ mk.ui.openPanel("module/warnTip/WarnTipPanel");
 return !0;
 }
 if (t < e) {
-console.log("AdSystem======curSolution=>" + gData.warnTipData.curSolution);
-console.log("AdSystem======needTime=>" + e + "====gap_time_stamp=>" + t);
-var a = Math.ceil((e - t) / 1e3);
-console.log("AdSystem======time=>" + a);
-var o = mk.time.formatWithUnit(a);
-mk.tip.pop("当前看视频太频繁了，请" + o + "后再试");
+var a = Math.ceil((e - t) / 1e3), o = mk.time.formatWithUnit(a);
+mk.tip.pop("视频内点击太频繁了，请" + o + "后再试");
 return !0;
 }
 gData.warnTipData.setSolution(0);
@@ -8588,13 +8584,16 @@ if (!e || !e.orderTaskList) return this.doSameCheckLogic(t);
 if (1 != t.state) return this.doSameCheckLogic(t);
 for (var o = e.orderTaskList, n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
 var c = o[i];
-if (a[i] < c.taskCount && c.Id <= n.length) for (var s = n[c.Id - 1], l = this.factoryIcons.length, p = 0; p < l; p++) {
+if (c.Id <= n.length) {
+if (a[i] < c.taskCount) for (var s = n[c.Id - 1], l = this.factoryIcons.length, p = 0; p < l; p++) {
 var u = gData.gameData.getTabByConfigID(this.factoryIcons[p].configID), d = gData.gameData.getMaxProduct(u);
 if (u == s.tab && this.factoryIcons[p].data.state == r.FactroyState.Empty && s.picture <= d) {
 gData.gameData.nextCanProduct = gData.gameData.getProductMap(s.picture);
-gData.gameData.nextMake = this.factoryIcons[h];
+gData.gameData.nextMake = this.factoryIcons[p];
 gData.gameData.nextType = 3;
-return this.factoryIcons[h];
+console.log("nextFactory ===== successs");
+return this.factoryIcons[p];
+}
 }
 } else {
 l = this.factoryIcons.length;
@@ -8602,6 +8601,7 @@ for (var h = 0; h < l; h++) if (this.factoryIcons[h].data.state == r.FactroyStat
 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[h].configID);
 gData.gameData.nextMake = this.factoryIcons[h];
 gData.gameData.nextType = 3;
+console.log("nextFactory ===== successs===");
 return this.factoryIcons[h];
 }
 }
@@ -9557,6 +9557,8 @@ gData.farmSystem.currSelectFarm = null;
 this.data.state = s.FarmState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
+t = this.node.getChildByName("hb");
+this.node.removeChild(t);
 gData.gameData.setFarmDataMap(this.configID, this.data);
 return [ 4, gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, !0) ];
 
@@ -9564,8 +9566,6 @@ case 1:
 e.sent();
 gData.gameData.setNextProduct(!1);
 0 == gData.harvestData.getType ? gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node) : gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_others, this.node);
-t = this.node.getChildByName("hb");
-this.node.removeChild(t);
 return [ 2 ];
 }
 });
@@ -10507,8 +10507,10 @@ for (var e = this.farms.length, a = 0; a < e; a++) if (this.farms[a] != this.cur
 t.state = 0;
 var o = gData.gameData.getRandomPlantConfig(t);
 if (o) {
+if (1 == gData.gameData.nextType) {
 gData.gameData.nextCanProduct = o;
 gData.gameData.nextMake = this.farms[a];
+}
 mk.console.logSingle("getCanPlantFarm  ", this.farms[a].data);
 return this.farms[a];
 }
@@ -12387,7 +12389,7 @@ Object.defineProperty(a, "__esModule", {
 value: !0
 });
 a.Fun = void 0;
-var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), x = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), N = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), B = t("./module/WarnTipData"), U = function() {
+var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), M = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), N = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), B = t("./module/WarnTipData"), U = function() {
 function t() {
 this.init();
 }
@@ -12420,8 +12422,8 @@ this.adUnlockData = new I.default();
 this.plantData = new T.default();
 this.harvestData = new C.default();
 this.adClearSickData = new F.default();
-this.pastureSystem = new x.default();
-this.factorySystem = new M.default();
+this.pastureSystem = new M.default();
+this.factorySystem = new x.default();
 this.farmSystem = new R.FarmSystem();
 this.farmMapData = new N.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
@@ -12880,8 +12882,9 @@ this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
 mk.console.logSingle("userNoviceWeFareInfo==>", t.userNoviceWeFareInfo);
 this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
 this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
-this.playerProp.completeFarmTaskTimes = 3;
+this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
 this.playerProp.orderData = t.userOrderTaskInfo;
+this.playerProp.lineRedMoney = t.lineRedMoney;
 console.log("==============initPlayerProp");
 console.log(t.userOrderTaskInfo);
 mk.console.logSingle("userOrderTaskInfo", t.userOrderTaskInfo);
@@ -13075,6 +13078,7 @@ var e = 0, a = !0, o = !1, n = !1, i = !1, c = [], s = [], l = this.playerProp.o
 if (l && h) {
 for (var f = this.configs.Product, y = 0; y != h.length; ++y) {
 var g = h[y];
+console.log("getRandomPlantConfig======= " + this.playerProp.copyOrderData[y]);
 if (this.playerProp.copyOrderData[y] < g.taskCount) {
 if (!(g.Id <= f.length)) {
 n = !0;
@@ -13101,7 +13105,7 @@ if (v = this.doFarmMapDataCheck(0)) e = v; else {
 e = r.default.rnd(10001, this.getMaxProduct(u.nzw));
 this.nextType = 1;
 }
-console.log("订单数据没有匹配成功");
+console.log("订单数据没有匹配成功====1");
 }
 } else {
 n = !0;
@@ -13116,7 +13120,7 @@ if (n) return this.getProductMap(e);
 if (a) {
 if (o) {
 var b = !1;
-for (y = 0; y != c.length; ++y) for (var D = gData.factorySystem.factoryIcons, w = D.length, S = 0; S < w; S++) if (this.getTabByConfigID(D[S].configID) == c[S] && D[S].data.state == d.Empty) {
+for (y = 0; y != c.length; ++y) for (var D = gData.factorySystem.factoryIcons, w = D.length, S = 0; S < w; S++) if (this.getTabByConfigID(D[S].configID) == c[y] && D[S].data.state == d.Empty) {
 b = !0;
 t.state = 1;
 break;
@@ -13129,10 +13133,17 @@ t.state = 2;
 break;
 }
 }
-return b ? null : this.getProductMap(e);
+if (b) {
+console.log("getRandomPlantConfig====0");
+return null;
 }
+console.log("getRandomPlantConfig====1");
 return this.getProductMap(e);
 }
+console.log("getRandomPlantConfig====2");
+return this.getProductMap(e);
+}
+console.log("getRandomPlantConfig====3");
 return this.getProductMap(e);
 };
 t.prototype.doJudgeOrderLogic = function(t) {
@@ -13143,15 +13154,20 @@ if (this.playerProp.copyOrderData[n] < i.taskCount && i.Id <= o.length) {
 var r = o[i.Id - 1];
 if (r.tab == u.nzw) continue;
 if (r.tab == u.dw) {
+console.log("doJudgeOrderLogic=====" + i.Id);
 for (var c = gData.pastureSystem.pastureIcons, s = c.length, l = 0; l < s; l++) if (c[l].data.productID == r.picture && c[l].data.state == p.Empty) {
 t.state = 2;
-break;
+console.log("doJudgeOrderLogic====2");
+console.log("doJudgeOrderLogic====22");
+return;
 }
 } else {
 var h = gData.factorySystem.factoryIcons;
 for (s = h.length, l = 0; l < s; l++) if (this.getTabByConfigID(h[l].configID) == r.tab && h[l].data.state == d.Empty) {
 t.state = 1;
-break;
+console.log("doJudgeOrderLogic====1");
+console.log("doJudgeOrderLogic====11");
+return;
 }
 }
 }
@@ -13174,7 +13190,7 @@ if (n) for (var i = this.getProductArrByType(u[o]), r = 0; r != i.length; ++r) {
 var c = i[r].picture - 1;
 if (1 == i[r].unlock && c == n && 0 == this.getFarmMapRewardState(this.getIndex(i[r]))) switch (u[o]) {
 case u.nzw:
-console.log("图鉴数据匹配成功");
+console.log("图鉴数据匹配成功=====1");
 this.nextType = 1;
 return c;
 
@@ -13182,7 +13198,7 @@ case u.dw:
 for (var s = gData.pastureSystem.pastureIcons, l = s.length, h = 0; h < l; h++) if (s[h].data.state == p.Empty) {
 e && t == a && (e.state = !0);
 if (c == s[h].data.productID) {
-console.log("图鉴数据匹配成功");
+console.log("图鉴数据匹配成功====2");
 this.nextCanProduct = this.getProductMap(s[h].data.productID);
 this.nextMake = s[h];
 this.nextType = 2;
@@ -13196,7 +13212,7 @@ var f = gData.factorySystem.factoryIcons;
 for (l = f.length, h = 0; h < l; h++) if (f[h].data.state == d.Empty) {
 e && (e.state = !0);
 if (this.getTabByConfigID(f[h].configID) == u[o]) {
-console.log("图鉴数据匹配成功");
+console.log("图鉴数据匹配成功=====3");
 this.nextCanProduct = this.getProductMap(c);
 this.nextMake = f[h];
 this.nextType = 3;
@@ -13850,6 +13866,7 @@ this.speedUpLeftTimes = 0;
 this.completeFarmTaskTimes = 0;
 this.orderData = null;
 this.copyOrderData = null;
+this.lineRedMoney = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
 get: function() {
@@ -14531,9 +14548,9 @@ this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
 gData.gameData.init_coin = !1;
 if (gData.gameData.addHb > 0) {
 var e = Math.round(gData.gameData.addHb / 100);
-this.lbl_addHb.string = "+" + e.toString();
 gData.gameData.addHb = 0;
 if (e > 0) {
+this.lbl_addHb.string = "+" + e.toString();
 cc.Tween.stopAllByTarget(this.node_addHb);
 this.node_addHb.active = !0;
 this.node_addHb.scale = 0;
@@ -18882,17 +18899,26 @@ e.personCount = 0;
 e.cashId = 0;
 e.refresh = !1;
 e.redMoney = 0;
+e.refresh2 = !1;
 return e;
 }
 e.prototype.showTips = function() {
 var t = this;
-cc.tween(this).delay(.5).call(function() {
+console.log("showTips======" + gData.gameData.playerProp.lineRedMoney);
+if (gData.gameData.playerProp.lineRedMoney > 0) cc.tween(this).delay(.5).call(function() {
 var e = Math.round(t.redMoney / 100);
 mk.tip.pop("插队成功,并获得" + e + "红包币");
+}).start(); else {
+console.log("showTips================");
+cc.tween(this).delay(.5).call(function() {
+console.log("showTips================2");
+mk.tip.pop("插队成功");
 }).start();
+}
 };
 e.prototype.setAdData = function(e) {
 t.prototype.setAdData.call(this, e);
+console.log("LineUpUIData=========" + e);
 this.redMoney = 0;
 for (var a = this.adData.videoRedMoney.videoRewardList, o = 0; o != a.length; ++o) if (a[o].rewardType == r.RewardType.redBag) {
 this.redMoney = a[o].rewardNum;
@@ -18900,6 +18926,8 @@ gData.gameData.playerProp.redMoney += this.redMoney;
 break;
 }
 this.showTips();
+gData.gameData.playerProp.lineRedMoney = e.lineRedMoney;
+this.refresh2 = !0;
 };
 return e;
 }(i.Data);
@@ -19051,11 +19079,13 @@ n(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_tip = null;
+e.node_hb = null;
 return e;
 }
 e.prototype.start = function() {
 gData.lineUpUIData.refresh = !1;
 this.lbl_tip.string = "<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>" + gData.lineUpUIData.personCount + "</color><color=#8A4312>人</color>";
+gData.gameData.playerProp.lineRedMoney > 0 ? this.node_hb.active = !0 : this.node_hb.active = !1;
 };
 e.prototype.onEnable = function() {
 mk.ad.showNative();
@@ -19071,6 +19101,10 @@ scale: 1.4
 scale: 1
 }).call(function() {}).start();
 }
+if (gData.lineUpUIData.refresh2) {
+gData.lineUpUIData.refresh2 = !1;
+gData.gameData.playerProp.lineRedMoney > 0 ? this.node_hb.active = !0 : this.node_hb.active = !1;
+}
 };
 e.prototype.clickVideoBtn = function() {
 var t = this;
@@ -19081,17 +19115,25 @@ return c(this, function(t) {
 switch (t.label) {
 case 0:
 mk.console.log("watchAD:" + e);
-if (!e) return [ 3, 2 ];
+if (!e) return [ 3, 4 ];
 mk.data.sendDataEvent(l.DataEventId.queue, "进行插队人数");
+if (!(gData.gameData.playerProp.lineRedMoney > 0)) return [ 3, 2 ];
 mk.ad.videoAdType = l.VideoAdType.video_init_20;
 return [ 4, gData.adData.watchVideo(s.AdFun.lineUp) ];
 
 case 1:
 t.sent();
-gData.walletCashOutData.HttpCashOut2(gData.walletCashOutData.curID);
-t.label = 2;
+return [ 3, 3 ];
 
 case 2:
+gData.lineUpUIData.showTips();
+t.label = 3;
+
+case 3:
+gData.walletCashOutData.HttpCashOut2(gData.walletCashOutData.curID);
+t.label = 4;
+
+case 4:
 return [ 2 ];
 }
 });
@@ -19105,6 +19147,7 @@ e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 };
 i([ d(cc.RichText) ], e.prototype, "lbl_tip", void 0);
+i([ d(cc.Node) ], e.prototype, "node_hb", void 0);
 return i([ u ], e);
 }(cc.Component);
 a.default = h;
@@ -23330,7 +23373,11 @@ gData.gameData.nextType = 2;
 return this.pastureIcons[p];
 }
 }
-return 1 == t.state ? null : this.doSameCheckLogic(t);
+if (1 == t.state) {
+console.log("nextPasture=======null");
+return null;
+}
+return this.doSameCheckLogic(t);
 }
 return this.doSameCheckLogic(t);
 };
@@ -23653,12 +23700,7 @@ this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
-if (1 == t.unlock) {
-(r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0);
-console.log("PlantItem=====>picture===" + t.picture);
-console.log("PlantItem=====>times===" + r);
-console.log("PlantItem=====>value===" + t.value);
-} else 2 == t.unlock && gData.gameData.playerProp.completeFarmTaskTimes >= t.value && (i = !0);
+1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.completeFarmTaskTimes >= t.value && (i = !0);
 this.mainNode.active = i;
 this.lockNode.active = !i;
 if (!i) {
@@ -23849,7 +23891,7 @@ var t = this;
 this.list_data = gData.plantData.productArr;
 this.tableView.node.emit("srollview-init", this.list_data);
 gData.plantData.productIndex > 1 && cc.tween(this).delay(.2).call(function() {
-t.list_data.length > 4 && (gData.plantData.productIndex <= t.list_data.length - 4 ? t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .1) : t.tableView.contentMoveByIndex(t.list_data.length - 4, .1));
+t.list_data.length > 4 && (gData.plantData.productIndex <= t.list_data.length - 4 ? t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .2) : t.tableView.contentMoveByIndex(t.list_data.length - 4, .2, !0));
 }).start();
 };
 e.prototype.onDestroy = function() {};
@@ -28929,10 +28971,14 @@ return;
 }
 this.addItemNode(t, e);
 };
-e.prototype.contentMoveByIndex = function(t, e) {
+e.prototype.contentMoveByIndex = function(t, e, a) {
 void 0 === e && (e = .5);
-var a = this.itemPosMap.get(t).startPos;
-this.direction == r.vertical ? this.scrollView.scrollToOffset(new cc.Vec2(this.content.x, a), e) : this.scrollView.scrollToOffset(new cc.Vec2(a, this.content.y), e);
+void 0 === a && (a = !1);
+var o = this.itemPosMap.get(t).startPos;
+if (this.direction == r.vertical) this.scrollView.scrollToOffset(new cc.Vec2(this.content.x, o), e); else {
+a && (o += 20);
+this.scrollView.scrollToOffset(new cc.Vec2(o, this.content.y), e);
+}
 };
 e.prototype.moveButtom = function() {
 var t = this.scrollView.getMaxScrollOffset();
@@ -32342,7 +32388,7 @@ value: !0
 var n = cc._decorator.ccclass, i = function() {
 function t() {
 this.curSolution = 0;
-this.tipArr = [ "", "您点击广告太频繁了，请降低点击广告频率以免被封！", "您点击广告太频繁了，封禁广告30分钟！", "您点击广告太频繁了，封禁广告12小时！", "系统检测到您的账号存在异常，禁止登陆游戏！" ];
+this.tipArr = [ "", "您点击广告太频繁了，请降低点击广告频率以免被封！", "您点击广告太频繁了，禁止看广告30分钟！", "您点击广告太频繁了，禁止看广告12小时！", "系统检测到您的账号存在异常，禁止登陆游戏！" ];
 }
 t.prototype.setSolution = function(t) {
 if (this.curSolution != t) {

packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1635321283154,
-    "genTime": 1635321283154,
+    "buildTime": 1635389909708,
+    "genTime": 1635389909708,
     "genVersion": null
 }