Bladeren bron

修改配置读取规则

kaka 5 jaren geleden
bovenliggende
commit
846a849c3c

File diff suppressed because it is too large
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 4 - 3
assets/script/game/data/AdData.ts

@@ -181,10 +181,11 @@ export class AdData {
 
     /** 设置关闭红包弹出全屏插屏序列 */
     setFullInterShowStr() {
-        let fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr;
+        let fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(';');
         for (var i = 0; i < fullInterShowStrArr.length; i++) {
-            if (gData.gameData.adShowConfig.average_ecpm <= fullInterShowStrArr[i].ecpmmax) {
-                this.fullInterShowStr = fullInterShowStrArr[i].proStr;
+            let tempArr = fullInterShowStrArr[i].split(',');
+            if (gData.gameData.adShowConfig.average_ecpm <= tempArr[1]) {
+                this.fullInterShowStr = tempArr[2];
                 break;
             }
         }

BIN
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/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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


+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.0.2
+VERSION_NAME=1.2.1
 VERSION_CODE=2
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b6113813b876a1"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
-APP_CONFIG_CODE="1.1.2"
+APP_CONFIG_CODE="1.2.1"

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

@@ -1994,10 +1994,13 @@ ecpm_level: ""
 mk.http.sendData("updateADLog", o);
 };
 t.prototype.setFullInterShowStr = function() {
-for (var t = gData.gameData.configs.GlobalCfg.fullInterShowStrArr, e = 0; e < t.length; e++) if (gData.gameData.adShowConfig.average_ecpm <= t[e].ecpmmax) {
-this.fullInterShowStr = t[e].proStr;
+for (var t = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(";"), e = 0; e < t.length; e++) {
+var n = t[e].split(",");
+if (gData.gameData.adShowConfig.average_ecpm <= n[1]) {
+this.fullInterShowStr = n[2];
 break;
 }
+}
 };
 t.prototype.checkShowFullInter = function(t) {
 if ("1" == gData.gameData.configs.GlobalCfg.popFullInter) if (1 == t) gData.gameData.adShowConfig.average_ecpm <= gData.gameData.configs.GlobalCfg.popFullEcpmAfterCash && mk.ad.showInterAd(1); else if (2 == t && this.fullInterShowStr) {

+ 2 - 2
packages-hot-update/cfg.json

@@ -13,7 +13,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/"
     ],
-    "buildTime": 1628839155914,
-    "genTime": 1628839155914,
+    "buildTime": 1628841361337,
+    "genTime": 1628841361337,
     "genVersion": null
 }

File diff suppressed because it is too large
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.1.zip


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