11

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -308,7 +308,7 @@
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_reward.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videocommon.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videojs.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.7.0.2.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.0.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.1.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -112,7 +112,13 @@ public class SplashAdShowActivity extends Activity implements ATSplashAdListener
     }
 
     @Override
-    public void onAdLoaded() {
+    public void onAdLoadTimeout() {
+        Log.d("SplashAdShowActivity", "onAdLoadTimeout ");
+        jumpToMainActivity();
+    }
+
+    @Override
+    public void onAdLoaded(boolean var1) {
         Log.d("SplashAdShowActivity", "onAdLoaded ");
         splashAd.show(this, container);
     }

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

@@ -6429,6 +6429,7 @@ mk.ui.closePanel(this.node.name);
 };
 e.prototype.clickCloseBtn = function() {
 gData.gameData.init_redBagTask = !0;
+mk.ui.closePanel("newNotice");
 };
 i([ p(cc.Node) ], e.prototype, "loadPart", void 0);
 i([ p(cc.Animation) ], e.prototype, "loadAni", void 0);
@@ -8142,14 +8143,14 @@ return [ 2 ];
 e.prototype.clickSpeedUp = function() {
 mk.ui.openPanel("module/speedUpUI/speedUp");
 };
-e.prototype.onRipe = function() {
+e.prototype.onRipe = function(t) {
 this.data.state = s.FactroyState.Ripe;
-gData.gameData.setFactoryDataMap(this.configID, this.data);
+gData.gameData.setFactoryDataMap(this.configID, this.data, t);
 gData.gameData.addProductMakeTimesById(this.data.productID);
 };
-e.prototype.onSick = function() {
+e.prototype.onSick = function(t) {
 this.data.state = s.FactroyState.Sick;
-gData.gameData.setFactoryDataMap(this.configID, this.data);
+gData.gameData.setFactoryDataMap(this.configID, this.data, t);
 };
 e.prototype.onHarvest = function() {
 this.countDown.cleanRiped();
@@ -8162,6 +8163,16 @@ gData.gameData.setFactoryDataMap(this.configID, this.data);
 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);
 };
+e.prototype.canHarvest = function() {
+this.getComponent(l.MoveToCenter).move();
+gData.factorySystem.currSelectFactory = this;
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+};
+e.prototype.canClearSick = function() {
+this.getComponent(l.MoveToCenter).move();
+mk.data.sendDataEvent(s.DataEventId.button_click, "停电icon");
+gData.adClearSickData.openPanel(this.tab, this.configID);
+};
 i([ y({
 type: u.FarmCountDown,
 tooltip: "倒计时组件"
@@ -8228,7 +8239,11 @@ t.prototype.btnMake = function() {
 gData.gameData.nextMake.make(gData.gameData.nextCanProduct.picture);
 };
 t.prototype.setHarvest = function() {
-for (var t = this.factoryIcons.length, e = 0; e < t; e++) this.factoryIcons[e].data.state == a.FactroyState.Producting && this.factoryIcons[e].countDown.riped();
+for (var t = this.factoryIcons.length, e = !1, o = 0; o < t; o++) if (this.factoryIcons[o].data.state == a.FactroyState.Producting) {
+this.factoryIcons[o].countDown.riped(!1);
+e = !0;
+}
+e && gData.gameData.freshSendToServer(3);
 };
 t.prototype.canSpeedUp = function() {
 for (var t = !1, e = this.factoryIcons.length, o = 0; o < e; o++) if (this.factoryIcons[o].data.state == a.FactroyState.Producting) {
@@ -8237,6 +8252,22 @@ break;
 }
 return t;
 };
+t.prototype.canHarvest = function() {
+for (var t = !1, e = this.factoryIcons.length, o = 0; o < e; o++) if (this.factoryIcons[o].data.state == a.FactroyState.Ripe) {
+this.factoryIcons[o].canHarvest();
+t = !0;
+break;
+}
+return t;
+};
+t.prototype.canClearSick = function() {
+for (var t = !1, e = this.factoryIcons.length, o = 0; o < e; o++) if (this.factoryIcons[o].data.state == a.FactroyState.Sick) {
+this.factoryIcons[o].canClearSick();
+t = !0;
+break;
+}
+return t;
+};
 return n([ i ], t);
 }();
 o.default = r;
@@ -8474,30 +8505,31 @@ return [ 2 ];
 });
 });
 };
