1

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -267,7 +267,7 @@
       "ctor": "Float64Array",
       "array": [
         -314.062,
-        573.38,
+        614.38,
         0,
         0,
         0,
@@ -373,10 +373,10 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": -314.062,
-      "y": 573.38
+      "y": 614.38
     },
     "angle": 0,
-    "scale": 0,
+    "scale": 1,
     "active": false
   },
   {
@@ -396,7 +396,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": -314.062,
-      "y": 573.38
+      "y": 614.38
     },
     "angle": 0,
     "scale": 1,
@@ -745,8 +745,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": 505.529
+      "x": 500,
+      "y": 550.529
     },
     "angle": 0,
     "scale": 1,
@@ -769,7 +769,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 505.529
+      "y": 550.529
     },
     "angle": 0,
     "scale": 1,
@@ -841,14 +841,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        433.574,
+        441.574,
         0,
         0,
         0,
         0,
         1,
-        1.4,
-        1.4,
+        1,
+        1,
         1
       ]
     },
@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "b3yD46tSNFRI9RlbihXPmu",
+    "fileId": "13IQQbbgFJOZ3quut+jAKo",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "755NqsgJhNNaTQwLbc2pyz",
+    "fileId": "30BQGNa6JFwJWrlDF6ByVQ",
     "sync": false
   },
   {
@@ -1475,8 +1475,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": 406.574
+      "x": 500,
+      "y": 441.574
     },
     "angle": 0,
     "scale": 1,
@@ -1499,7 +1499,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 406.574
+      "y": 441.574
     },
     "angle": 0,
     "scale": 1,
@@ -3820,8 +3820,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": 269.491
+      "x": 500,
+      "y": 289.491
     },
     "angle": 0,
     "scale": 1,
@@ -3843,8 +3843,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 269.491
+      "x": -4,
+      "y": 289.491
     },
     "angle": 0,
     "scale": 1,
@@ -9125,7 +9125,7 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
+      "x": 500,
       "y": -49.58
     },
     "angle": 0,
@@ -9994,8 +9994,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": -165
+      "x": 500,
+      "y": -191
     },
     "angle": 0,
     "scale": 1,
@@ -10018,7 +10018,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -165
+      "y": -191
     },
     "angle": 0,
     "scale": 1,
@@ -10109,8 +10109,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": -95.149
+      "x": 500,
+      "y": -114.149
     },
     "angle": 0,
     "scale": 1,
@@ -10133,7 +10133,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -95.149
+      "y": -114.149
     },
     "angle": 0,
     "scale": 1,
@@ -10516,8 +10516,8 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 560,
-      "y": -440.807
+      "x": 500,
+      "y": -480.807
     },
     "angle": 0,
     "scale": 1,
@@ -10540,7 +10540,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -440.807
+      "y": -480.807
     },
     "angle": 0,
     "scale": 1,

assets/script/game/data/module/RewardData.ts

