渠道匹配

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)
                 {
-                    if (gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1] == "1") {
+                    if (gData.loginData.isMatched == 0 && gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1] == "1") {
                         this.isTouchBtn = false;
                         this.isCdOver = true;
                         mk.ui.openPanel('game/prefab/uiPanel/HarvestPanel');

assets/script/game/data/LoginData.ts

@@ -360,7 +360,7 @@ export class LoginData {
         mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_juliangwpp', `${this.userChannel}_${this.isMatched}`);
         if (isDoIdentify) {
             if (this.userChannel <= 5) {
-                if (this.popIdentifySwitch[this.userChannel - 1] == "1") {
+                if (this.isMatched == 0 && this.popIdentifySwitch[this.userChannel - 1] == "1") {
                     JsbSystem.ysdkInit();
                     JsbSystem.autologin();
                     mk.data.sendDataEvent(DataEventId.realName, `实名认证验证人数`);

assets/script/game/game/Game.ts

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

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) {
-                if(gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] == "1")
+                if(gData.loginData.isMatched == 0 && gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] == "1")
                 {
                     gData.adData.watchVideo(AdFun.addProductTimes, this.refreshMaxAdTimes);
                 }else{