[FC][1.1.4]重新发布

assets/script/before/view/ui/ADUnlockPanel.ts

@@ -1,3 +1,4 @@
+import { AdFun } from "../../../game/data/AdData";
 import { BannerAdType, VideoAdType } from "../../../game/data/GameData";
 
 /** 解锁农田界面 */
@@ -12,7 +13,7 @@ export default class ADUnlockPanel extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 mk.ui.closePanel(this.node.name);
-                gData.adData.watchVideo(null);
+                gData.adData.watchVideo(AdFun.farmSpeedUp);
                 gData.adUnlockData.unlockFarm();
 
                 gData.gameData.popTableScreenADLogic(16);

assets/script/game/data/GameData.ts

@@ -1012,7 +1012,7 @@ export class GameData {
     }
 
     public async updateNewTaskProgress(isNeedRefresh = false) {
-         
+
         //[FC][]飞红包关闭 也刷新订单
         // if (gData.gameData.funOpenData[4] == "0") {
         //     return false;

assets/script/mk/system/JsbSystem.ts

@@ -229,7 +229,7 @@ export default class JsbSystem {
                 selection.removeAllRanges();
                 selection.addRange(originalRange);
             }
-
+           
             return success;
         }
     }

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

@@ -39,10 +39,13 @@
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/agc/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/libs/topon/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src" isTestSource="false" />

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

@@ -417,7 +417,7 @@ return i > 3 && r && Object.defineProperty(e, a, r), r;
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var r = t("../../../game/data/GameData"), c = cc._decorator, s = c.ccclass, l = (c.property, 
+var r = t("../../../game/data/AdData"), c = t("../../../game/data/GameData"), s = cc._decorator, l = s.ccclass, p = (s.property, 
 function(t) {
 n(e, t);
 function e() {
@@ -426,12 +426,12 @@ return null !== t && t.apply(this, arguments) || this;
 e.prototype.clickWatchVideo = function() {
 var t = this;
 mk.audio.playEffect("button");
-mk.ad.videoAdType = r.VideoAdType.video_init_11;
+mk.ad.videoAdType = c.VideoAdType.video_init_11;
 mk.ad.watchAd(function(e) {
 mk.console.log("watchAD:" + e);
 if (e) {
 mk.ui.closePanel(t.node.name);
-gData.adData.watchVideo(null);
+gData.adData.watchVideo(r.AdFun.farmSpeedUp);
 gData.adUnlockData.unlockFarm();
 gData.gameData.popTableScreenADLogic(16);
 }
@@ -444,11 +444,12 @@ mk.ad.showNative();
 e.prototype.onDisable = function() {
 mk.ad.destroyNativeAd();
 };
-return i([ s ], e);
+return i([ l ], e);
 }(cc.Component));
-a.default = l;
+a.default = p;
 cc._RF.pop();
 }, {
+"../../../game/data/AdData": "AdData",
 "../../../game/data/GameData": "GameData"
 } ],
 ATAndroidBannerJS: [ function(t, e) {
@@ -30562,14 +30563,7 @@ e.prototype.start = function() {
 this.airshipAni.node.active = !1;
 };
 e.prototype.update = function(t) {
-if (gData.gameData.configs.ServerConfig) {
-console.log("gData.gameData.configs.ServerConfig.FlyswitchECPM", gData.gameData.configs.ServerConfig.FlyswitchECPM);
-if (gData.gameData.adShowConfig.average_ecpm < gData.gameData.configs.ServerConfig.FlyswitchECPM) {
-this.airshipAni.node.active = !1;
-return;
-}
-}
-if (this.showRedNum < 1) {
+if (gData.gameData.configs.ServerConfig && gData.gameData.adShowConfig.average_ecpm < gData.gameData.configs.ServerConfig.FlyswitchECPM) this.airshipAni.node.active = !1; else if (this.showRedNum < 1) {
 this.countDown += t;
 if (this.countDown >= 30) {
 this.countDown = 0;

packages-hot-update/cfg.json

@@ -13,7 +13,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote1/"
     ],
-    "buildTime": 1644563234318,
-    "genTime": 1644563234318,
+    "buildTime": 1644572132226,
+    "genTime": 1644572132226,
     "genVersion": null
 }