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

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "492c72b5-4111-48c1-b67b-c5f32a220220",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/before/view/uiItem/PlantItem.ts

@@ -105,6 +105,7 @@ export default class PlantItem extends cc.Component {
 
         if (this.data.tab == ProductType.nzw) {
             gData.farmSystem.plant(this.data.picture);
+            gData.gameData.nextMake = null;
             gData.farmSystem.selectNextFarm(false);
         }
         else {

assets/script/game/data/GameData.ts

@@ -462,7 +462,6 @@ export class GameData {
                 break;
             case 1:
                 gData.farmSystem.btnMake();
-                gData.gameData.nextMake = null;
                 this.nextMake = null;
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
@@ -471,7 +470,6 @@ export class GameData {
                 break;
             case 2:
                 gData.pastureSystem.btnMake();
-                gData.gameData.nextMake = null;
                 this.nextMake = null;
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
@@ -480,7 +478,6 @@ export class GameData {
                 break;
             case 3:
                 gData.factorySystem.btnMake();
-                gData.gameData.nextMake = null;
                 this.nextMake = null;
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();

assets/script/game/game/Game.ts

@@ -428,7 +428,7 @@ export default class Game extends cc.Component {
 
 
         let pos = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
-        mk.fly.PlayCoinAnim(4, 3, this.btn_product, pos, () => {
+        mk.fly.PlayCoinAnim(1, 3, this.btn_product, pos, () => {
             gData.gameData.init_task = true;
         }, 1)
     }

assets/script/mk/system/FlySystem.ts

@@ -38,14 +38,14 @@ export default class FlySystem extends cc.Component {
             dir = dir.normalize();
             let deltaInit = cc.v2(mk.math.random(10, 160, false) * dir.x, mk.math.random(10, 160, false) * dir.y);
             let pos = new cc.Vec2(0, -300);
-            if (startpos_node as cc.Vec2) {
-                pos = this.node.convertToNodeSpaceAR(startpos_node as cc.Vec2);
-            }
-            else {
+            if (startpos_node instanceof cc.Node) {
                 let node = startpos_node as cc.Node;
                 let world_Pos = node.parent.convertToWorldSpaceAR(node.getPosition());
                 pos = this.node.convertToNodeSpaceAR(world_Pos);
             }
+            else {
+                pos = this.node.convertToNodeSpaceAR(startpos_node as cc.Vec2);
+            }
             let initPos = pos.add(deltaInit);
             copyCoin.setPosition(pos);