wuwangdong il y a 4 ans
Parent
commit
122366dab6
42 fichiers modifiés avec 758 ajouts et 317 suppressions
  1. 334 123
      assets/resources/game/prefab/game.prefab
  2. BIN
      assets/resources/game/texture/title.png
  3. 36 0
      assets/resources/game/texture/title.png.meta
  4. 0 0
      assets/resources/module/login/hot/project.manifest
  5. 1 1
      assets/resources/module/login/hot/version.manifest
  6. 5 2
      assets/script/before/view/data/HarvestData.ts
  7. 5 2
      assets/script/before/view/ui/HarvestPanel.ts
  8. 5 4
      assets/script/game/data/AdData.ts
  9. 7 2
      assets/script/game/data/GameData.ts
  10. 1 1
      assets/script/game/data/HttpData.ts
  11. 2 3
      assets/script/game/data/module/BlessingBagData.ts
  12. 2 3
      assets/script/game/data/module/GradeRewardData.ts
  13. 3 0
      assets/script/game/data/module/MoreGameData.ts
  14. 0 10
      assets/script/game/data/module/SignData.ts
  15. 38 6
      assets/script/game/game/Game.ts
  16. 50 24
      assets/script/game/game/HorseRace.ts
  17. 1 1
      assets/script/game/game/TouchListener.ts
  18. 5 2
      assets/script/game/module/blessingBag/BlessingBag.ts
  19. 5 2
      assets/script/game/module/gradeReward/GradeReward.ts
  20. 5 2
      assets/script/game/module/newCashUI/WalletCashOut.ts
  21. 7 0
      assets/script/game/module/newNotice/NewNotice.ts
  22. 15 3
      assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts
  23. 1 1
      assets/script/mk/system/JsbSystem.ts
  24. 1 1
      assets/script/mk/utils/LogUtil.ts
  25. BIN
      build/jsb-link/assets/main/index.jsc
  26. 0 0
      build/jsb-link/assets/resources/config.json
  27. 1 0
      build/jsb-link/assets/resources/import/16/166ce504-0ec2-447c-90a8-7f02d93337eb.json
  28. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  29. 1 0
      build/jsb-link/assets/resources/import/b4/b4eaabe5-d038-4b48-a048-e13ac16399de.json
  30. BIN
      build/jsb-link/assets/resources/native/16/166ce504-0ec2-447c-90a8-7f02d93337eb.png
  31. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  32. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  33. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  34. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  35. 68 68
      build/jsb-link/js backups (useful for debugging)/cocos2d-jsb.js
  36. 150 47
      build/jsb-link/js backups (useful for debugging)/main.index.js
  37. BIN
      build/jsb-link/src/cocos2d-jsb.jsc
  38. 4 4
      packages-hot-update/cfg.json
  39. 0 0
      packages-hot-update/manifest/project.manifest
  40. 1 1
      packages-hot-update/manifest/version.manifest
  41. BIN
      packages-hot-update/versions/ver_1_0.7.zip
  42. 1 1
      settings/project.json

Fichier diff supprimé car celui-ci est trop grand
+ 334 - 123
assets/resources/game/prefab/game.prefab


BIN
assets/resources/game/texture/title.png


