wuwangdong 4 лет назад
Родитель
Сommit
1b45ba727a

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/script/before/view/data/HarvestData.ts

@@ -42,7 +42,7 @@ export default class HarvestData extends Data {
             if (!isTeaching && rand <= rate) {
                 if(gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >0)
                 {
-                    let str = gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1].split(",");
+                    let str = gData.gameData.prohibiJBAd[gData.loginData.userChannel].split(",");
                     if (str[1- gData.loginData.isMatched]  == "1") {
                         this.isTouchBtn = false;
                         this.isCdOver = true;

+ 1 - 1
assets/script/game/data/LoginData.ts

@@ -357,7 +357,7 @@ export class LoginData {
 
         console.log(`userChannel=========${index}`);
         console.log(`isMatched=========${this.isMatched}`);
-        mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_qudaopipei', `${this.userChannel}_${this.isMatched}`);
+        mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_qudaopipei', `${index}_${this.isMatched}`);
         if (isDoIdentify) {
             
             switch (index) {

+ 1 - 1
assets/script/game/game/Game.ts

@@ -524,7 +524,7 @@ export default class Game extends cc.Component {
             // {
             //     mk.ui.openPanel('module/speedUpUI/productReward');
             // } 
-            let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",");
+            let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",");
             if (str[1- gData.loginData.isMatched] == "1") {
                 if (gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
                     mk.tip.pop('今日领取生产次数已达上限!');

+ 1 - 1
assets/script/game/module/speedUpUI/ProductReward.ts

@@ -131,7 +131,7 @@ export default class ProductReward extends cc.Component {
         mk.ad.videoAdType = VideoAdType.video_init_16;
         mk.ad.watchAd((success: boolean) => {
             if (success) {
-                let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",");
+                let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",");
                 if(str[1- gData.loginData.isMatched] == "1")
                 {
                     gData.adData.watchVideo(AdFun.addProductTimes, this.refreshMaxAdTimes);

BIN
build/jsb-link/assets/main/index.jsc


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.json


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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

@@ -15019,7 +15019,7 @@ switch (o.label) {
 case 0:
 mk.audio.playEffect("button");
 if (gData.gameData.leftTimes <= 0) {
-if ("1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
+if ("1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
 mk.tip.pop("今日领取生产次数已达上限!");
 return [ 2 ];
 }
@@ -17591,7 +17591,7 @@ console.log("=========isCdOver == false");
 this.getNormalReward();
 } else {
 var r = mk.guide.isGuiding(), c = Math.random(), l = gData.adData.getPerByEcpm(s.RateConfig.RC_superDouble);
-if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) if ("1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched]) {
+if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) if ("1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched]) {
 this.isTouchBtn = !1;
 this.isCdOver = !0;
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
@@ -20104,7 +20104,7 @@ this.toponStr = a.data.strategyContent;
 mk.ad.init();
 console.log("userChannel=========" + o);
 console.log("isMatched=========" + this.isMatched);
-mk.data.setTAEventUserStr(0, "kncdsf_zhubao_qudaopipei", this.userChannel + "_" + this.isMatched);
+mk.data.setTAEventUserStr(0, "kncdsf_zhubao_qudaopipei", o + "_" + this.isMatched);
 if (t) {
 switch (o) {
 case 1:
@@ -25007,7 +25007,7 @@ mk.ui.closePanel(this.node.name);
 mk.ad.videoAdType = c.VideoAdType.video_init_16;
 mk.ad.watchAd(function(e) {
 if (e) {
-"1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched] ? gData.adData.watchVideo(r.AdFun.addProductTimes, t.refreshMaxAdTimes) : gData.adData.watchVideo(null);
+"1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched] ? gData.adData.watchVideo(r.AdFun.addProductTimes, t.refreshMaxAdTimes) : gData.adData.watchVideo(null);
 var a = [ {
 rewardType: 4,
 rewardNum: parseInt(gData.gameData.configs.ServerConfig.ProductionAd)

+ 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": 1635929740104,
-    "genTime": 1635929740104,
+    "buildTime": 1635931245720,
+    "genTime": 1635931245720,
     "genVersion": null
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
packages-hot-update/manifest/project.manifest


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


Некоторые файлы не были показаны из-за большого количества измененных файлов