-e.prototype.riped = function() {
+e.prototype.riped = function(t) {
+void 0 === t && (t = !0);
 this.counting = !1;
 this.normalGroup.active = !1;
-var t = !1;
+var e = !1;
 if (gData.gameData.playerProp.completeFarmTaskTimes >= 1 && Math.random() < .2) if (this.productConfig.tab == l.ProductType.nzw) {
 if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
-t = !0;
+e = !0;
 gData.gameData.RawInsectCurArr[0]++;
 }
 } else if (this.productConfig.tab == l.ProductType.dw) {
 if (gData.gameData.RawInsectCurArr[1] < parseInt(gData.gameData.RawInsectArr[1])) {
-t = !0;
+e = !0;
 gData.gameData.RawInsectCurArr[1]++;
 }
 } else if (gData.gameData.RawInsectCurArr[2] < parseInt(gData.gameData.RawInsectArr[2])) {
-t = !0;
+e = !0;
 gData.gameData.RawInsectCurArr[2]++;
 }
-if (t) {
+if (e) {
 this.sickIcon.active = !0;
-this.onSick && this.onSick.emit(null);
+this.onSick && this.onSick.emit([ t ]);
 } else {
 this.ripedIcon.active = !0;
-this.onRiped && this.onRiped.emit(null);
+this.onRiped && this.onRiped.emit([ t ]);
 }
 };
 i([ h({
@@ -9154,18 +9186,18 @@ return [ 2 ];
 });
 });
 };
-e.prototype.onRiped = function() {
+e.prototype.onRiped = function(t) {
 return r(this, void 0, void 0, function() {
 return c(this, function() {
 this.data.state = s.FarmState.Ripe;
-gData.gameData.setFarmDataMap(this.configID, this.data);
+gData.gameData.setFarmDataMap(this.configID, this.data, t);
 return [ 2 ];
 });
 });
 };
-e.prototype.onSick = function() {
+e.prototype.onSick = function(t) {
 this.data.state = s.FarmState.Sick;
-gData.gameData.setFarmDataMap(this.configID, this.data);
+gData.gameData.setFarmDataMap(this.configID, this.data, t);
 };
 e.prototype.onPlantAnimationFinish = function() {
 return r(this, void 0, void 0, function() {
@@ -9190,6 +9222,15 @@ this.process.setData(this.data);
 e.prototype.novice_clean = function() {
 this.process.cleanProcess();
 };
+e.prototype.canHarvest = function() {
+gData.farmSystem.currSelectFarm = this;
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this));
+};
+e.prototype.canClearSick = function() {
+gData.farmSystem.currSelectFarm = this;
+mk.data.sendDataEvent(s.DataEventId.button_click, "生虫icon");
+gData.adClearSickData.openPanel(s.ProductType.nzw, this.configID);
+};
 i([ y({
 type: cc.Node,
 tooltip: "未解锁时显示节点"
@@ -9922,10 +9963,12 @@ t.prototype.btnMake = function() {
 gData.gameData.nextMake.plant(gData.gameData.nextCanProduct.picture);
 };
 t.prototype.setHarvest = function() {
-for (var t = this.farms.length, e = 0; e < t; e++) if (this.farms[e].data.state == a.FarmState.Growing) {
-this.farms[e].process.onSpeed();
-this.farms[e].countDown.riped();
+for (var t = this.farms.length, e = !1, o = 0; o < t; o++) if (this.farms[o].data.state == a.FarmState.Growing) {
+this.farms[o].process.onSpeed();
+this.farms[o].countDown.riped(!1);
+e = !0;
 }
+e && gData.gameData.freshSendToServer(1);
 };
 t.prototype.canSpeedUp = function() {
 for (var t = !1, e = this.farms.length, o = 0; o < e; o++) if (this.farms[o].data.state == a.FarmState.Growing) {
@@ -9934,6 +9977,22 @@ break;
 }
 return t;
 };
+t.prototype.canHarvest = function() {
+for (var t = !1, e = this.farms.length, o = 0; o < e; o++) if (this.farms[o].data.state == a.FarmState.Ripe) {
+this.farms[o].canHarvest();
+t = !0;
+break;
+}
+return t;
+};
+t.prototype.canClearSick = function() {
+for (var t = !1, e = this.farms.length, o = 0; o < e; o++) if (this.farms[o].data.state == a.FarmState.Sick) {
+this.farms[o].canClearSick();
+t = !0;
+break;
+}
+return t;
+};
 return n([ i ], t);
 }();
 o.FarmSystem = r;
@@ -11485,7 +11544,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = 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"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), F = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = function() {
+var n, a = 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"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), F = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = function() {
 function t() {
 this.init();
 }
@@ -11524,7 +11583,7 @@ this.farmSystem = new R.FarmSystem();
 this.farmMapData = new M.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
 this.walletCashOutData = new B.WalletCashOutData();
-this.lineUpUIData = new L.LineUpUIData();
+this.lineUpUIData = new E.LineUpUIData();
 this.moduleData = new Map();
 this.moduleData.set(n.moreGame, this.moreGame);
 this.moduleData.set(n.turnable, this.turnable);
@@ -11545,7 +11604,7 @@ t[t.sign = 6] = "sign";
 t[t.cashNormal = 7] = "cashNormal";
 t[t.redBagCash = 8] = "redBagCash";
 })(n = o.Fun || (o.Fun = {}));
-window.gData = new E();
+window.gData = new L();
 cc._RF.pop();
 }, {
 "../../before/main/FactorySystem": "FactorySystem",
@@ -12164,7 +12223,7 @@ return [ 3, 6 ];
 return [ 3, 8 ];
 
 case 1:
-mk.tip.pop("农场已满，无法继续生产");
+this.checkCanHarvest() || this.checkCanClearSick() || this.checkCanSpeedUp(!0);
 t = !1;
 return [ 3, 8 ];
 
@@ -12246,7 +12305,7 @@ this._farmData[a].growSpan = e.growSpan;
 break;
 }
 this.needFreshArr.push(t);
-o && this.setProp(i.farmData, this._farmData);
+o && this.freshSendToServer(1);
 };
 t.prototype.getFarmDataMap = function(t) {
 return this._farmDataMap.get(t);
@@ -12346,7 +12405,7 @@ this._pastureData[a].growSpan = e.growSpan;
 break;
 }
 this.needFreshArr.push(t);
-o && this.setProp(i.pastureData, this._pastureData);
+o && this.freshSendToServer(2);
 };
 t.prototype.getPastureDataMap = function(t) {
 return this._pastureDataMap.get(t);
@@ -12392,7 +12451,7 @@ this._factoryData[a].growSpan = e.growSpan;
 break;
 }
 this.needFreshArr.push(t);
-o && this.setProp(i.factoryData, this._factoryData);
+o && this.freshSendToServer(3);
 };
 t.prototype.getFactoryDataMap = function(t) {
 return this._factoryDataMap.get(t);
@@ -12490,6 +12549,20 @@ e = 30009;
 }
 return e;
 };