+ 36 - 0
assets/resources/game/texture/title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "166ce504-0ec2-447c-90a8-7f02d93337eb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 465,
+  "height": 103,
+  "platformSettings": {},
+  "subMetas": {
+    "title": {
+      "ver": "1.0.4",
+      "uuid": "b4eaabe5-d038-4b48-a048-e13ac16399de",
+      "rawTextureUuid": "166ce504-0ec2-447c-90a8-7f02d93337eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 465,
+      "height": 103,
+      "rawWidth": 465,
+      "rawHeight": 103,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

+ 5 - 2
assets/script/before/view/data/HarvestData.ts

@@ -124,8 +124,11 @@ export default class HarvestData extends Data {
         let isTeaching = mk.guide.isGuiding();
         if(!isTeaching)
         {
-            gData.adData.checkShowFullInter(4);
-            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+            let pop =  gData.adData.checkShowFullInter(4);
+            if(pop){
+                gData.moreGame.openType = 0;
+                mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+            }
         }
     }
 

+ 5 - 2
assets/script/before/view/ui/HarvestPanel.ts

@@ -70,8 +70,11 @@ export default class HarvestPanel extends cc.Component {
         //mk.ad.showBanner(BannerAdType.banner_click_6);
         mk.ad.showNative();
 
-        gData.adData.checkShowFullInter(4);
-        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 0;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+        }
     }
 
     onDisable() {

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

@@ -287,7 +287,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_fullScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 if (this.FullScreenAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
                     return;
@@ -298,7 +298,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 let delayArr = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min = parseFloat(delayArr[0]);
@@ -313,7 +313,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 let delayArr1 = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min1 = parseFloat(delayArr1[0]);
@@ -331,12 +331,13 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
 
                 gData.moreGame.popNewOpenRedBag();
                 break;
         }
+        return pop;
     }
 
     /** 弹出插屏 */

+ 7 - 2
assets/script/game/data/GameData.ts

@@ -118,6 +118,8 @@ export class GameData {
     public popTipCallBack: Function = null;
 
     public orderAinFinishNum = 0;
+
+    public welfareOpenLimit = 0;
     /**
      * 初始化游戏数据:网络配置信息,用户信息
      * @returns 
@@ -181,6 +183,7 @@ export class GameData {
         // console.log('config  ', data);
         this.configs = data;
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
+        
         //从服务器解析配置
         this.setProductMapFromJson();
 
@@ -196,6 +199,8 @@ export class GameData {
         gData.gameData.RawInsectArr = this.configs.ServerConfig.RawInsect.split(',');
         //富翁银行
         gData.safeDepositBoxData.richBankConfig = this.configs.BankTask;
+
+        gData.gameData.welfareOpenLimit = parseInt(this.configs.ServerConfig.welfareOpen);
     }
 
     /**
@@ -2204,8 +2209,8 @@ export enum DataEventId {
     cashLimit = "cashLimit",
     /**互推红包弹出位置 */
     htRedBag_scene = "htRedBag_scene",
-    /**互推红包弹出和领取次数 */
-    htRedBag_second = "htRedBag_second"
+    /**互推红包领取次数*/
+    htRedBag_eject = "htRedBag_eject"
 }
 
 

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

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 1;
 
     public getServerUrl(): string {
         switch (this.serverType) {

+ 2 - 3
assets/script/game/data/module/BlessingBagData.ts

@@ -110,14 +110,13 @@ export class BlessingBagData extends Data {
         mk.console.logSingle("'welFare/welFareCash", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
-            if(response.errcode == 405)
-            {
+            if (response.errcode == 405) {
                 mk.tip.pop("今日提现额度已到上限,请明天再提现");
                 mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
             }
             return null;
         }
-        
+
         // gData.cashPro.init_success = true;
         this.isPlayAniUpdate = false;
         this.videoRbData = response.data.userWelFareTaskInfo;

+ 2 - 3
assets/script/game/data/module/GradeRewardData.ts

@@ -26,8 +26,7 @@ export class GradeRewardData extends Data {
         mk.console.logSingle("农场等级提现数据=>", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
-            if(response.errcode == 405)
-            {
+            if (response.errcode == 405) {
                 mk.tip.pop("今日提现额度已到上限,请明天再提现");
                 mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
             }
@@ -41,7 +40,7 @@ export class GradeRewardData extends Data {
 
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
-    
+
         gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
         mk.ui.openPanel('module/newNotice/newNotice');
         // gData.cashPro.cashPro_money = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;

+ 3 - 0
assets/script/game/data/module/MoreGameData.ts

@@ -28,6 +28,9 @@ export class MoreGameData extends Data {
 
     init_newOpenRedBag = false;
 
+    //哪个位置打开互推红包界面
+    openType = -1;
+
     /** 测试数据 */
     private testData = {
         "normal": [

+ 0 - 10
assets/script/game/data/module/SignData.ts

@@ -151,20 +151,10 @@ export class SignData extends Data {
                 return;
             }
 
-            if (response.CashMode == 0) {//星云打款
-            } else if (response.CashMode == 1) {//公众号打款
-            }
-
             gData.gameData.addCashOutTimes();
-
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
-
-            // mk.ui.closePanel('sign');
-            // gData.cashPro.cashPro_money = rewardNum;
-            // gData.cashPro.init_success = true;
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);
-
             gData.safeDepositBoxData.updateQipao();
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金

+ 38 - 6
assets/script/game/game/Game.ts

@@ -123,6 +123,10 @@ export default class Game extends cc.Component {
     @property({ displayName: '额外订单背景节点', type: cc.Node })
     node_bgUi: cc.Node = null;
 
+    @property({ displayName: '订单显示', type: cc.Node })
+    node_crop: cc.Node[] = [];
+    @property({ displayName: '订单红包', type: cc.Node })
+    node_orderHbIcon: cc.Node = null;
 
     posY = 0;
     /** 是否开始增加次数倒计时 */
@@ -471,7 +475,13 @@ export default class Game extends cc.Component {
 
     /** 点击福利 */
     public onClickFuli() {
-        mk.data.sendDataEvent(DataEventId.button_click, "福利icon");
+        if(gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit)
+        {
+            mk.ui.openPanel('module/blessingBag/blessingBag');
+            mk.data.sendDataEvent(DataEventId.button_click, "福利icon");
+        }else{
+            mk.tip.pop(`订单提现${gData.gameData.welfareOpenLimit}次后开启`);
+        }
     }
 
     /** 点击漂浮红包 */
@@ -969,7 +979,7 @@ export default class Game extends cc.Component {
 
     private orderPicIdArray = [];
     private isGray = true;
-    public async initOrderUI() {
+    public async initOrderUI(init = true) {
         this.orderPicIdArray = [];
         this.isGray = true;
         let productJson = gData.gameData.configs.Product;
@@ -1047,7 +1057,6 @@ export default class Game extends cc.Component {
     }
 
     public async getOrderReward() {
-
         if (cc.sys.isNative) {
             if (!gData.loginData.isAuth) {
                 // JsbSystem.WxAuth();
@@ -1080,23 +1089,48 @@ export default class Game extends cc.Component {
         gData.cashPro.callBack = this.getRewardCallBack.bind(this);
         gData.receiptNotice.receip_rmb = addMoney;
         mk.ui.openPanel('module/newNotice/newNotice');
-        
+
+        this.node_crop.forEach((v)=>{
+            v.active = false;
+        })
+        this.node_orderHbIcon.active = false;
+        this.node_getOrderReward.node.active = false;
     }
 
+    //停止农民产红包币
+    isStopFarm = false;
     public getRewardCallBack()
     {
         this.node_extraOrderUi.active = true;
         this.node_bgUi.scale = 0;
         cc.tween(this.node_bgUi).to(0.4, {scale: 1.4}).start();
+
+        if(gData.gameData.funOpenData[1] == '1')
+        {
+            gData.gameData.funOpenData[1] = "0";
+            this.isStopFarm = true;
+        }
     }
 
     public showRefreshLogic()
     {
+        this.node_crop.forEach((v)=>{
+            v.active = true;
+        })
+        this.node_orderHbIcon.active = true;
+        this.node_getOrderReward.node.active = true;
+
         this.initOrderUI();
         this.showTips();
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
         gData.safeDepositBoxData.updateQipao();
+
+        if(this.isStopFarm)
+        {
+            this.isStopFarm = false;
+            gData.gameData.funOpenData[1] = '1';
+        }
     }
 
     showTips()
@@ -1222,13 +1256,11 @@ export default class Game extends cc.Component {
 
     public async updataOrderProgress(id) {
 
-        console.log("-=-=-=-=-=-=-=1");
         let data = { "id": id };
         let response = await mk.http.sendData('orderTask/updateUserOrderTaskInfo', data);
         if (response.errcode != 0) {
             return null;
         }
-        console.log("-=-=-=-=-=-=-=2");
 
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
     }

+ 50 - 24
assets/script/game/game/HorseRace.ts

@@ -28,8 +28,11 @@ export default class HorseRace extends cc.Component {
     node_des: cc.Node = null;
     @property({ displayName: 'hide节点', type: cc.Node })
     node_hide: cc.Node = null;
-    @property({ displayName: '回调', type: cc.Component.EventHandler})
+    @property({ displayName: '回调', type: cc.Component.EventHandler })
     callBack: cc.Component.EventHandler = null;
+    
+    @property({ displayName: '文字节点', type: cc.Node })
+    node_describ: cc.Node = null;
 
     private node_icon_1: cc.Node = null;
     private node_icon_2: cc.Node = null;
@@ -65,15 +68,22 @@ export default class HorseRace extends cc.Component {
         this.realyPicture = productJson[id.Id - 1].picture;
     }
 
-    sss = 0;
+    sss = 6;
+    isDoAct = false;
     update(dt) {
+ 
         if (this.delay <= 0 && !this.isFinish) {
             //节点1
+            if(!this.isDoAct && this.node_describ)
+            {
+                this.isDoAct = true;
+                cc.tween(this.node_describ).to(0.3,{scale: 1.4}).to(0.3, {scale: 1}).start();
+            }
             this.node_icon_1.setPosition(new cc.Vec2(0, this.node_icon_1.position.y - this.speed));
             if (this.node_icon_1.position.y <= - this.distance) {
                 ++this.times;
                 if (this.times > this.maxShowTimes) {
-                    if (this.speed != 3) {
+                    if (this.speed != 4) {
                         // let s = ((this.refreshTimes - (this.times - this.maxShowTimes)) / this.refreshTimes);
                         // if(s > 1){
                         //     s = 1;
@@ -82,10 +92,10 @@ export default class HorseRace extends cc.Component {
                         // this.speed = Math.ceil(this.speed);
 
                         ++this.sss;
-                        let aa = 2 + this.sss * 0.1;
+                        let aa = 2 + this.sss * 0.4;
                         this.speed -= aa;
-                        if (this.speed < 3) {
-                            this.speed = 2;
+                        if (this.speed < 4) {
+                            this.speed = 4;
                             ++this.slowSpeedRefreshTimes;
                         }
                     } else {
@@ -106,7 +116,7 @@ export default class HorseRace extends cc.Component {
             this.node_icon_2.setPosition(new cc.Vec2(0, this.node_icon_2.position.y - this.speed));
             if (this.node_icon_2.position.y <= - this.distance) {
                 this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
-                
+
                 if (this.slowSpeedRefreshTimes >= 1) {
                     this.isFinish = true;
                     this.node_icon_1.setPosition(0, 0);
@@ -135,10 +145,8 @@ export default class HorseRace extends cc.Component {
                 this.randArr.push(this.curRand);
             }
             this.curRand = rand;
-            if(this.index == 0)
-            {
+            if (this.index == 0) {
                 ++this.tests;
-                console.log(`=====${this.tests}====${rand}`);
             }
             if (index == 1) {
                 this.sp_icon_1.spriteFrame = await mk.loader.load(this.iconPath + picId, cc.SpriteFrame);
@@ -148,26 +156,42 @@ export default class HorseRace extends cc.Component {
         }
     }
 
-    public doFlyAni()
-    {
-        if(this.node_hide ){
-            this.node_hide.active = false
+    public doFlyAni() {
+        if (this.node_hide) {
+            cc.tween(this.node_hide).delay(0.3).call(()=>{
+                this.node_hide.active = false
+            }).start();   
         }
-        
-        let node = cc.instantiate(this.sp_icon_1.node);
-        node.setScale(0.32);
-        node.parent = this.node_fly;
         let worldPos = this.sp_icon_1.node.parent.convertToWorldSpaceAR(cc.Vec2.ZERO);
         let pos = this.node_fly.convertToNodeSpaceAR(worldPos);
-        node.setPosition(pos);
 
-        worldPos = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition())
-        pos = this.node_fly.convertToNodeSpaceAR(worldPos);
+        let worldPos2 = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition())
+        let pos2 = this.node_fly.convertToNodeSpaceAR(worldPos2);
+
+        for (let i = 0; i != 4; ++i) {
+            let node = cc.instantiate(this.sp_icon_1.node);
+            node.setScale(0.32);
+            node.parent = this.node_fly;
+            node.angle = mk.math.random(-45, 45, false);
+            let dir = cc.v2(mk.math.random(-1, 1, false), mk.math.random(-1, 1, false));
+            dir = dir.normalize();
+            let deltaInit = cc.v2(mk.math.random(10, 100, false) * dir.x, mk.math.random(10, 100, false) * dir.y);
+            node.setPosition(pos);
+            let mPos = pos.add(deltaInit);
+            cc.tween(node).to(0.2, {position: cc.v3(mPos)}).call(()=>{
+                this.moveFly(node, i, pos2);
+            }).start();
+            
+        }
+    }
 
-        cc.tween(node).to(0.6, {position: cc.v3(pos)}).removeSelf().call(()=>{
-            this.callBack && this.callBack.emit(null);
+    moveFly(node: cc.Node, i, desPos)
+    {
+        cc.tween(node).to(0.6 + i * 0.1, { position: cc.v3(desPos) }).removeSelf().call(() => {
+            if (i == 0) {
+                this.callBack && this.callBack.emit(null);
+            }
         }).start();
-
     }
 
     onDisable() {
@@ -177,5 +201,7 @@ export default class HorseRace extends cc.Component {
         this.curRand = -1
         this.times = 0;
         this.speed = this.curSpeed;
+        this.sss = 6;
+        this.isDoAct = false;
     }
 }

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

@@ -22,7 +22,7 @@ const { ccclass, property } = cc._decorator;
             gData.gameData.isTouchScreen = true;
         }  
         
-        //mk.ui.openPanel('module/safeDepositBox/SafeDepositBox');
+        //mk.ui.openPanel('module/newNotice/newNotice');
     }
 
  }

+ 5 - 2
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -291,7 +291,10 @@ export default class BlessingBag extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
-        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 2;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
+        }
     }
 }

+ 5 - 2
assets/script/game/module/gradeReward/GradeReward.ts

@@ -190,7 +190,10 @@ export class GradeReward extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
-        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭农场等级奖励界面");
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 3;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭农场等级奖励界面");
+        }
     }
 }

+ 5 - 2
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -321,7 +321,10 @@ export default class WalletCashOut extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
-        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭提现界面");
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 1;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭提现界面");
+        }
     }
 }

+ 7 - 0
assets/script/game/module/newNotice/NewNotice.ts

@@ -16,6 +16,11 @@ export default class NewNotice extends cc.Component {
         //mk.audio.playEffect("receiptNotice");
     }
 
+    onEnable()
+    {
+        mk.ad.showNative();
+    }
+
     update(dt) {
         if (gData.receiptNotice.init_style) {
             gData.receiptNotice.init_style = false;
@@ -32,5 +37,7 @@ export default class NewNotice extends cc.Component {
         mk.audio.playEffect('button');
         gData.cashPro.openCashPro(gData.receiptNotice.receip_rmb);
         gData.cashPro.init_success = true;
+
+        mk.ad.destroyNativeAd();
     }
 }

+ 15 - 3
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -52,8 +52,6 @@ export default class NewOpenRedBag extends cc.Component {
 
     showElectUI() {
         this.sendRecommendList();
-
-        mk.data.sendDataEvent(DataEventId.htRedBag_second, "互推红包弹出次数");
     }
 
     async sendRecommendList() {
@@ -173,7 +171,21 @@ export default class NewOpenRedBag extends cc.Component {
         mk.ui.closePanel(this.name);
         if (this.sp_icon.node.active) {
             this.creatorDownLoadTask();
-            mk.data.sendDataEvent(DataEventId.htRedBag_second, "互推红包领取次数");
+            switch (gData.moreGame.openType) {
+                case 0:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "点击可收获-领取");
+                    break;
+                case 1:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭提现界面-领取");
+                    break;
+                case 2:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭福利界面-领取");
+                    break;
+                case 3:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭农场等级奖励界面-领取");
+                    break;
+            }
+            gData.moreGame.openType = -1;
         }
         else {
             mk.ad.watchAd(async (success: boolean) => {

+ 1 - 1
assets/script/mk/system/JsbSystem.ts

@@ -151,7 +151,7 @@ export default class JsbSystem {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
             gData.appData.appId = "wxd98fe9d52af10e59";
-            gData.appData.version = "12.1.7";
+            gData.appData.version = "1.1.8";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

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


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 0
build/jsb-link/assets/resources/import/16/166ce504-0ec2-447c-90a8-7f02d93337eb.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


+ 1 - 0
build/jsb-link/assets/resources/import/b4/b4eaabe5-d038-4b48-a048-e13ac16399de.json

@@ -0,0 +1 @@
+[1,["16bOUEDsJEfJCofwLZMzfr"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title","rect":[0,0,465,103],"offset":[0,0],"originalSize":[465,103],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

BIN
build/jsb-link/assets/resources/native/16/166ce504-0ec2-447c-90a8-7f02d93337eb.png


+ 1 - 1
build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

Fichier diff supprimé car celui-ci est trop grand
+ 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="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
 PACKAGE_NAME=com.aries.kncdsf.mz
-VERSION_NAME=1.1.7
+VERSION_NAME=1.1.8
 VERSION_CODE=1000
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="12.1.7"
+APP_CONFIG_CODE="1.1.8"

+ 68 - 68
build/jsb-link/js backups (useful for debugging)/cocos2d-jsb.js

@@ -36487,16 +36487,16 @@ return e.join("");
 253: [ (function(t, e, i) {
 "use strict";
 i.__esModule = !0;
-i.default = O;
+i.default = L;
 i.unpackJSONs = function(t, e) {
-if (t[0] < f) throw new Error(cc.debug.getError(5304, t[0]));
-P(t, !0, e);
-R(t);
-for (var i = new V(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[g], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
+if (t[0] < 1) throw new Error(cc.debug.getError(5304, t[0]));
+D(t, !0, e);
+P(t);
+for (var i = new O(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[v], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
 return a;
 };
 i.packCustomObjData = function(t, e, i) {
-return [ f, d, d, [ t ], d, i ? [ e, -1 ] : [ e ], [ 0 ], d, [], [], [] ];
+return [ 1, f, f, [ t ], f, i ? [ e, -1 ] : [ e ], [ 0 ], f, [], [], [] ];
 };
 i.hasNativeDep = function(t) {
 var e = t[5], i = e[e.length - 1];
@@ -36514,21 +36514,21 @@ return t && t.__esModule ? t : {
 default: t
 };
 }
-var f = 1, d = 0, p = [ r.default, s.default, o.default, u.default, a.default, c.default, l.default, h.default ];
-function m(t, e) {
+var f = 0, d = [ r.default, s.default, o.default, u.default, a.default, c.default, l.default, h.default ];
+function p(t, e) {
 t.x = e[1];
 t.y = e[2];
 t.z = e[3];
 t.w = e[4];
 }
-var y = [ function(t, e) {
+var m = [ function(t, e) {
 t.x = e[1];
 t.y = e[2];
 }, function(t, e) {
 t.x = e[1];
 t.y = e[2];
 t.z = e[3];
-}, m, m, function(t, e) {
+}, p, p, function(t, e) {
 t._val = e[1];
 }, function(t, e) {
 t.width = e[1];
@@ -36540,7 +36540,7 @@ t.width = e[3];
 t.height = e[4];
 }, function(t, e) {
 h.default.fromArray(t, e, 1);
-} ], v = 0, g = 5, b = (function() {
+} ], y = 0, v = 5, g = (function() {
 function t() {
 this.uuidObjList = null;
 this.uuidPropList = null;
@@ -36564,13 +36564,13 @@ this.uuidList.push(i);
 };
 return t;
 })();
-b.pool = new n.default.Pool(function(t) {
+g.pool = new n.default.Pool(function(t) {
 t.reset();
 }, 5);
-b.pool.get = function() {
-return this._get() || new b();
+g.pool.get = function() {
+return this._get() || new g();
 };
-function C(t, e, i) {
+function b(t, e, i) {
 for (var n = t.length - 1, r = 0, s = 3 * t[n]; r < s; r += 3) {
 var o = t[r], a = e[t[r + 2]], c = t[r + 1];
 c >= 0 ? o[i[c]] = a : o[~c] = a;
@@ -36580,127 +36580,127 @@ var l = e[t[r]], u = e[t[r + 2]], h = t[r + 1];
 h >= 0 ? l[i[h]] = u : l[~h] = u;
 }
 }
-function x(t, e) {
+function C(t, e) {
 for (var i = t[4][e[0]], n = i[0], r = new (0, n[0])(), s = n[1], o = n[2], a = i[i.length - 1], c = 1; c < a; ++c) r[s[i[c]]] = e[c];
 for (;c < e.length; ++c) {
 var l = s[i[c]], u = n[i[c] + o];
-(0, M[u])(t, r, l, e[c]);
+(0, E[u])(t, r, l, e[c]);
 }
 return r;
 }
-function A(t, e, i) {
+function x(t, e, i) {
 var r = new e();
 r._deserialize ? r._deserialize(i, t[0]) : cc.errorID(5303, n.default.getClassName(e));
 return r;
 }
-function S(t, e, i, n) {
+function A(t, e, i, n) {
 n >= 0 ? e[i] = t[5][n] : t[7][3 * ~n] = e;
 }
-function T(t) {
+function S(t) {
 return function(e, i, n, r) {
 i[n] = r;
 for (var s = 0; s < r.length; ++s) t(e, r, s, r[s]);
 };
 }
-function w(t, e, i, n) {
+function T(t, e, i, n) {
 e[i] = null;
 t[8][n] = e;
 }
-function E(t, e, i, n) {
-e[i] = x(t, n);
+function w(t, e, i, n) {
+e[i] = C(t, n);
 }
-var M = new Array(13);
-M[0] = function(t, e, i, n) {
+var E = new Array(13);
+E[0] = function(t, e, i, n) {
 e[i] = n;
 };
-M[1] = S;
-M[2] = T(S);
-M[3] = T(w);
-M[4] = E;
-M[5] = function(t, e, i, n) {
-y[n[0]](e[i], n);
+E[1] = A;
+E[2] = S(A);
+E[3] = S(T);
+E[4] = w;
+E[5] = function(t, e, i, n) {
+m[n[0]](e[i], n);
 };
-M[6] = w;
-M[7] = function(t, e, i, n) {
+E[6] = T;
+E[7] = function(t, e, i, n) {
 e[i].set(n);
 };
-M[8] = function(t, e, i, n) {
-var r = new p[n[0]]();
-y[n[0]](r, n);
+E[8] = function(t, e, i, n) {
+var r = new d[n[0]]();
+m[n[0]](r, n);
 e[i] = r;
 };
-M[9] = T(E);
-M[10] = function(t, e, i, n) {
+E[9] = S(w);
+E[10] = function(t, e, i, n) {
 var r = t[3][n[0]];
-e[i] = A(t, r, n[1]);
+e[i] = x(t, r, n[1]);
 };
-M[11] = function(t, e, i, n) {
+E[11] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 1; s < n.length; s += 3) {
 var o = n[s], a = n[s + 1], c = n[s + 2];
-(0, M[a])(t, r, o, c);
+(0, E[a])(t, r, o, c);
 }
 };
-M[12] = function(t, e, i, n) {
+E[12] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 0; s < r.length; ++s) {
 var o = r[s], a = n[s + 1];
-0 !== a && (0, M[a])(t, r, s, o);
+0 !== a && (0, E[a])(t, r, s, o);
 }
 };
-function B(t) {
-var e = t[5], i = t[6], n = i === d ? 0 : i.length, r = e[e.length - 1], s = e.length - n;
+function M(t) {
+var e = t[5], i = t[6], n = 0 === i ? 0 : i.length, r = e[e.length - 1], s = e.length - n;
 if ("number" != typeof r) r = 0; else {
 r < 0 && (r = ~r);
 --s;
 }
-for (var o = 0; o < s; ++o) e[o] = x(t, e[o]);
+for (var o = 0; o < s; ++o) e[o] = C(t, e[o]);
 for (var a = t[3], c = 0; c < n; ++c, ++o) {
 var l = i[c], u = e[o];
 if (l >= 0) {
 var h = a[l];
-e[o] = A(t, h, u);
-} else (0, M[l = ~l])(t, e, o, u);
+e[o] = x(t, h, u);
+} else (0, E[l = ~l])(t, e, o, u);
 }
 return r;
 }
-function I(t, e) {
-t || O.reportMissingClass(e);
+function B(t, e) {
+t || L.reportMissingClass(e);
 return Object;
 }
-function D(t, e, i, n, r, s) {
+function I(t, e, i, n, r, s) {
 var o = t(e);
 if (!o) {
 if (r) {
 i[n] = (function(e, i, n) {
 return function() {
-var r = t(n) || I(s, n);
+var r = t(n) || B(s, n);
 e[i] = r;
 return new r();
 };
 })(i, n, e);
 return;
 }
-o = I(s, e);
+o = B(s, e);
 }
 i[n] = o;
 }
-function P(t, e, i) {
+function D(t, e, i) {
 for (var r = i || n.default._getClassById, s = t[3], o = 0; o < s.length; ++o) {
 var a = s[o];
-"string" != typeof a ? D(r, a[0], a, v, e, i) : D(r, a, s, o, e, i);
+"string" != typeof a ? I(r, a[0], a, y, e, i) : I(r, a, s, o, e, i);
 }
 }
-function R(t) {
+function P(t) {
 var e = t[4];
 if (e) for (var i = t[3], n = 0; n < e.length; ++n) {
 var r = e[n];
 r[0] = i[r[0]];
 }
 }
-function L(t) {
+function R(t) {
 for (var e = t[5], i = t[2], n = t[1], r = t[8], s = t[9], o = t[10], a = 0; a < r.length; ++a) {
 var c = r[a];
 "number" == typeof c && (r[a] = e[c]);
@@ -36713,34 +36713,34 @@ var u = o[a];
 "number" == typeof u && (o[a] = n[u]);
 }
 }
-function O(t, e, i) {
+function L(t, e, i) {
 "string" == typeof t && (t = JSON.parse(t));
 var n = !e;
-(e = e || b.pool.get()).init(t);
+(e = e || g.pool.get()).init(t);
 i = i || {};
 var r = t[0], s = !1;
 if ("object" == typeof r) {
 s = r.preprocessed;
 r = r.version;
 }
-if (r < f) throw new Error(cc.debug.getError(5304, r));
+if (r < 1) throw new Error(cc.debug.getError(5304, r));
 i._version = r;
 i.result = e;
 t[0] = i;
 if (!s) {
-P(t, !1, i.classFinder);
-R(t);
+D(t, !1, i.classFinder);
+P(t);
 }
 cc.game._isCloning = !0;
-var o = t[5], a = B(t);
+var o = t[5], a = M(t);
 cc.game._isCloning = !1;
-t[7] && C(t[7], o, t[2]);
-L(t);
-n && b.pool.put(e);
+t[7] && b(t[7], o, t[2]);
+R(t);
+n && g.pool.put(e);
 return o[a];
 }
-O.Details = b;
-var V = function(t) {
+L.Details = g;
+var O = function(t) {
 this.preprocessed = !0;
 this.version = t;
 };

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

@@ -3009,41 +3009,42 @@ this.ecpmLevel = a;
 };
 t.prototype.checkShowFullInter = function(t, e) {
 void 0 === e && (e = null);
-var a = 0;
+var a = 0, o = !0;
 switch (t) {
 case 1:
 a = this.getPerByEcpm(r.RC_fullScreen);
-if (!(Math.random() < a)) return;
+if (!(o = Math.random() < a)) return o;
 if (-1 == this.FullScreenAdArr.indexOf(this.ecpmLevel.toString())) return;
 mk.ad.showInterAd(1, e);
 break;
 
 case 2:
 a = this.getPerByEcpm(r.RC_tableScreen);
-if (!(Math.random() < a)) return;
-var o = gData.gameData.configs.ServerConfig.AdDelay.split(","), n = parseFloat(o[0]), i = 1e3 * (n + (parseFloat(o[1]) - n) * Math.random());
+if (!(o = Math.random() < a)) return o;
+var n = gData.gameData.configs.ServerConfig.AdDelay.split(","), i = parseFloat(n[0]), s = 1e3 * (i + (parseFloat(n[1]) - i) * Math.random());
 setTimeout(function() {
 mk.ad.showInterAd(2, e);
-}, i);
+}, s);
 break;
 
 case 3:
 a = this.getPerByEcpm(r.RC_tableScreen);
-if (!(Math.random() < a)) return;
-var s = gData.gameData.configs.ServerConfig.AdDelay.split(","), c = parseFloat(s[0]), l = parseFloat(s[1]), p = 1e3 * (c + (l - c) * Math.random()), u = 1e3 * (c + (l - c) * Math.random());
+if (!(o = Math.random() < a)) return o;
+var c = gData.gameData.configs.ServerConfig.AdDelay.split(","), l = parseFloat(c[0]), p = parseFloat(c[1]), u = 1e3 * (l + (p - l) * Math.random()), d = 1e3 * (l + (p - l) * Math.random());
 setTimeout(function() {
 mk.ad.showInterAd(0, e);
 setTimeout(function() {
 mk.ad.showInterAd(2, e);
+}, d);
 }, u);
-}, p);
 break;
 
 case 4:
 a = this.getPerByEcpm(r.RC_moreGameRedBag);
-if (!(Math.random() < a)) return;
+if (!(o = Math.random() < a)) return o;
 gData.moreGame.popNewOpenRedBag();
 }
+return o;
 };
 t.prototype.checkPopInter = function(t) {
 if (-1 != this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString())) {
@@ -5682,8 +5683,10 @@ gData.blessingBag.HttpInitAdRbData();
 };
 e.prototype.onClickClose = function() {};
 e.prototype.onDisable = function() {
-gData.adData.checkShowFullInter(4);
+if (gData.adData.checkShowFullInter(4)) {
+gData.moreGame.openType = 2;
 mk.data.sendDataEvent(p.DataEventId.htRedBag_scene, "关闭福利界面");
+}
 };
 i([ h(cc.RichText) ], e.prototype, "txtRemaindAdNum", void 0);
 i([ h(cc.Prefab) ], e.prototype, "blassingBagItem", void 0);
@@ -13179,6 +13182,7 @@ this.prohibitProductionAd = [];
 this.productionAdMaxTimes = 20;
 this.popTipCallBack = null;
 this.orderAinFinishNum = 0;
+this.welfareOpenLimit = 0;
 this._farmMapRewardData = [];
 this._cashOutTimes = 0;
 this._farmData = [];
@@ -13256,6 +13260,7 @@ gData.gameData.shareDes = this.configs.ServerConfig.shareDes;
 gData.gameData.shareImgUrl = this.configs.ServerConfig.shareImgUrl;
 gData.gameData.RawInsectArr = this.configs.ServerConfig.RawInsect.split(",");
 gData.safeDepositBoxData.richBankConfig = this.configs.BankTask;
+gData.gameData.welfareOpenLimit = parseInt(this.configs.ServerConfig.welfareOpen);
 };
 t.prototype.initPlayerProp = function(t) {
 this.playerProp = new f();
@@ -13344,7 +13349,9 @@ t.prototype.setOrderAniFinishNum = function() {
 ++this.orderAinFinishNum;
 if (this.orderAinFinishNum >= 3) {
 this.orderAinFinishNum = 0;
+setTimeout(function() {
 mk.event.emit("flyOrderAni");
+}, 500);
 }
 };
 t.prototype.setProp = function(t, e) {
@@ -14606,7 +14613,7 @@ t.realName = "realName";
 t.offlineProductTimes = "offlineProductTimes";
 t.cashLimit = "cashLimit";
 t.htRedBag_scene = "htRedBag_scene";
-t.htRedBag_second = "htRedBag_second";
+t.htRedBag_eject = "htRedBag_eject";
 })(a.DataEventId || (a.DataEventId = {}));
 (function(t) {
 t.video_init_1 = "农场加等级经验";
@@ -15048,6 +15055,9 @@ e.ani_add4 = null;
 e.lbl_addRedMoney = null;
 e.node_orderHb = null;
 e.node_extraOrderUi = null;
+e.node_bgUi = null;
+e.node_crop = [];
+e.node_orderHbIcon = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
@@ -15061,6 +15071,7 @@ e.btnCD = 0;
 e.startTimes = !1;
 e.orderPicIdArray = [];
 e.isGray = !0;
+e.isStopFarm = !1;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -15307,7 +15318,10 @@ e.prototype.onClickHuTui = function() {
 mk.data.sendDataEvent(d.DataEventId.button_click, "互推icon");
 };
 e.prototype.onClickFuli = function() {
+if (gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit) {
+mk.ui.openPanel("module/blessingBag/blessingBag");
 mk.data.sendDataEvent(d.DataEventId.button_click, "福利icon");
+} else mk.tip.pop("订单提现" + gData.gameData.welfareOpenLimit + "次后开启");
 };
 e.prototype.onClickQipaoRedBag = function() {
 mk.audio.playEffect("button");
@@ -15701,7 +15715,8 @@ e = "制作";
 }
 return e;
 };
-e.prototype.initOrderUI = function() {
+e.prototype.initOrderUI = function(t) {
+void 0 === t && (t = !0);
 return r(this, void 0, void 0, function() {
 var t, e, a, o, n, i, r, c, l;
 return s(this, function(s) {
@@ -15806,9 +15821,14 @@ return [ 2, null ];
 }
 a = gData.gameData.playerProp.orderData.cashMoney;
 gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
-gData.cashPro.callBack = this.getRewardCallBack;
+gData.cashPro.callBack = this.getRewardCallBack.bind(this);
 gData.receiptNotice.receip_rmb = a;
 mk.ui.openPanel("module/newNotice/newNotice");
+this.node_crop.forEach(function(t) {
+t.active = !1;
+});
+this.node_orderHbIcon.active = !1;
+this.node_getOrderReward.node.active = !1;
 return [ 2 ];
 }
 });
@@ -15816,12 +15836,30 @@ return [ 2 ];
 };
 e.prototype.getRewardCallBack = function() {
 this.node_extraOrderUi.active = !0;
+this.node_bgUi.scale = 0;
+cc.tween(this.node_bgUi).to(.4, {
+scale: 1.4
+}).start();
+if ("1" == gData.gameData.funOpenData[1]) {
+gData.gameData.funOpenData[1] = "0";
+this.isStopFarm = !0;
+}
 };
 e.prototype.showRefreshLogic = function() {
+this.node_crop.forEach(function(t) {
+t.active = !0;
+});
+this.node_orderHbIcon.active = !0;
+this.node_getOrderReward.node.active = !0;
 this.initOrderUI();
+this.showTips();
 gData.gameData.init_order = !0;
 gData.gameData.checkTaskFinishUnLock();
 gData.safeDepositBoxData.updateQipao();
+if (this.isStopFarm) {
+this.isStopFarm = !1;
+gData.gameData.funOpenData[1] = "1";
+}
 };
 e.prototype.showTips = function() {
 mk.tip.pop("提现成功,订单已刷新");
@@ -15938,7 +15976,6 @@ var e, a;
 return s(this, function(o) {
 switch (o.label) {
 case 0:
-console.log("-=-=-=-=-=-=-=1");
 e = {
 id: t
 };
@@ -15946,7 +15983,6 @@ return [ 4, mk.http.sendData("orderTask/updateUserOrderTaskInfo", e) ];
 
 case 1:
 if (0 != (a = o.sent()).errcode) return [ 2, null ];
-console.log("-=-=-=-=-=-=-=2");
 gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
 return [ 2 ];
 }
@@ -16135,6 +16171,18 @@ i([ y({
 displayName: "额外订单ui节点",
 type: cc.Node
 }) ], e.prototype, "node_extraOrderUi", void 0);
+i([ y({
+displayName: "额外订单背景节点",
+type: cc.Node
+}) ], e.prototype, "node_bgUi", void 0);
+i([ y({
+displayName: "订单显示",
+type: cc.Node
+}) ], e.prototype, "node_crop", void 0);
+i([ y({
+displayName: "订单红包",
+type: cc.Node
+}) ], e.prototype, "node_orderHbIcon", void 0);
 return i([ f ], e);
 }(cc.Component);
 a.default = m;
@@ -16848,8 +16896,10 @@ e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 };
 e.prototype.onDisable = function() {
-gData.adData.checkShowFullInter(4);
+if (gData.adData.checkShowFullInter(4)) {
+gData.moreGame.openType = 3;
 mk.data.sendDataEvent(r.DataEventId.htRedBag_scene, "关闭农场等级奖励界面");
+}
 };
 i([ p({
 displayName: "进度条",
@@ -17973,8 +18023,8 @@ gData.reward.getReward(c);
 s.label = 5;
 
 case 5:
-if (!mk.guide.isGuiding()) {
-gData.adData.checkShowFullInter(4);
+if (!mk.guide.isGuiding() && gData.adData.checkShowFullInter(4)) {
+gData.moreGame.openType = 0;
 mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "点击可收获");
 }
 return [ 2 ];
@@ -18217,8 +18267,10 @@ return [ 2 ];
 };
 e.prototype.onEnable = function() {
 mk.ad.showNative();
-gData.adData.checkShowFullInter(4);
+if (gData.adData.checkShowFullInter(4)) {
+gData.moreGame.openType = 0;
 mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "点击可收获");
+}
 };
 e.prototype.onDisable = function() {
 mk.ad.destroyNativeAd();
@@ -18470,7 +18522,7 @@ e.sp_icon_1 = null;
 e.sp_icon_2 = null;
 e.delayTime = 0;
 e.distance = 97;
-e.speed = 5;
+e.curSpeed = 5;
 e.refreshTimes = 5;
 e.maxShowTimes = 10;
 e.index = 0;
@@ -18478,6 +18530,7 @@ e.node_fly = null;
 e.node_des = null;
 e.node_hide = null;
 e.callBack = null;
+e.node_describ = null;
 e.node_icon_1 = null;
 e.node_icon_2 = null;
 e.iconPath = "game/coregame/texture/plant_icons/plantIcon_";
@@ -18489,7 +18542,9 @@ e.isFinish = !1;
 e.slowSpeedRefreshTimes = 0;
 e.randArr = [];
 e.curRand = -1;
-e.sss = 0;
+e.speed = 0;
+e.sss = 6;
+e.isDoAct = !1;
 e.tests = 0;
 return e;
 }
@@ -18500,6 +18555,7 @@ this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
 this.delayTime = Math.floor(60 * this.delayTime);
 this.arrData = gData.gameData.getProductArrByType(c.ProductType.nzw);
 this.delay = this.delayTime;
+this.speed = this.curSpeed;
 for (var t = 0; t != this.arrData.length; ++t) this.randArr.push(t);
 mk.event.register("flyOrderAni", this.doFlyAni.bind(this), this);
 };
@@ -18509,15 +18565,23 @@ this.realyPicture = e[a.Id - 1].picture;
 };
 e.prototype.update = function() {
 if (this.delay <= 0 && !this.isFinish) {
+if (!this.isDoAct && this.node_describ) {
+this.isDoAct = !0;
+cc.tween(this.node_describ).to(.3, {
+scale: 1.4
+}).to(.3, {
+scale: 1
+}).start();
+}
 this.node_icon_1.setPosition(new cc.Vec2(0, this.node_icon_1.position.y - this.speed));
 if (this.node_icon_1.position.y <= -this.distance) {
 ++this.times;
-if (this.times > this.maxShowTimes) if (3 != this.speed) {
+if (this.times > this.maxShowTimes) if (4 != this.speed) {
 ++this.sss;
-var t = 2 + .1 * this.sss;
+var t = 2 + .4 * this.sss;
 this.speed -= t;
-if (this.speed < 3) {
-this.speed = 2;
+if (this.speed < 4) {
+this.speed = 4;
 ++this.slowSpeedRefreshTimes;
 }
 } else ++this.slowSpeedRefreshTimes;
@@ -18557,10 +18621,7 @@ this.randArr.splice(o, 1);
 n = this.arrData[o].picture;
 -1 != this.curRand && this.randArr.push(this.curRand);
 this.curRand = o;
-if (0 == this.index) {
-++this.tests;
-console.log("=====" + this.tests + "====" + o);
-}
+0 == this.index && ++this.tests;
 if (1 != t) return [ 3, 4 ];
 i = this.sp_icon_1;
 return [ 4, mk.loader.load(this.iconPath + n, cc.SpriteFrame) ];
@@ -18585,18 +18646,32 @@ return [ 2 ];
 };
 e.prototype.doFlyAni = function() {
 var t = this;
-this.node_hide && (this.node_hide.active = !1);
-var e = cc.instantiate(this.sp_icon_1.node);
-e.setScale(.32);
-e.parent = this.node_fly;
-var a = this.sp_icon_1.node.parent.convertToWorldSpaceAR(cc.Vec2.ZERO), o = this.node_fly.convertToNodeSpaceAR(a);
-e.setPosition(o);
-a = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition());
-o = this.node_fly.convertToNodeSpaceAR(a);
-cc.tween(e).to(.6, {
-position: cc.v3(o)
+this.node_hide && cc.tween(this.node_hide).delay(.3).call(function() {
+t.node_hide.active = !1;
+}).start();
+for (var e = this.sp_icon_1.node.parent.convertToWorldSpaceAR(cc.Vec2.ZERO), a = this.node_fly.convertToNodeSpaceAR(e), o = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition()), n = this.node_fly.convertToNodeSpaceAR(o), i = function(e) {
+var o = cc.instantiate(r.sp_icon_1.node);
+o.setScale(.32);
+o.parent = r.node_fly;
+o.angle = mk.math.random(-45, 45, !1);
+var i = cc.v2(mk.math.random(-1, 1, !1), mk.math.random(-1, 1, !1));
+i = i.normalize();
+var s = cc.v2(mk.math.random(10, 100, !1) * i.x, mk.math.random(10, 100, !1) * i.y);
+o.setPosition(a);
+var c = a.add(s);
+cc.tween(o).to(.2, {
+position: cc.v3(c)
+}).call(function() {
+t.moveFly(o, e, n);
+}).start();
+}, r = this, s = 0; 4 != s; ++s) i(s);
+};
+e.prototype.moveFly = function(t, e, a) {
+var o = this;
+cc.tween(t).to(.6 + .1 * e, {
+position: cc.v3(a)
 }).removeSelf().call(function() {
-t.callBack && t.callBack.emit(null);
+0 == e && o.callBack && o.callBack.emit(null);
 }).start();
 };
 e.prototype.onDisable = function() {
@@ -18605,6 +18680,9 @@ this.isFinish = !1;
 this.slowSpeedRefreshTimes = 0;
 this.curRand = -1;
 this.times = 0;
+this.speed = this.curSpeed;
+this.sss = 6;
+this.isDoAct = !1;
 };
 i([ u({
 displayName: "图片节点1",
@@ -18622,7 +18700,7 @@ displayName: "1与2的之间的距离"
 }) ], e.prototype, "distance", void 0);
 i([ u({
 displayName: "速率"
-}) ], e.prototype, "speed", void 0);
+}) ], e.prototype, "curSpeed", void 0);
 i([ u({
 displayName: "刷新次数"
 }) ], e.prototype, "refreshTimes", void 0);
@@ -18648,6 +18726,10 @@ i([ u({
 displayName: "回调",
 type: cc.Component.EventHandler
 }) ], e.prototype, "callBack", void 0);
+i([ u({
+displayName: "文字节点",
+type: cc.Node
+}) ], e.prototype, "node_describ", void 0);
 return i([ p ], e);
 }(cc.Component);
 a.default = d;
@@ -18891,7 +18973,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -20236,7 +20318,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -22494,6 +22576,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e._moreGameList = null;
 e.init_moreGameList = !1;
 e.init_newOpenRedBag = !1;
+e.openType = -1;
 e.testData = {
 normal: [ {
 nebulaAppId: "wxd2e694c55d457ded",
@@ -23407,6 +23490,9 @@ return e;
 }
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {};
+e.prototype.onEnable = function() {
+mk.ad.showNative();
+};
 e.prototype.update = function() {
 if (gData.receiptNotice.init_style) {
 gData.receiptNotice.init_style = !1;
@@ -23421,6 +23507,7 @@ e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 gData.cashPro.openCashPro(gData.receiptNotice.receip_rmb);
 gData.cashPro.init_success = !0;
+mk.ad.destroyNativeAd();
 };
 i([ c({
 displayName: "提现金额",
@@ -23604,7 +23691,6 @@ mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 };
 e.prototype.showElectUI = function() {
 this.sendRecommendList();
-mk.data.sendDataEvent(u.DataEventId.htRedBag_second, "互推红包弹出次数");
 };
 e.prototype.sendRecommendList = function() {
 return r(this, void 0, void 0, function() {
@@ -23678,7 +23764,23 @@ mk.audio.playEffect("button");
 mk.ui.closePanel(this.name);
 if (this.sp_icon.node.active) {
 this.creatorDownLoadTask();
-mk.data.sendDataEvent(u.DataEventId.htRedBag_second, "互推红包领取次数");
+switch (gData.moreGame.openType) {
+case 0:
+mk.data.sendDataEvent(u.DataEventId.htRedBag_eject, "点击可收获-领取");
+break;
+
+case 1:
+mk.data.sendDataEvent(u.DataEventId.htRedBag_eject, "关闭提现界面-领取");
+break;
+
+case 2:
+mk.data.sendDataEvent(u.DataEventId.htRedBag_eject, "关闭福利界面-领取");
+break;
+
+case 3:
+mk.data.sendDataEvent(u.DataEventId.htRedBag_eject, "关闭农场等级奖励界面-领取");
+}
+gData.moreGame.openType = -1;
 } else mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
 return s(this, function(t) {
@@ -29773,7 +29875,6 @@ mk.data.sendDataEvent(l.DataEventId.cashLimit, "提现触发上限");
 }
 return [ 2 ];
 }
-0 == a.CashMode || a.CashMode;
 gData.gameData.addCashOutTimes();
 o = Math.round(100 * e.videoRedMoney.videoRewardList[0].rewardNum);
 gData.receiptNotice.receip_rmb = o;
@@ -34615,8 +34716,10 @@ e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 };
 e.prototype.onDisable = function() {
-gData.adData.checkShowFullInter(4);
+if (gData.adData.checkShowFullInter(4)) {
+gData.moreGame.openType = 1;
 mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "关闭提现界面");
+}
 };
 i([ h({
 displayName: "公告组件",

BIN
build/jsb-link/src/cocos2d-jsb.jsc


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

@@ -1,6 +1,6 @@
 {
-    "version": "1.0.6",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
+    "version": "1.0.7",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -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": 1637304155390,
-    "genTime": 1637304155390,
+    "buildTime": 1637639934259,
+    "genTime": 1637639934259,
     "genVersion": null
 }

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 1
packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

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


+ 1 - 1
settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1637027217827,
+  "last-module-event-record-time": 1637639729279,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff