去除图鉴优先逻辑

assets/resources/module/speedUpUI/productReward.prefab

@@ -1064,7 +1064,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 236.49,
+      "width": 288.49,
       "height": 50
     },
     "_anchorPoint": {
@@ -1128,7 +1128,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 78,
+      "width": 130,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1180,8 +1180,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "再生产",
-    "_N$string": "再生产",
+    "_string": "订单再生产",
+    "_N$string": "订单再生产",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1248,7 +1248,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -13.000000000000004,
+        12.999999999999996,
         -5,
         0,
         0,
@@ -1360,7 +1360,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        66.245,
+        92.245,
         0,
         0,
         0,
@@ -1547,7 +1547,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 236.49,
+      "width": 288.49,
       "height": 50
     },
     "_resize": 1,

assets/script/before/main/FactoryIcon.ts

@@ -190,7 +190,7 @@ export class FactoryIcon extends cc.Component {
         this.data.growSpan = 0;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(productID, this.node);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/FactorySystem.ts

@@ -95,11 +95,13 @@ export default class FactorySystem {
                 }
             }
         } else {
-            let isHaveEmpty = {state: false};
-            let picId = gData.gameData.doFarmMapDataCheck(2, isHaveEmpty);
-            if (picId) {
-                return picId;
-            } else {
+            // let isHaveEmpty = {state: false};
+            // let picId = gData.gameData.doFarmMapDataCheck(2, isHaveEmpty);
+            // if (picId) {
+            //     return picId;
+            // } 
+            // else 
+            {
                 //if(isHaveEmpty.state)
                 {
                     let len = this.factoryIcons.length;

assets/script/before/main/FarmIcon.ts

@@ -155,7 +155,7 @@ export class FarmIcon extends cc.Component {
         this.node.removeChild(child);
         gData.gameData.setFarmDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, true);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/PastureIcon.ts

@@ -283,7 +283,7 @@ export default class PastureIcon extends cc.Component {
         this.data.growSpan = 0;
         gData.gameData.setPastureDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/PastureSystem.ts

@@ -82,11 +82,12 @@ export default class PastureSystem {
         }
         else {
 
-            let isHaveEmpty = {state: false};
-            let picId = gData.gameData.doFarmMapDataCheck(1, isHaveEmpty);
-            if (picId) {
-                return picId;
-            } else {
+            // let isHaveEmpty = {state: false};
+            // let picId = gData.gameData.doFarmMapDataCheck(1, isHaveEmpty);
+            // if (picId) {
+            //     return picId;
+            // } else 
+            {
                 //if(isHaveEmpty.state)
                 {
                     let len = this.pastureIcons.length;

assets/script/game/data/GameData.ts

@@ -567,10 +567,11 @@ export class GameData {
 
             if (!isMatchSuccess) {
 
-                let picId = this.doFarmMapDataCheck(0);
-                if (picId) {
-                    id = picId;
-                } else {
+                // let picId = this.doFarmMapDataCheck(0);
+                // if (picId) {
+                //     id = picId;
+                // } else 
+                {
                     id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
                     this.nextType = 1
                 }
@@ -578,10 +579,11 @@ export class GameData {
             }
         } else {
             isOrderDataInvalid = true;
-            let picId = this.doFarmMapDataCheck(0);
-            if (picId) {
-                id = picId;
-            } else {
+            // let picId = this.doFarmMapDataCheck(0);
+            // if (picId) {
+            //     id = picId;
+            // } else 
+            {
                 id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
                 this.nextType = 1
             }

assets/script/game/game/Game.ts

@@ -1076,6 +1076,7 @@ export default class Game extends cc.Component {
         mk.ui.openPanel('module/newNotice/newNotice');
         this.initOrderUI();
         gData.gameData.init_order = true;
+        gData.gameData.checkTaskFinishUnLock();
     }
 
     showTips()

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1636456989091,
-    "genTime": 1636456989091,
+    "buildTime": 1636461422472,
+    "genTime": 1636461422472,
     "genVersion": null
 }