+t.prototype.freshSendToServer = function(t) {
+switch (t) {
+case 1:
+this.setProp(i.farmData, this._farmData);
+break;
+
+case 2:
+this.setProp(i.pastureData, this._pastureData);
+break;
+
+case 3:
+this.setProp(i.factoryData, this._factoryData);
+}
+};
 t.prototype.getMaxProduct = function(t) {
 if (this._maxProduct) for (var e = this._maxProduct.length, o = null, n = 0; n < e; n++) if ((o = this._maxProduct[n]).tab == t) return o.productID;
 return null;
@@ -12571,16 +12644,28 @@ this.setNextProduct();
 }
 }
 };
-t.prototype.checkCanSpeedUp = function() {
-var t = !1;
-(t = gData.farmSystem.canSpeedUp()) || (t = gData.pastureSystem.canSpeedUp()) || (t = gData.factorySystem.canSpeedUp());
-return t;
+t.prototype.checkCanSpeedUp = function(t) {
+void 0 === t && (t = !1);
+var e = !1;
+(e = gData.farmSystem.canSpeedUp()) || (e = gData.pastureSystem.canSpeedUp()) || (e = gData.factorySystem.canSpeedUp());
+e && t && mk.ui.openPanel("module/speedUpUI/speedUp");
+return e;
 };
 t.prototype.setHarvest = function() {
 gData.farmSystem.setHarvest();
 gData.pastureSystem.setHarvest();
 gData.factorySystem.setHarvest();
 };
+t.prototype.checkCanHarvest = function() {
+var t = !1;
+(t = gData.farmSystem.canHarvest()) || (t = gData.pastureSystem.canHarvest()) || (t = gData.factorySystem.canHarvest());
+return t;
+};
+t.prototype.checkCanClearSick = function() {
+var t = !1;
+(t = gData.farmSystem.canClearSick()) || (t = gData.pastureSystem.canClearSick()) || (t = gData.factorySystem.canClearSick());
+return t;
+};
 return t;
 }();
 o.GameData = c;
@@ -17454,7 +17539,7 @@ return [ 2 ];
 e.prototype.update = function() {
 if (!this.hasDeviceBackInit) {
 this.hasDeviceBackInit = !0;
-this.getDeviceInfoBack();
+this.getAppVersion();
 }
 if (gData.appData.updateState == u.UpdateState.ForceUpdateFinish) {
 gData.appData.updateState = u.UpdateState.CheckHot;
@@ -17537,7 +17622,7 @@ this.bar.fillRange = e;
 this.lbl_progress.string = "加载中 " + t + "%";
 }
 };
