Jelajahi Sumber

优化订单,红包币提现 发包

wuwangdong 4 tahun lalu
induk
melakukan
40db9b3418
30 mengubah file dengan 1193 tambahan dan 383 penghapusan
  1. 531 235
      assets/resources/game/prefab/game.prefab
  2. 0 0
      assets/resources/module/login/hot/project.manifest
  3. 1 1
      assets/resources/module/login/hot/version.manifest
  4. 20 20
      assets/resources/module/newCashUI/walletCashOut.prefab
  5. 3 2
      assets/script/before/main/FarmCountDown.ts
  6. 13 1
      assets/script/before/view/data/HarvestData.ts
  7. 1 1
      assets/script/before/view/uiItem/PlantItem.ts
  8. 2 9
      assets/script/game/data/AdData.ts
  9. 16 3
      assets/script/game/data/GameData.ts
  10. 3 0
      assets/script/game/data/module/RewardData.ts
  11. 32 4
      assets/script/game/game/FunBtns.ts
  12. 67 37
      assets/script/game/game/Game.ts
  13. 1 1
      assets/script/game/game/TouchListener.ts
  14. 6 5
      assets/script/game/module/newCashUI/WalletCashOut.ts
  15. 4 0
      assets/script/game/module/newNotice/NewNotice.ts
  16. 5 0
      assets/script/game/module/reward/Reward.ts
  17. 1 0
      assets/script/mk/system/FlySystem2.ts
  18. 1 1
      build/jsb-link/assets/internal/config.json
  19. TEMPAT SAMPAH
      build/jsb-link/assets/main/index.jsc
  20. 0 0
      build/jsb-link/assets/resources/config.json
  21. 0 0
      build/jsb-link/assets/resources/import/68/68a799c9-8646-4f20-8a3a-ab763cdf31dd.json
  22. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  23. 0 0
      build/jsb-link/assets/resources/import/e3/e3718e3b-b05d-4d23-9195-924548d5c740.json
  24. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  25. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  26. TEMPAT SAMPAH
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  27. 481 58
      build/jsb-link/js backups (useful for debugging)/main.index.js
  28. 3 3
      packages-hot-update/cfg.json
  29. 0 0
      packages-hot-update/manifest/project.manifest
  30. 1 1
      packages-hot-update/manifest/version.manifest

File diff ditekan karena terlalu besar
+ 531 - 235
assets/resources/game/prefab/game.prefab


File diff ditekan karena terlalu besar
+ 0 - 0
assets/resources/module/login/hot/project.manifest


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

@@ -1 +1 @@
-{"version":"1.0.10","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"}
+{"version":"1.0.11","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"}

