1

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -135,7 +135,8 @@ export default class WalletCashOut extends cc.Component {
         let data = gData.gameData.gameData.userNoviceWeFareInfo;
         if (data) {
             if (data.progressRate >= 1) {
-                gData.walletCashOutData.HttpCashOut(this.intV);
+                let v = Math.round(this.intV);
+                gData.walletCashOutData.HttpCashOut(v);
             } else {
                 mk.tip.pop(`满${this.intV}元提现`);
             }

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","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}
+{"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}

build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json

@@ -1 +1 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"1_3","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"0:107:588:850","clickRect":"event","finger":"100:-350","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=476175>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"1_3","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"0:107:588:850","clickRect":"event","finger":"100:-350","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/7c/7c2d0a53-975f-4c53-a156-b7aa17e4cb33.json

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

build/jsb-link/assets/resources/import/c5/c534a35a-73aa-40ef-92eb-f7d632dde418.json

@@ -1 +0,0 @@
-[1,["7cLQpTl19MU6FWt6oX5Msz"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"head","rect":[0,0,128,127],"offset":[0,0],"originalSize":[128,127],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

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

@@ -10969,14 +10969,14 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), R = t("./ConfigData"), I = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), x = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), x = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = function() {
 function t() {
 this.init();
 }
 t.prototype.init = function() {
 this.appData = new a.AppData();
 this.loginData = new c.LoginData();
-this.configData = new R.ConfigData();
+this.configData = new I.ConfigData();
 this.gameData = new i.GameData();
 this.wechatData = new l.WechatData();
 this.httpData = new r.HttpData();
@@ -10999,7 +10999,7 @@ this.blessingBag = new v.BlessingBagData();
 this.cashPro = new b.default();
 this.redCodeData = new w.default();
 this.redeem = new S.default();
-this.newCashUiData = new I.NewCashUIData();
+this.newCashUiData = new R.NewCashUIData();
 this.adUnlockData = new T.default();
 this.plantData = new C.default();
 this.harvestData = new x.default();
@@ -13799,6 +13799,7 @@ var n = t("../../game/data/GameData"), a = t("./UISystem"), i = function() {
 function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(n.GameProp.guideID);
+null == this.crtGuideID && (this.crtGuideID = 0);
 if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
@@ -17044,13 +17045,13 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "component", {
 get: function() {
-return this._component || (this._component = new R());
+return this._component || (this._component = new I());
 },
 enumerable: !1,
 configurable: !0
 });
 return t;
-}(), R = function() {
+}(), I = function() {
 function t() {}
 Object.defineProperty(t.prototype, "setGray", {
 get: function() {
@@ -29782,7 +29783,8 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = cc._decorator, l = s.ccclass, p = (s.property, function(t) {
+var s = t("../../../mk/system/UISystem"), l = cc._decorator, p = l.ccclass, u = (l.property, 
+function(t) {
 a(e, t);
 function e() {
 return null !== t && t.apply(this, arguments) || this;
@@ -29799,11 +29801,18 @@ return [ 2 ];
 e.prototype.clickClose = function() {
 mk.ui.closePanel(this.node.name);
 };
-return i([ l ], e);
+e.prototype.clickAgree = function() {
+mk.ui.closePanel(this.node.name);
+var t = cc.find("Canvas/主界面层");
+mk.ui.openPanel("game/prefab/game", s.OpenActionType.normal, t);
+};
+return i([ p ], e);
 }(cc.Component));
-o.default = p;
+o.default = u;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../../mk/system/UISystem": "UISystem"
+} ],
 base64: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "46dba/4JnZL8LqBzMYhW9lP", "base64");

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1630917103042,
-    "genTime": 1630917103042,
+    "buildTime": 1630922023725,
+    "genTime": 1630922023725,
     "genVersion": null
 }