Procházet zdrojové kódy

修复等级开启bug

kaka před 4 roky
rodič
revize
178188db28

+ 12 - 0
assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "8c65ee95-8d1e-4deb-8864-df1c7a01c9ee",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 1 - 1
assets/resources/module/speedUpUI/productReward.prefab

@@ -3035,7 +3035,7 @@
       "__id__": 2
     },
     "open_effect": 1,
-    "isOpenCloseEffect": true,
+    "isOpenCloseEffect": false,
     "close_effect": 1,
     "close_toPoint": "",
     "close_uibg": false,

+ 5 - 5
assets/script/game/data/GameData.ts

@@ -724,7 +724,7 @@ export class GameData {
             let id = 30001;
             let data = null;
             for (var i = 0; i < len1; i++) {
-                if (arr[i].value < this.gameData.gradeLevel) {
+                if (this.gameData.gradeLevel < arr[i].value) {
                     data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
                 }
                 else {
@@ -790,7 +790,7 @@ export class GameData {
             for (var i = 0; i < 6; i++) {
                 tab = this.getTabByConfigID(id);
                 let arr = this.getProductArrByType(tab);
-                if (arr[0].value < this.gameData.gradeLevel) {
+                if (this.gameData.gradeLevel < arr[0].value) {
                     data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
                 }
                 else {
@@ -945,7 +945,7 @@ export class GameData {
                     needUpdate = false;
                     for (var i = 0; i < len; i++) {
                         data = this.getPastureDataMap(id);
-                        if (data.state == PastureState.Lock && configArr[i].value <= this.gameData.gradeLevel) {
+                        if (data.state == PastureState.Lock && this.gameData.gradeLevel >= configArr[i].value) {
                             data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
                             this.setPastureDataMap(id, data, false);
                             needUpdate = true;
@@ -963,7 +963,7 @@ export class GameData {
                     needUpdate = false;
                     let configID = this.getConfigIDByTab(tab);
                     data = this.getFactoryDataMap(configID);
-                    if (data.state == FactroyState.Lock && configArr[0].value <= this.gameData.gradeLevel) {
+                    if (data.state == FactroyState.Lock && this.gameData.gradeLevel >= configArr[0].value) {
                         data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
                         this.setFactoryDataMap(configID, data, false);
                         needUpdate = true;
@@ -1149,7 +1149,7 @@ class PlayerProp {
     isFirstRedMoney = 0;
 
     //农场等级
-    gradeLevel = 6;
+    gradeLevel = 1;
 
     //农场等级奖励数据
     farmGradeData: any = {};

+ 5 - 3
assets/script/game/data/module/GradeRewardData.ts

@@ -32,8 +32,8 @@ export class GradeRewardData extends Data {
         this.changeExp = true;
         gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo
         //const rewardNum = Math.round(response.data.userFarmGrageRewardInfo.money * 100);
-        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId-1].money;
- 
+        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
+
         gData.gameData.init_red_point = true;
         //console.log(`农场等级提现数据=======>${response.data.userFarmGrageRewardInfo}`);
         mk.ui.openPanel('module/newNotice/newNotice');
@@ -56,7 +56,9 @@ export class GradeRewardData extends Data {
             this.changeExp = true;
             //提示
             mk.tip.pop(`获得${addExp}点等级经验`);
-
+            if (gData.gameData.gameData.gradeLevel < response.data.farmLevel) {
+                gData.gameData.checkGradeUpUnLock();
+            }
             gData.gameData.gameData.gradeLevel = response.data.farmLevel;
             gData.gameData.gameData.farmExpValue = response.data.userExp;
             gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo;