kaka 4 лет назад
Родитель
Сommit
611b2d7886

+ 1 - 1
assets/resources/module/cashPro/cashPro.prefab

@@ -1015,7 +1015,7 @@
         "__id__": 84
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 95

+ 7 - 6
assets/resources/module/guide/guide.prefab

@@ -953,7 +953,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f4ivHhJVBIx6dJqxMbGbIa",
+    "fileId": "67tPswHx5MO4Zt5bsbOULv",
     "sync": false
   },
   {
@@ -1064,7 +1064,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "88oqrV0E9HYZSrgKmHFhPy",
+    "fileId": "cdHHjtTnRKQIQuOinn4J+S",
     "sync": false
   },
   {
@@ -1930,15 +1930,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        266.009,
-        614.638,
+        254.965,
+        609.038,
         0,
         0,
         0,
         0,
         1,
-        0.8,
-        0.8,
+        1,
+        1,
         0.8
       ]
     },
@@ -2373,6 +2373,7 @@
       "__id__": 15
     },
     "_enabled": true,
+    "isFitSpecialNode": false,
     "_id": ""
   },
   {

+ 1 - 1
assets/script/before/view/uiItem/PlantItem.ts

@@ -76,7 +76,7 @@ export default class PlantItem extends cc.Component {
         }
         //根据农场等级
         else if (list_data.unlock == 2) {
-            if (gData.gameData.playerProp.gradeLevel >= list_data.value) {
+            if (gData.gameData.playerProp.completeFarmTaskTimes >= list_data.value) {
                 unlock = true;
             }
         }

+ 3 - 6
assets/script/game/module/cashPro/CashPro.ts

@@ -22,23 +22,20 @@ export default class CashPro extends cc.Component {
     update() {
         if (gData.cashPro.init_load) {
             this.showLoad();
+            gData.cashPro.init_load = false;
         }
 
         if (gData.cashPro.init_success) {
             this.tixianSuccess();
+            gData.cashPro.init_success = false;
         }
 
         if (gData.cashPro.init_fail) {
             this.tixianFail();
+            gData.cashPro.init_fail = false;
         }
     }
 
-    lateUpdate() {
-        gData.cashPro.init_load = false;
-        gData.cashPro.init_success = false;
-        gData.cashPro.init_fail = false;
-    }
-
     showLoad() {
         this.loadPart.active = true
         this.loadAni.play('load', 0)