@@ -64,7 +64,7 @@ export class RewardData extends Data {
             {
                 endPos = 'Canvas/主界面层/game/功能按钮/底部按钮/中间按钮';
                 num = 5;
-                scale = 0.8;
+                scale = 0.5;
             }
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, num, world_Pos, endPos, () => {
                 is_add_money && this.addReward();

assets/script/mk/system/FlySystem.ts

@@ -64,9 +64,9 @@ export default class FlySystem extends cc.Component {
 
     private FlyOut(type: number, target: cc.Node, end: cc.Vec2 | string, item_cb: Function = null, averageValue: number = -1) {
         let dur = mk.math.random(0.3, 1, false);
-        cc.tween(target)
-            .to(dur, { scale: 0.8 })
-            .start();
+        // cc.tween(target)
+        //     .to(dur, { scale: 0.8 })
+        //     .start();
 
         console.log('---');
         let end_pos: cc.Vec2 = null;

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}

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

@@ -6389,14 +6389,18 @@ e.labMoney = null;
 return e;
 }
 e.prototype.update = function() {
-gData.cashPro.init_load && this.showLoad();
-gData.cashPro.init_success && this.tixianSuccess();
-gData.cashPro.init_fail && this.tixianFail();
-};
-e.prototype.lateUpdate = function() {
+if (gData.cashPro.init_load) {
+this.showLoad();
 gData.cashPro.init_load = !1;
+}
+if (gData.cashPro.init_success) {
+this.tixianSuccess();
 gData.cashPro.init_success = !1;
+}
+if (gData.cashPro.init_fail) {
+this.tixianFail();
 gData.cashPro.init_fail = !1;
+}
 };
 e.prototype.showLoad = function() {
 this.loadPart.active = !0;
@@ -14508,6 +14512,7 @@ r.id = parseInt(s[0]);
 r.step = parseInt(s[1]);
 r.trigger = c.trigger;
 r.tr_num = c.trNum;
+r.btnEnable = c.btnEnable;
 r.tr_form = c.trForm;
 r.dialog = c.dialog;
 r.dialog_pos = c.dialogPos;
@@ -14947,19 +14952,19 @@ i = this.targetNode.height;
 var c = mk.game.getWorldPos(this.targetNode);
 o = c.x;
 n = c.y;
-if (this.crtGuide && 2 == this.crtGuide.id && 1 == this.crtStep) {
-a = this.targetNode.parent.width;
-i = this.targetNode.parent.height;
-var s = mk.game.getWorldPos(this.targetNode.parent);
-o = s.x;
-n = s.y - i / 2;
-}
+if ("1" == this.crtGuide.btnEnable) {
 this.node_click.width = this.node_click.height = 0;
-var l = new cc.Component.EventHandler();
-l.target = this.node;
-l.component = "Guide";
-l.handler = "clickNodeClick";
-this.targetNode.getComponent(cc.Button).clickEvents.push(l);
+var s = new cc.Component.EventHandler();
+s.target = this.node;
+s.component = "Guide";
+s.handler = "clickNodeClick";
+this.targetNode.getComponent(cc.Button).clickEvents.push(s);
+} else {
+this.node_click.x = 0;
+this.node_click.y = 0;
+this.node_click.width = this.node.width;
+this.node_click.height = this.node.height;
+}
 }
 if (null != o && null != n && null != a && null != i) if (0 == this.crtGuide.display_type) {
 this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
@@ -14980,52 +14985,52 @@ t.node_bg.y = -t.node_display.y;
 this.node_bg.x = this.node_display.x = o;
 this.node_bg.y = this.node_display.y = n;
 this.node_display.width = this.node_display.height = this.node_bg.width = this.node_bg.height = 2 * this.node.height;
-var p = this.crtGuide.display_type;
+var l = this.crtGuide.display_type;
 cc.tween(this.node_display).to(.2, {
-width: p,
-height: p
+width: l,
+height: l
 }).start();
 }
 if (null != this.crtGuide.dialog_pos && this.crtGuide.dialog_pos.length > 0) {
 r = this.crtGuide.dialog_pos.split(":");
-for (var u = this.node_dialog.getComponent(cc.Widget), d = 0; d < this.widgets.length; d++) {
-switch (d) {
+for (var p = this.node_dialog.getComponent(cc.Widget), u = 0; u < this.widgets.length; u++) {
+switch (u) {
 case 0:
-u.isAlignTop = "" != r[d];
+p.isAlignTop = "" != r[u];
 break;
 
 case 1:
-u.isAlignBottom = "" != r[d];
+p.isAlignBottom = "" != r[u];
 break;
 
 case 2:
-u.isAlignLeft = "" != r[d];
+p.isAlignLeft = "" != r[u];
 break;
 
 case 3:
-u.isAlignRight = "" != r[d];
+p.isAlignRight = "" != r[u];
 break;
 
 case 4:
-u.isAlignVerticalCenter = "" != r[d];
+p.isAlignVerticalCenter = "" != r[u];
 break;
 
 case 5:
-u.isAlignHorizontalCenter = "" != r[d];
+p.isAlignHorizontalCenter = "" != r[u];
 }
-"" != r[d] && (u[this.widgets[d]] = parseInt(r[d]));
+"" != r[u] && (p[this.widgets[u]] = parseInt(r[u]));
 }
-u.enabled = !0;
-u.updateAlignment();
+p.enabled = !0;
+p.updateAlignment();
 } else {
 r = this.crtGuide.dialog_pos1.split(",");
-(u = this.node_dialog.getComponent(cc.Widget)).enabled = !1;
+(p = this.node_dialog.getComponent(cc.Widget)).enabled = !1;
 this.node_dialog.x = o + parseInt(r[0]);
 this.node_dialog.y = n + parseInt(r[1]);
 }
-var h = this.crtGuide.dialog_alignment;
-this.rich_dialog.horizontalAlign = "0" == h ? cc.macro.TextAlignment.LEFT : "1" == h ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT;
-this.rich_dialog1.horizontalAlign = "0" == h ? cc.macro.TextAlignment.LEFT : "1" == h ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT;
+var d = this.crtGuide.dialog_alignment;
+this.rich_dialog.horizontalAlign = "0" == d ? cc.macro.TextAlignment.LEFT : "1" == d ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT;
+this.rich_dialog1.horizontalAlign = "0" == d ? cc.macro.TextAlignment.LEFT : "1" == d ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT;
 if ("" == this.crtGuide.finger) this.node_finger.active = !1; else {
 this.node_finger.active = !0;
 r = this.crtGuide.finger.split(":");
@@ -15064,7 +15069,7 @@ case 0:
 mk.audio.playEffect("button");
 cc.Tween.stopAllByTarget(this.node_display);
 console.log("clickNodeClick");
-this.targetNode && this.targetNode.getComponent(cc.Button).clickEvents.pop();
+"1" == this.crtGuide.btnEnable && this.targetNode && this.targetNode.getComponent(cc.Button).clickEvents.pop();
 this.event_data && mk.event.emit("event_guide", this.event_data);
 this.reset();
 return this.crtGuide.lag_next > 0 ? [ 4, mk.time.WaitForSeconds(this.crtGuide.lag_next) ] : [ 3, 2 ];
@@ -21388,7 +21393,7 @@ this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
-1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.gradeLevel >= t.value && (i = !0);
+1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.completeFarmTaskTimes >= t.value && (i = !0);
 this.mainNode.active = i;
 this.lockNode.active = !i;
 if (!i) {

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