wuwangdong 4 年之前
父節點
當前提交
db8091f1a5

+ 3 - 3
assets/resources/game/coregame/coregame.prefab

@@ -33011,7 +33011,7 @@
     "node": {
       "__id__": 928
     },
-    "_enabled": true,
+    "_enabled": false,
     "canTouch": true,
     "onInPolygon": {
       "__id__": 939
@@ -129916,7 +129916,7 @@
         "__id__": 3793
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3796
@@ -130162,7 +130162,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3801

+ 8 - 8
assets/resources/game/prefab/game.prefab

@@ -321,7 +321,7 @@
       "__id__": 4
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 6
@@ -428,7 +428,7 @@
       "__id__": 4
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 9
@@ -542,7 +542,7 @@
         "__id__": 15
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 18
@@ -2035,7 +2035,7 @@
         "__id__": 91
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 99
@@ -5554,7 +5554,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "caWV+iVjJHlq1NfA3Ozdsw",
+    "fileId": "6aG/lv+8RG7IU0HmX9Nwx2",
     "sync": false
   },
   {
@@ -5766,7 +5766,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "a8BMKLontFmIAqBd4kRCbL",
+    "fileId": "98ecxtow5PXax5qPRmilZk",
     "sync": false
   },
   {
@@ -5875,7 +5875,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "caAKutTX5JI4VsaJg3K60s",
+    "fileId": "d5viRLAelBP6lFA/hDcXtp",
     "sync": false
   },
   {
@@ -13124,7 +13124,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "bdLf1BLzhP0IW9hOZvrxTg",
+    "fileId": "b36itW4LJDeLB/Fg92BspU",
     "sync": false
   },
   {

+ 5 - 5
assets/script/before/main/FactoryIcon.ts

@@ -99,9 +99,9 @@ export class FactoryIcon extends cc.Component {
     public async onTouch() {
         switch (this.data.state) {
             case FactroyState.Lock:
-                let arr = gData.gameData.getProductArrByType(this.tab);
-                let lv = arr[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
-                mk.tip.pop(`完成${lv}次任务红包后解锁`);
+                // let arr = gData.gameData.getProductArrByType(this.tab);
+                // let lv = arr[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
+                // mk.tip.pop(`完成${lv}次任务红包后解锁`);
                 break;
             case FactroyState.Empty:
                 gData.factorySystem.currSelectFactory = this;
@@ -191,10 +191,10 @@ export class FactoryIcon extends cc.Component {
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
         }
         else {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
     }
 

+ 6 - 6
assets/script/before/main/FarmIcon.ts

@@ -125,11 +125,11 @@ export class FarmIcon extends cc.Component {
                 gData.adUnlockData.openPanel(this.configID);
                 break;
             case FarmState.Empty:
-                gData.farmSystem.currSelectFarm = this;
-                gData.plantData.openPanel(ProductType.nzw, this.configID);
+                //gData.farmSystem.currSelectFarm = this;
+                //gData.plantData.openPanel(ProductType.nzw, this.configID);
                 break;
             case FarmState.Growing:
-                mk.ui.openPanel('module/speedUpUI/speedUp');
+                //mk.ui.openPanel('module/speedUpUI/speedUp');
                 break;
             case FarmState.Ripe:
                 gData.farmSystem.currSelectFarm = this;
@@ -154,15 +154,15 @@ export class FarmIcon extends cc.Component {
         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);
+        //await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, true);
         gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
         }
         else {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
     }
 

+ 10 - 10
assets/script/before/main/PastureIcon.ts

@@ -149,14 +149,14 @@ export default class PastureIcon extends cc.Component {
     public async onTouch() {
         switch (this.data.state) {
             case PastureState.Lock:
-                let config = gData.gameData.getProductMap(this.data.productID);
-                if (config.unlock == 2) {
-                    let times =config.value - gData.gameData.playerProp.completeFarmTaskTimes;
-                    mk.tip.pop(`完成${times}次任务红包后解锁`);
-                }
-                else if (config.unlock == 1) {
-                    mk.tip.pop(`喂食${config.name}${config.value}次解锁`)
-                }
+                // let config = gData.gameData.getProductMap(this.data.productID);
+                // if (config.unlock == 2) {
+                //     let times =config.value - gData.gameData.playerProp.completeFarmTaskTimes;
+                //     mk.tip.pop(`完成${times}次任务红包后解锁`);
+                // }
+                // else if (config.unlock == 1) {
+                //     mk.tip.pop(`喂食${config.name}${config.value}次解锁`)
+                // }
                 break;
             case PastureState.Empty:
                 if (!this.emptyClick) {
@@ -285,10 +285,10 @@ export default class PastureIcon extends cc.Component {
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
         }
         else {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
+            //gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
     }
 

+ 1 - 0
assets/script/game/data/GameData.ts

@@ -839,6 +839,7 @@ export class GameData {
 
     public async updateNewTaskProgress(isNeedRefresh = false) {
 
+        return false;
         // if (gData.gameData.init_redBagTask) {
         //     return;
         // }

+ 1 - 1
assets/script/game/data/module/RewardData.ts

@@ -80,7 +80,7 @@ export class RewardData extends Data {
     public getReward(world_Pos: cc.Vec2, isMatchOrder = false)
     {
         //let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
-        this.flyCoinAnim(world_Pos, isMatchOrder);
+        //this.flyCoinAnim(world_Pos, isMatchOrder);
         if (this.callback) {
             this.callback();
             this.callback = null;

+ 2 - 0
assets/script/game/game/AniControl.ts

@@ -240,6 +240,8 @@ export default class AniControl extends cc.Component {
     // }
 
     private clickAnimalIconBtn(event, customEvenData) {
+
+        return;
         mk.audio.playEffect("button");
         if (customEvenData == 'bird_1') {
             this.flyBirdFinished_1();

+ 1 - 1
assets/script/mk/system/JsbSystem.ts

@@ -150,7 +150,7 @@ export default class JsbSystem {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
             gData.appData.appId = "wxd413dcac1e6a74c9";
-            gData.appData.version = "5.1.";
+            gData.appData.version = "14.1.4";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

二進制
build/jsb-link/assets/main/index.jsc


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/ce/ce87165a-e80b-46ed-b9df-d2690132ca17.json


二進制
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


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

@@ -3292,20 +3292,7 @@ t.moveSheep.play();
 }).start();
 }
 };
-e.prototype.clickAnimalIconBtn = function(t, e) {
-mk.audio.playEffect("button");
-if ("bird_1" == e) {
-this.flyBirdFinished_1();
-this.getRewardByHttp("bird_1");
-} else if ("bird_2" == e) {
-this.flyBirdFinished_2();
-this.getRewardByHttp("bird_2");
-} else if ("dog" == e) {
-this.moveDogFinished();
-this.getRewardByHttp("dog");
-}
-gData.adData.checkShowFullInter(1, s.InterFullAdType.interstitial2_init_3);
-};
+e.prototype.clickAnimalIconBtn = function() {};
 e.prototype.getRewardByHttp = function(t) {
 return r(this, void 0, void 0, function() {
 var e, a, o, n, i, r;
@@ -8288,13 +8275,9 @@ this.showGroup.removeAllChildren();
 };
 e.prototype.onTouch = function() {
 return r(this, void 0, void 0, function() {
-var t, e;
 return c(this, function() {
 switch (this.data.state) {
 case s.FactroyState.Lock:
-t = gData.gameData.getProductArrByType(this.tab);
-e = t[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
-mk.tip.pop("完成" + e + "次任务红包后解锁");
 break;
 
 case s.FactroyState.Empty:
@@ -8385,7 +8368,7 @@ case 1:
 e.sent();
 gData.gameData.nextMake = null;
 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);
+gData.harvestData.getType;
 return [ 2 ];
 }
 });
@@ -9527,12 +9510,7 @@ gData.adUnlockData.openPanel(this.configID);
 break;
 
 case s.FarmState.Empty:
-gData.farmSystem.currSelectFarm = this;
-gData.plantData.openPanel(s.ProductType.nzw, this.configID);
-break;
-
 case s.FarmState.Growing:
-mk.ui.openPanel("module/speedUpUI/speedUp");
 break;
 
 case s.FarmState.Ripe:
@@ -9551,9 +9529,7 @@ return [ 2 ];
 e.prototype.onHarvest = function() {
 return r(this, void 0, void 0, function() {
 var t;
-return c(this, function(e) {
-switch (e.label) {
-case 0:
+return c(this, function() {
 this.countDown.cleanRiped();
 this.process.cleanProcess();
 gData.farmSystem.currSelectFarm = null;
@@ -9563,15 +9539,10 @@ 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) ];
-
-case 1:
-e.sent();
 gData.gameData.nextMake = null;
 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);
+gData.harvestData.getType;
 return [ 2 ];
-}
 });
 });
 };
@@ -12393,7 +12364,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"), 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() {
+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"), M = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), N = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), L = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), B = t("./module/WarnTipData"), U = function() {
 function t() {
 this.init();
 }
@@ -12425,14 +12396,14 @@ this.newCashUiData = new O.NewCashUIData();
 this.adUnlockData = new I.default();
 this.plantData = new T.default();
 this.harvestData = new C.default();
-this.adClearSickData = new F.default();
-this.pastureSystem = new M.default();
+this.adClearSickData = new M.default();
+this.pastureSystem = new F.default();
 this.factorySystem = new x.default();
 this.farmSystem = new R.FarmSystem();
 this.farmMapData = new N.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
-this.walletCashOutData = new E.WalletCashOutData();
-this.lineUpUIData = new L.LineUpUIData();
+this.walletCashOutData = new L.WalletCashOutData();
+this.lineUpUIData = new E.LineUpUIData();
 this.warnTipData = new B.default();
 this.moduleData = new Map();
 this.moduleData.set(o.moreGame, this.moreGame);
@@ -13313,27 +13284,18 @@ return [ 2, t ];
 t.prototype.updateNewTaskProgress = function(t) {
 void 0 === t && (t = !1);
 return o(this, void 0, void 0, function() {
-var t, e, a, o;
-return n(this, function(n) {
-switch (n.label) {
+var t;
+return n(this, function(e) {
+switch (e.label) {
 case 0:
-if (this.playerProp.userFarmTaskInfo) {
-t = this.playerProp.userFarmTaskInfo.completeCount;
-e = this.playerProp.userFarmTaskInfo.taskCount;
-if (t >= e) {
-this.gameStyle.getIsCanGetOrderReward() ? mk.tip.pop("订单已完成,快领奖吧!") : mk.tip.pop("任务红包进度已满,快去提现");
 return [ 2, !1 ];
-}
-}
-a = {};
-return [ 4, mk.http.sendData("farmTask/updateUserFarmTaskInfo", a) ];
 
 case 1:
-o = n.sent();
-mk.console.logSingle("refrehTask=>", o);
-if (0 != o.errcode) return [ 2, !1 ];
+t = e.sent();
+mk.console.logSingle("refrehTask=>", t);
+if (0 != t.errcode) return [ 2, !1 ];
 gData.gameData.init_task = !0;
-this.playerProp.userFarmTaskInfo = o.data.userFarmTaskInfo;
+this.playerProp.userFarmTaskInfo = t.data.userFarmTaskInfo;
 this.playerProp.userFarmTaskInfo.completeCount, this.playerProp.userFarmTaskInfo.taskCount;
 return [ 2, !0 ];
 }
@@ -23044,14 +23006,9 @@ this.showGroup.removeAllChildren();
 };
 e.prototype.onTouch = function() {
 return r(this, void 0, void 0, function() {
-var t, e;
 return c(this, function() {
 switch (this.data.state) {
 case s.PastureState.Lock:
-if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) {
-e = t.value - gData.gameData.playerProp.completeFarmTaskTimes;
-mk.tip.pop("完成" + e + "次任务红包后解锁");
-} else 1 == t.unlock && mk.tip.pop("喂食" + t.name + t.value + "次解锁");
 break;
 
 case s.PastureState.Empty:
@@ -23177,7 +23134,7 @@ case 1:
 t.sent();
 gData.gameData.nextMake = null;
 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);
+gData.harvestData.getType;
 return [ 2 ];
 }
 });
@@ -26248,7 +26205,6 @@ a.addReward();
 };
 e.prototype.getReward = function(t, e) {
 void 0 === e && (e = !1);
-this.flyCoinAnim(t, e);
 if (this.callback) {
 this.callback();
 this.callback = null;

+ 2 - 2
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": 1635492910476,
-    "genTime": 1635492910476,
+    "buildTime": 1635496837350,
+    "genTime": 1635496837350,
     "genVersion": null
 }

Some files were not shown because too many files changed in this diff