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

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4e4c7e27-6fce-4142-bde1-d4e0cea5b72e",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

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 (list_data.value <= gData.gameData.gameData.gradeLevel) {
+            if (list_data.value >= gData.gameData.gameData.gradeLevel) {
                 unlock = true;
             }
         }