Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

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

@@ -11483,7 +11483,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/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), N = t("../../before/view/data/ADClearSickData"), x = t("../../before/main/PastureSystem"), F = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = 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/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), N = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = function() {
 function t() {
 this.init();
 }
@@ -11516,8 +11516,8 @@ this.adUnlockData = new I.default();
 this.plantData = new T.default();
 this.harvestData = new C.default();
 this.adClearSickData = new N.default();
-this.pastureSystem = new x.default();
-this.factorySystem = new F.default();
+this.pastureSystem = new F.default();
+this.factorySystem = new x.default();
 this.farmSystem = new R.FarmSystem();
 this.farmMapData = new M.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
@@ -13203,6 +13203,7 @@ e.ani_add = null;
 e.node_hand = null;
 e.sp_gradeName = null;
 e.ani_add2 = null;
+e.ani_add3 = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
@@ -13440,8 +13441,9 @@ mk.data.sendDataEvent(l.DataEventId.button_click, "任务红包icon");
 };
 e.prototype.onClickPlant = function() {
 return r(this, void 0, void 0, function() {
-return c(this, function(t) {
-switch (t.label) {
+var t, e, o;
+return c(this, function(n) {
+switch (n.label) {
 case 0:
 mk.audio.playEffect("button");
 if (gData.gameData.leftTimes <= 0) {
@@ -13455,7 +13457,24 @@ return [ 2 ];
 return [ 4, gData.gameData.makeProduct() ];
 
 case 1:
-t.sent() && this.dpFlyRedAni();
+if (n.sent()) {
+if (gData.gameData.playerProp.userFarmTaskInfo) {
+t = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+(o = cc.instantiate(this.ani_add3)).parent = this.ani_add3.parent;
+o.getComponent(cc.Label).string = "百元红包:" + t + "/" + e;
+cc.tween(o).call(function() {
+o.opacity = 255;
+}).by(.8, {
+y: 100
+}).to(.4, {
+opacity: 0
+}).call(function() {
+o.destroy();
+}).start();
+}
+this.dpFlyRedAni();
+}
 return [ 2 ];
 }
 });
@@ -13595,6 +13614,10 @@ i([ d({
 type: cc.Node,
 displayName: "增加效果文本2"
 }) ], e.prototype, "ani_add2", void 0);
+i([ d({
+type: cc.Node,
+displayName: "增加效果文本3"
+}) ], e.prototype, "ani_add3", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = f;
@@ -20379,6 +20402,7 @@ e.eatNode = null;
 e.countDown = null;
 e.showGroup = null;
 e.idleAni = null;
+e.node_ani = null;
 e.animalsArr = new Array();
 e.configID = 0;
 e.sortID = 0;
@@ -20555,9 +20579,9 @@ return [ 2 ];
 };
 e.prototype.onEat = function() {
 return r(this, void 0, void 0, function() {
-var t, e, o;
-return c(this, function(n) {
-switch (n.label) {
+var t, e, o, n, a, i;
+return c(this, function(r) {
+switch (r.label) {
 case 0:
 if (gData.gameData.leftTimes <= 0) {
 mk.ui.openPanel("module/speedUpUI/productReward");
@@ -20578,11 +20602,26 @@ gData.gameData.isProducting = !1;
 return [ 4, gData.gameData.updateNewTaskProgress() ];
 
 case 1:
-if (n.sent()) {
-o = this.eatNode.parent.convertToWorldSpaceAR(this.eatNode.getPosition());
-gData.gameData.gameStyle.dpFlyRedAni(o);
+if (r.sent()) {
+if (gData.gameData.playerProp.userFarmTaskInfo) {
+o = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+n = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+(a = cc.instantiate(this.node_ani)).parent = this.node_ani.parent;
+a.getComponent(cc.Label).string = "百元红包:" + o + "/" + n;
+cc.tween(a).call(function() {
+a.opacity = 255;
+}).by(.8, {
+y: 100
+}).to(.4, {
+opacity: 0
+}).call(function() {
+a.destroy();
+}).start();
 }
-n.label = 2;
+i = this.eatNode.parent.convertToWorldSpaceAR(this.eatNode.getPosition());
+gData.gameData.gameStyle.dpFlyRedAni(i);
+}
+r.label = 2;
 
 case 2:
 return [ 2 ];
@@ -20640,6 +20679,10 @@ i([ g({
 type: cc.Node,
 tooltip: "闲置动画"
 }) ], e.prototype, "idleAni", void 0);
+i([ g({
+type: cc.Node,
+tooltip: "文字动画"
+}) ], e.prototype, "node_ani", void 0);
 return i([ y ], e);
 }(cc.Component);
 o.default = m;
@@ -20911,6 +20954,7 @@ e.labUnlock = null;
 e.lbl_progress = null;
 e.node_plant = null;
 e.node_product = null;
+e.node_ani = null;
 e.data = null;
 return e;
 }
@@ -20991,9 +21035,9 @@ return [ 2 ];
 };
 e.prototype.clickMake = function() {
 return r(this, void 0, void 0, function() {
-var t;
-return c(this, function(e) {
-switch (e.label) {
+var t, e, o, n;
+return c(this, function(a) {
+switch (a.label) {
 case 0:
 mk.audio.playEffect("button");
 if (gData.gameData.leftTimes <= 0) {
@@ -21012,9 +21056,24 @@ gData.gameData.setNextProduct(!1);
 return [ 4, gData.gameData.updateNewTaskProgress(!0) ];
 
 case 1:
-if (e.sent()) {
-t = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
-gData.gameData.gameStyle.dpFlyRedAni(t);
+if (a.sent()) {
+if (gData.gameData.playerProp.userFarmTaskInfo) {
+t = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+(o = cc.instantiate(this.node_ani)).parent = this.node_ani.parent;
+o.getComponent(cc.Label).string = "百元红包:" + t + "/" + e;
+cc.tween(o).delay(.7).call(function() {
+o.opacity = 255;
+}).by(.8, {
+y: 100
+}).to(.4, {
+opacity: 0
+}).call(function() {
+o.destroy();
+}).start();
+}
+n = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
+gData.gameData.gameStyle.dpFlyRedAni(n);
 }
 return [ 2 ];
 }
@@ -21080,6 +21139,10 @@ type: cc.Node
 i([ d({
 type: cc.Node
 }) ], e.prototype, "node_product", void 0);
+i([ d({
+type: cc.Node,
+tooltip: "文字动画"
+}) ], e.prototype, "node_ani", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = h;
@@ -21777,6 +21840,9 @@ this.node_complete.active = !0;
 }
 this.lbl_progress.string = t + "/" + e;
 this.sp_taskProgress.fillRange = t / e;
+} else {
+this.node_1.active = !1;
+this.node_2.active = !0;
 }
 }
 gData.gameData.init_productTask = !1;

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