-e.prototype.getDeviceInfoBack = function() {
+e.prototype.getAppVersion = function() {
 return r(this, void 0, void 0, function() {
 return c(this, function(t) {
 switch (t.label) {
@@ -19685,7 +19770,7 @@ this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2)
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
 e.prototype.clickCloseBtn = function() {
-gData.gameData.init_redBagTask = !0;
+mk.audio.playEffect("button");
 gData.cashPro.openCashPro(gData.receiptNotice.receip_rmb);
 gData.cashPro.init_success = !0;
 };
@@ -20565,14 +20650,14 @@ return [ 2 ];
 e.prototype.clickSpeedUp = function() {
 mk.ui.openPanel("module/speedUpUI/speedUp");
 };
-e.prototype.onRipe = function() {
+e.prototype.onRipe = function(t) {
 this.data.state = s.PastureState.Ripe;
-gData.gameData.setPastureDataMap(this.configID, this.data);
+gData.gameData.setPastureDataMap(this.configID, this.data, t);
 gData.gameData.addProductMakeTimesById(this.data.productID);
 };
-e.prototype.onSick = function() {
+e.prototype.onSick = function(t) {
 this.data.state = s.PastureState.Sick;
-gData.gameData.setPastureDataMap(this.configID, this.data);
+gData.gameData.setPastureDataMap(this.configID, this.data, t);
 };
 e.prototype.onHarvest = function() {
 this.countDown.cleanRiped();
@@ -20583,6 +20668,15 @@ gData.gameData.setPastureDataMap(this.configID, this.data);
 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);
 };
+e.prototype.canHarvest = function() {
+this.getComponent(l.MoveToCenter).move();
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+};
+e.prototype.canClearSick = function() {
+this.getComponent(l.MoveToCenter).move();
+mk.data.sendDataEvent(s.DataEventId.button_click, "生病icon");
+gData.adClearSickData.openPanel(s.ProductType.dw, this.configID);
+};
 i([ g({
 type: cc.Node,
 tooltip: "动物显示节点"
@@ -20656,7 +20750,11 @@ t.prototype.btnMake = function() {
 gData.gameData.nextMake.onEat();
 };
 t.prototype.setHarvest = function() {
-for (var t = this.pastureIcons.length, e = 0; e < t; e++) this.pastureIcons[e].data.state == a.PastureState.Growing && this.pastureIcons[e].countDown.riped();
+for (var t = this.pastureIcons.length, e = !1, o = 0; o < t; o++) if (this.pastureIcons[o].data.state == a.PastureState.Growing) {
+this.pastureIcons[o].countDown.riped(!1);
+e = !0;
+}
+e && gData.gameData.freshSendToServer(2);
 };
 t.prototype.canSpeedUp = function() {
 for (var t = !1, e = this.pastureIcons.length, o = 0; o < e; o++) if (this.pastureIcons[o].data.state == a.PastureState.Growing) {
@@ -20665,6 +20763,22 @@ break;
 }
 return t;
 };
+t.prototype.canHarvest = function() {
+for (var t = !1, e = this.pastureIcons.length, o = 0; o < e; o++) if (this.pastureIcons[o].data.state == a.PastureState.Ripe) {
+this.pastureIcons[o].canHarvest();
+t = !0;
+break;
+}
+return t;
+};
+t.prototype.canClearSick = function() {
+for (var t = !1, e = this.pastureIcons.length, o = 0; o < e; o++) if (this.pastureIcons[o].data.state == a.PastureState.Sick) {
+this.pastureIcons[o].canClearSick();
+t = !0;
+break;
+}
+return t;
+};
 return n([ r ], t);
 }();
 o.default = c;
@@ -25033,7 +25147,7 @@ this.anim_btn.getComponent(mk.component.setGray).setGray(!0);
 gData.sign.init_data = !1;
 };
 e.prototype.onClickClose = function() {
-mk.audio.playEffect("closeButton");
+mk.audio.playEffect("button");
 };
 i([ u({
 type: cc.ScrollView,
@@ -27769,7 +27883,7 @@ this.playOver();
 };
 e.prototype.onDestroy = function() {};
 e.prototype.onClickClose = function() {
-mk.audio.playEffect("closeButton");
+mk.audio.playEffect("button");
 };
 i([ y(cc.Node) ], e.prototype, "node_turn", void 0);
 i([ y(cc.Node) ], e.prototype, "node_items", void 0);

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631853901678,
-    "genTime": 1631853901678,
+    "buildTime": 1631867992431,
+    "genTime": 1631867992431,
     "genVersion": null
 }