阴影

assets/resources/game/coregame/coregame.prefab

@@ -129223,15 +129223,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -12,
-        -62,
+        -10.008,
+        -48.985,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.3,
+        1.3,
         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}

build/jsb-link/assets/resources/import/aa/aab612ae-9c4b-4e88-8f74-7a547e435494.json

@@ -0,0 +1 @@
+[1,["c4PPX2R2hGt5CP0GH1YGRM"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"4","rect":[0,0,64,71],"offset":[0,0],"originalSize":[64,71],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/c4/c43cf5f6-4768-46b7-908f-d061f560644c.json

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

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

@@ -2943,13 +2943,13 @@ if ("bird_1" == e) {
 this.flyBirdFinished_1();
 mk.fly.PlayCoinAnim(1, 5, this.flyBird_1.node, "", function() {
 console.log("--");
-}, 2);
+}, -1, 2);
 } else if ("bird_2" == e) {
 this.flyBirdFinished_2();
-mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, "", null, 2);
+mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, "", null, -1, 2);
 } else if ("dog" == e) {
 this.moveDogFinished();
-mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, "", null, 2);
+mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, "", null, -1, 2);
 } else "sheep" == e && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 gData.adData.checkShowFullInter(1);
 };
@@ -7888,6 +7888,7 @@ this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
 gData.gameData.setNextProduct(!1);
+gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node);
 };
 i([ y({
 type: u.FarmCountDown,
@@ -8773,6 +8774,7 @@ this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFarmDataMap(this.configID, this.data);
 gData.gameData.setNextProduct(!1);
+gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node);
 };
 e.prototype.plant = function(t) {
 return r(this, void 0, void 0, function() {
@@ -10010,13 +10012,14 @@ return e;
 e.prototype.onLoad = function() {
 mk.fly = this;
 };
-e.prototype.PlayCoinAnim = function(t, e, o, n, a, i) {
+e.prototype.PlayCoinAnim = function(t, e, o, n, a, i, s) {
 void 0 === t && (t = 0);
 void 0 === n && (n = "");
 void 0 === a && (a = null);
 void 0 === i && (i = -1);
+void 0 === s && (s = -1);
 return r(this, void 0, void 0, function() {
-var r, s, l, p, u, d, h, f, y;
+var r, l, p, u, d, h, f, y, g;
 return c(this, function(c) {
 switch (c.label) {
 case 0:
@@ -10027,26 +10030,26 @@ case 1:
 return r < e ? [ 4, mk.pool.getPrefab("game/prefab/coin") ] : [ 3, 5 ];
 
 case 2:
-s = c.sent();
-l = "game/texture/coin/" + t;
-return [ 4, mk.loader.load(l, cc.SpriteFrame) ];
+l = c.sent();
+p = "game/texture/coin/" + t;
+return [ 4, mk.loader.load(p, cc.SpriteFrame) ];
 
 case 3:
-p = c.sent();
-s.getComponent(cc.Sprite).spriteFrame = p;
-s.setParent(this.node);
-s.scale = mk.math.random(.56, .84, !1);
-s.angle = mk.math.random(-45, 45, !1);
-u = (u = cc.v2(mk.math.random(-1, 1, !1), mk.math.random(-1, 1, !1))).normalize();
-d = cc.v2(mk.math.random(10, 160, !1) * u.x, mk.math.random(10, 160, !1) * u.y);
-h = new cc.Vec2(0, -300);
+u = c.sent();
+l.getComponent(cc.Sprite).spriteFrame = u;
+l.setParent(this.node);
+l.scale = -1 != i ? i : mk.math.random(.56, .84, !1);
+l.angle = mk.math.random(-45, 45, !1);
+d = (d = cc.v2(mk.math.random(-1, 1, !1), mk.math.random(-1, 1, !1))).normalize();
+h = cc.v2(mk.math.random(10, 160, !1) * d.x, mk.math.random(10, 160, !1) * d.y);
+f = new cc.Vec2(0, -300);
 if (o) {
-f = o.parent.convertToWorldSpaceAR(o.getPosition());
-h = this.node.convertToNodeSpaceAR(f);
+y = o.parent.convertToWorldSpaceAR(o.getPosition());
+f = this.node.convertToNodeSpaceAR(y);
 }
-y = h.add(d);
-s.setPosition(h);
-this.FlyIn(t, s, y, n, a, i);
+g = f.add(h);
+l.setPosition(f);
+this.FlyIn(t, l, g, n, a, s);
 c.label = 4;
 
 case 4:
@@ -10677,7 +10680,7 @@ 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"), 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"), U = 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();
 }
@@ -10742,7 +10745,7 @@ t[t.cashNormal = 7] = "cashNormal";
 t[t.redBagCash = 8] = "redBagCash";
 t[t.redeem = 9] = "redeem";
 })(n = o.Fun || (o.Fun = {}));
-window.gData = new U();
+window.gData = new G();
 cc._RF.pop();
 }, {
 "../../before/main/FactorySystem": "FactorySystem",
@@ -11342,7 +11345,7 @@ case 2:
 gData.pastureSystem.btnMake();
 gData.gameData.nextMake = null;
 this.nextMake = null;
-this.setNextProduct();
+this.setNextProduct(!1);
 gData.adData.checkPopRed();
 break;
 
@@ -11350,7 +11353,7 @@ case 3:
 gData.factorySystem.btnMake();
 gData.gameData.nextMake = null;
 this.nextMake = null;
-this.setNextProduct();
+this.setNextProduct(!1);
 }
 };
 t.prototype.setFarmDataMap = function(t, e, o) {
@@ -12452,14 +12455,19 @@ e.prototype.onClickPlant = function() {
 if (gData.gameData.leftTimes <= 0) mk.tip.pop("生产次数不足"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else {
 gData.gameData.makeProduct();
 var t = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
-mk.fly.PlayCoinAnim(1, 3, this.btn_product, t, function() {
+mk.fly.PlayCoinAnim(4, 3, this.btn_product, t, function() {
 gData.gameData.init_task = !0;
-});
+}, 1);
 }
 };
-e.prototype.doFlyExpAni = function() {
-var t = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
-mk.fly.PlayCoinAnim(2, 3, this.btn_product, t, function() {});
+e.prototype.doFlyExpAni = function(t, e, o) {
+var n = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
+mk.fly.PlayCoinAnim(2, 3, e, n, function() {
+mk.tip.pop("获得" + t + "点等级经验");
+gData.gameData.gameData.gradeLevel = o.farmLevel;
+gData.gameData.gameData.farmExpValue = o.userExp;
+gData.gameData.gameData.farmGradeData = o.userFarmGrageRewardInfo;
+});
 };
 i([ d({
 type: cc.Node,
@@ -12811,7 +12819,7 @@ return [ 4, mk.http.sendData("farmGrade/farmGradeCash", e) ];
 
 case 1:
 o = n.sent();
-console.log("农场等级提现数据=======>" + o);
+mk.console.logSingle("农场等级提现数据=>", o);
 if (0 != o.errcode) return [ 2, null ];
 this.changeExp = !0;
 gData.gameData.gameData.farmGradeData = o.data.userFarmGrageRewardInfo;
@@ -12823,7 +12831,7 @@ return [ 2, o ];
 });
 };
 e.prototype.addGradeExp = function(t, e) {
-void 0 === e && (e = !1);
+void 0 === e && (e = null);
 return r(this, void 0, void 0, function() {
 var o, n, a;
 return c(this, function(i) {
@@ -12837,13 +12845,13 @@ return [ 4, mk.http.sendData("farmGrade/updateFarmGrageInfo", o) ];
 case 1:
 if (0 != (n = i.sent()).errcode) return [ 2 ];
 a = n.data.userExp - gData.gameData.gameData.farmExpValue;
-if (e) {
+if (e) gData.gameData.gameStyle.doFlyExpAni(a, e, n.data); else {
 this.changeExp = !0;
 mk.tip.pop("获得" + a + "点等级经验");
-} else gData.gameData.gameStyle.doFlyExpAni(a);
 gData.gameData.gameData.gradeLevel = n.data.farmLevel;
 gData.gameData.gameData.farmExpValue = n.data.userExp;
 gData.gameData.gameData.farmGradeData = n.data.userFarmGrageRewardInfo;
+}
 return [ 2 ];
 }
 });
@@ -14251,7 +14259,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../../game/data/AdData"), l = t("../../../game/data/GameData"), p = cc._decorator, u = p.ccclass, d = (p.property, 
+var s = t("../../../game/data/AdData"), l = cc._decorator, p = l.ccclass, u = (l.property, 
 function(t) {
 a(e, t);
 function e() {
@@ -14276,18 +14284,14 @@ return c(this, function(t) {
 switch (t.label) {
 case 0:
 mk.console.log("watchAD:" + e);
-return e ? [ 4, gData.adData.watchVideo(s.AdFun.harvest) ] : [ 3, 3 ];
+return e ? [ 4, gData.adData.watchVideo(s.AdFun.harvest) ] : [ 3, 2 ];
 
 case 1:
 t.sent();
 gData.harvestData.setToEmpty();
-return [ 4, gData.farmGradeData.addGradeExp(l.ExpAddType.EAT_harvest) ];
+t.label = 2;
 
 case 2:
-t.sent();
-t.label = 3;
-
-case 3:
 return [ 2 ];
 }
 });
@@ -14306,13 +14310,12 @@ mk.ad.destoryBanner();
 e.prototype.clickClose = function() {
 mk.ui.closePanel(this.node.name);
 };
-return i([ u ], e);
+return i([ p ], e);
 }(cc.Component));
-o.default = d;
+o.default = u;
 cc._RF.pop();
 }, {
-"../../../game/data/AdData": "AdData",
-"../../../game/data/GameData": "GameData"
+"../../../game/data/AdData": "AdData"
 } ],
 HelpData: [ function(t, e, o) {
 "use strict";
@@ -19110,6 +19113,7 @@ this.data.state = s.PastureState.Empty;
 this.data.growSpan = 0;
 gData.gameData.setPastureDataMap(this.configID, this.data);
 gData.gameData.setNextProduct(!1);
+gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node);
 };
 i([ g({
 type: cc.Node,
@@ -22493,7 +22497,6 @@ mk.audio.playEffect("rewardClose");
 e = this.rewardData[t];
 o = parseInt(e.type);
 n = parseInt(e.count);
-mk.fly.PlayCoinAnim(o, 5, cc.v2(0, -300));
 switch (o) {
 case l.RewardType.redBag:
 gData.gameData.gameData.redMoney += n;

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