+ 20 - 20
assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "32UJibkopI07b5y1NInp8Y",
+    "fileId": "89/UQ2IE9J4ZFIzpf4t+YX",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "360GNPET5PJK9fyBHTGH4W",
+    "fileId": "6dpAzjFxBOErFxu+/2fnCr",
     "sync": false
   },
   {
@@ -5437,7 +5437,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -5823,7 +5823,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -5877,7 +5877,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6084,7 +6084,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -6470,7 +6470,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6524,7 +6524,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6731,7 +6731,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7117,7 +7117,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7171,7 +7171,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -7495,7 +7495,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7881,7 +7881,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7935,7 +7935,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8142,7 +8142,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -8528,7 +8528,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8582,7 +8582,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8789,7 +8789,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -9175,7 +9175,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9229,7 +9229,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,

+ 3 - 2
assets/script/before/main/FarmCountDown.ts

@@ -1,5 +1,5 @@
 import { BitmapFontC } from "../../game/component/BitmapFontC";
-import { ProductType } from "../../game/data/GameData";
+import { GameProp, ProductType } from "../../game/data/GameData";
 import Util from "../util/Util";
 
 const { ccclass, property } = cc._decorator;
@@ -104,7 +104,8 @@ export class FarmCountDown extends cc.Component {
         this.counting = false;
         this.normalGroup.active = false;
         let sick = false;
-        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
+        let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && cashTimes >= gData.gameData.insectAutoShowLimit && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
             if (this.productConfig.tab == ProductType.nzw) {
                 if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
                     sick = true;

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

@@ -73,6 +73,7 @@ export default class HarvestData extends Data {
     }
 
     async getNormalReward() {
+        await mk.time.WaitForSeconds(0.2);
         let data = { id: this.config.id };
         let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
 
@@ -114,9 +115,20 @@ export default class HarvestData extends Data {
                 gData.reward.data = rewardData;
                 gData.reward.callback = this.call;
     
-    
                 let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
                 gData.reward.getReward(world_Pos);
+
+                let str = "+"+ response.data.redMoneyAddition/100 + "";
+                let pos =  mk.fly.node.convertToNodeSpaceAR(world_Pos);
+                let prefab = await mk.loader.load("game/prefab/flyHb", cc.Prefab);
+                let hand = cc.instantiate(prefab);
+                //hand.opacity = 0;
+                hand.zIndex = 1000;
+                hand.parent = mk.fly.node;
+                hand.setPosition(pos);
+                let lab_value = hand.getComponentInChildren(cc.Label);
+                lab_value.string = str;
+                cc.tween(hand).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).removeSelf().start();
                 //mk.ui.openPanel('module/reward/reward');
             }
             

+ 1 - 1
assets/script/before/view/uiItem/PlantItem.ts

@@ -114,7 +114,7 @@ export default class PlantItem extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
         let flyRed;

+ 2 - 9
assets/script/game/data/AdData.ts

@@ -1,6 +1,6 @@
 import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
-import { GameProp, InterAdType, VideoAdType } from "./GameData";
+import { GameProp, InterAdType, InterFullAdType, VideoAdType } from "./GameData";
 
 /**
  * @description 广告数据
@@ -356,7 +356,6 @@ export class AdData {
                 } else {
                     per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
                 }
-                per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -433,13 +432,7 @@ export class AdData {
             //this.checkPopInter(InterAdType.interstitial1_click_19);
 
             if (gData.gameData.insertAdSwitch[13] == "1") {
-                mk.ad.videoAdType = VideoAdType.video_init_22;
-                mk.ad.watchAd((success: boolean) => {
-                    mk.console.log("watchAD:" + success);
-                    if (success) {
-                        gData.adData.watchVideo(null);
-                    }
-                });
+                gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_4);
             }
         }
     }

+ 16 - 3
assets/script/game/data/GameData.ts

@@ -130,6 +130,13 @@ export class GameData {
     //富翁银行教学
     richBankTeachTag = false;
 
+    //订单奖励类型
+    orderRewardType = 1;
+    //提现X次后显示任务红包
+    taskRedBagAutoShowLimit = 0;
+    //提现x次后显示生虫
+    insectAutoShowLimit = 0;
+
     public insertAdLimit = 0;
     public insertAdSwitch: string[] = [];
     /**
@@ -224,6 +231,10 @@ export class GameData {
             LogUtil.ifShowLog = false;
         }
 
+        gData.gameData.orderRewardType = parseInt(this.configs.ServerConfig.OrderReward);
+        //gData.gameData.taskRedBagAutoShowLimit = parseInt(this.configs.ServerConfig.harvestSwitch);
+        gData.gameData.insectAutoShowLimit = parseInt(this.configs.ServerConfig.StopProductionSwitch);
+
         gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
         gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
     }
@@ -2356,13 +2367,14 @@ export enum VideoAdType {
     video_init_19 = '定时弹出红包',
     video_init_20 = '插队',
     video_init_21 = '恢复生产次数',
-    video_init_22 = '长时间未操作弹出视频',
+    //video_init_22 = '长时间未操作弹出视频',
 }
 
 export enum InterFullAdType {
     interstitial2_init_1 = '点击红包的关闭按钮',
     interstitial2_init_2 = '普通收获',
-    interstitial2_init_3 = '点击鸟和狗'
+    interstitial2_init_3 = '点击鸟和狗',
+    interstitial2_init_4 = "长时间未操作弹出"
 }
 
 export enum InterAdType {
@@ -2465,5 +2477,6 @@ export enum FunctionSwitch{
     FS_order = 11,                      //订单
     FS_floatFarmMap = 12,               //图鉴浮窗
     FS_richManBank = 13,                //富翁银行
-    FS_cashOutBill = 14,                //提现账单
+    FS_openPushNotice = 14,             //打开推送通知权限
+    FS_cashOutBill = 15,                //提现账单
 }

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

@@ -28,6 +28,9 @@ export class RewardData extends Data {
      */
     subType: number = 1;
 
+    //reward界面关闭回调
+    closeUICallBack: Function = null;
+
     /**
     * 奖励添加
     */

+ 32 - 4
assets/script/game/game/FunBtns.ts

@@ -27,7 +27,7 @@ export default class FunBtns extends cc.Component {
     @property({ type: cc.Node, displayName: "富翁银行" })
     btn14: cc.Node = null;
     @property({ type: cc.Node, displayName: "提现账单" })
-    btn15: cc.Node = null;
+    btn16: cc.Node = null;
 
     private addCount = 0;
     onLoad() {
@@ -50,10 +50,19 @@ export default class FunBtns extends cc.Component {
                     this.addCount += 1;
                 } else if (i == 2 && data[i] == "0") {
                     this.btn4.y = this.btn4.y + 170;
-                    this.btn15.y = this.btn15.y + 170;
+                    this.btn16.y = this.btn16.y + 170;
                 }
-                else if (i == 4 && data[i] == "0") {
-                    this.addCount += 1;
+                else if (i == 4) {
+                    if(data[i] == "1"){
+                        let times = gData.gameData.getProp(GameProp.cashTimes);
+                        if(!times){times = 0;}
+                        if(times < gData.gameData.taskRedBagAutoShowLimit){
+                            node_btn.active = false;
+                            mk.event.register("showTaskRedBagAction", this.doShowTaskRedBagActionLogic.bind(this), this);
+                        }
+                    }else{
+                        this.addCount += 1;
+                    }   
                 }
                 else if (i == 13 && data[i] == "1") {
                     let times = gData.gameData.getProp(GameProp.cashTimes);
@@ -82,6 +91,25 @@ export default class FunBtns extends cc.Component {
         this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
     }
 
+    doShowTaskRedBagActionLogic(){
+        if(gData.gameData.funOpenData[8] == "1"){
+            let posY = this.btn9.y + 130;
+            cc.tween(this.btn9).to(0.2, {y: posY}).call(()=>{
+                this.doAction();
+            }).start();
+        }else{
+            this.doAction();
+        }
+    }
+
+    doAction(){
+        let posX = this.btn5.x;
+        this.btn5.x = posX + 430;
+        cc.tween(this.btn5).to(0.4, {x: posX}).call(()=>{
+
+        }).start();
+    }
+
     showRichBankIcon() {
         this.btn14.active = true;
         mk.event.remove("showRichBankIcon", this);

+ 67 - 37
assets/script/game/game/Game.ts

@@ -114,8 +114,8 @@ export default class Game extends cc.Component {
 
     @property({ type: cc.Node, displayName: '增加效果文本2' })
     ani_add4: cc.Node = null;
-    @property({ displayName: '红包币', type: cc.Label })
-    lbl_addRedMoney: cc.Label = null;
+    @property({ displayName: '现金', type: cc.Label })
+    lbl_addCash: cc.Label = null;
     @property({ displayName: '红包币图标', type: cc.Node })
     node_orderHb: cc.Node = null;
 
@@ -129,6 +129,13 @@ export default class Game extends cc.Component {
     @property({ displayName: '订单红包', type: cc.Node })
     node_orderHbIcon: cc.Node = null;
 
+    @property({ displayName: '显示现金', type: cc.Node })
+    node_showCash: cc.Node = null;
+    @property({ displayName: '显示红包币', type: cc.Node })
+    node_showRedMoney: cc.Node = null;
+    @property({ displayName: '订单红包币', type: cc.Label })
+    lbl_orderRedMoney: cc.Label = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -573,7 +580,7 @@ export default class Game extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
 
@@ -1001,7 +1008,14 @@ export default class Game extends cc.Component {
         let productJson = gData.gameData.configs.Product;
         let data = gData.gameData.playerProp.orderData;
         if (data) {
-            this.lbl_addRedMoney.string = (data.cashMoney / 100).toFixed(2);
+            //红包币
+            if(gData.gameData.orderRewardType == 1){
+                this.node_showCash.active = false;
+                this.node_showRedMoney.active = true;
+                this.lbl_orderRedMoney.string = data.redMoneyAddition/100 + ""; 
+            }else{
+                this.lbl_addCash.string = (data.cashMoney / 100).toFixed(2);
+            }
             let len = data.orderTaskList.length;
             if (len == 3) {
                 let completeCount = 0;
@@ -1073,43 +1087,59 @@ export default class Game extends cc.Component {
     }
 
     public async getOrderReward() {
-        if (cc.sys.isNative) {
-            if (!gData.loginData.isAuth) {
-                // JsbSystem.WxAuth();
-                gData.gameData.authUIType = 0;
-                mk.ui.openPanel('module/authUI/authUI');
-                return;
+        //现金提现
+        if (gData.gameData.orderRewardType == 2) {
+            if (cc.sys.isNative) {
+                if (!gData.loginData.isAuth) {
+                    // JsbSystem.WxAuth();
+                    gData.gameData.authUIType = 0;
+                    mk.ui.openPanel('module/authUI/authUI');
+                    return;
+                }
             }
-        }
 
-        let data = {};
-        let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
-        if (response.errcode != 0) {
-            if (response.errcode == 405) {
-                mk.tip.pop("今日提现额度已到上限,请明天再提现");
-                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            let response = await mk.http.sendData('orderTask/receiveRewardCash', {});
+            if (response.errcode != 0) {
+                if (response.errcode == 405) {
+                    mk.tip.pop("今日提现额度已到上限,请明天再提现");
+                    mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                }
+                return null;
             }
-            return null;
+            let addMoney = gData.gameData.playerProp.orderData.cashMoney;
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+
+            gData.safeDepositBoxData.setCashRecordDataLength();
+            //处理提现逻辑
+            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;
+        } else {
+            let data = {};
+            let response = await mk.http.sendData('orderTask/receiveReward', data);
+            if (response.errcode != 0) {
+                return null;
+            }
+            let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+            //处理红包币逻辑
+            gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
+            gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
+            gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney}]
+            mk.ui.openPanel('module/reward/reward');
+
+            this.node_crop.forEach((v) => {
+                v.active = false;
+            })
+            this.node_orderHbIcon.active = false;
+            this.node_getOrderReward.node.active = false;
         }
-        let addMoney = gData.gameData.playerProp.orderData.cashMoney;
-        gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
-        //gData.gameData.cloneOrderData(true);
-
-        //处理红包币逻辑
-        // gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
-        // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney }]
-        // mk.ui.openPanel('module/reward/reward');
-        gData.safeDepositBoxData.setCashRecordDataLength();
-        //处理提现逻辑
-        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;
     }
 
     //停止农民产红包币

+ 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/cashOutBill/cashOutBill');
+        //mk.ui.openPanel('module/cashOutBill/cashOutBill');
     }
 
  }

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

@@ -238,9 +238,10 @@ export default class WalletCashOut extends cc.Component {
         mk.audio.playEffect("button");
         if (this.isCanCash) {
 
-            if (this.checkShowTip()) {
-                mk.tip.pop('请先提现完前一档次数');
-            } else {
+            // if (this.checkShowTip()) {
+            //     mk.tip.pop('请先提现完前一档次数');
+            // } else 
+            {
 
                 if (cc.sys.isNative) {
                     if (!gData.loginData.isAuth) {
@@ -251,13 +252,13 @@ export default class WalletCashOut extends cc.Component {
                     }
                 }
                 
-                gData.adData.checkPopCashFull();
+                gData.adData.checkShowFullInter(1);
                 //this.check_button[this.curChooseIndex].setIsCanNotChoose();
                 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
             }
 
         }else{
-            mk.tip.pop('红包币不足');
+            mk.tip.pop('收获农作物可获得红包币');
         }
     }
 

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

@@ -28,6 +28,10 @@ export default class NewNotice extends cc.Component {
         if(gData.gameData.showRichBankIconLimit == times && gData.gameData.funOpenData[13] == "1"){
             mk.event.emit("showRichBankIcon");   
         }
+
+        if(gData.gameData.taskRedBagAutoShowLimit == times && gData.gameData.funOpenData[4] == "1"){
+            mk.event.emit("showTaskRedBagAction");
+        }
     }
 
     onEnable()

+ 5 - 0
assets/script/game/module/reward/Reward.ts

@@ -147,6 +147,11 @@ export default class Reward extends cc.Component {
         if (this.cur_stage === LidType.none) {
             mk.audio.playEffect("button");
         }
+
+        if(gData.reward.closeUICallBack){
+            gData.reward.closeUICallBack();
+            gData.reward.closeUICallBack = null;
+        }
     }
 
     onClickClose() {

+ 1 - 0
assets/script/mk/system/FlySystem2.ts

@@ -130,6 +130,7 @@ export default class FlySystem2 extends cc.Component {
     {
         if(gData.gameData.gameStyle.lbl_redMoney)
         {         
+            gData.gameData.addHb = value;
             gData.gameData.playerProp.redMoney += value;
             //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
             //cc.tween(gData.gameData.gameStyle.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();

+ 1 - 1
build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

TEMPAT SAMPAH
build/jsb-link/assets/main/index.jsc


File diff ditekan karena terlalu besar
+ 0 - 0
build/jsb-link/assets/resources/config.json


File diff ditekan karena terlalu besar
+ 0 - 0
build/jsb-link/assets/resources/import/68/68a799c9-8646-4f20-8a3a-ab763cdf31dd.json


File diff ditekan karena terlalu besar
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


File diff ditekan karena terlalu besar
+ 0 - 0
build/jsb-link/assets/resources/import/e3/e3718e3b-b05d-4d23-9195-924548d5c740.json


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

@@ -1 +1 @@
-{"version":"1.0.10","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"}
+{"version":"1.0.11","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"}

File diff ditekan karena terlalu besar
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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


File diff ditekan karena terlalu besar
+ 481 - 58
build/jsb-link/js backups (useful for debugging)/main.index.js


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

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.10",
+    "version": "1.0.11",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
@@ -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": 1639022490109,
-    "genTime": 1639022490109,
+    "buildTime": 1639216297628,
+    "genTime": 1639216297628,
     "genVersion": null
 }

File diff ditekan karena terlalu besar
+ 0 - 0
packages-hot-update/manifest/project.manifest


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

@@ -1 +1 @@
-{"version":"1.0.10","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"}
+{"version":"1.0.11","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"}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini