Merge branch 'release' into develop

2018-03-13 21:00:00 +00:00
parent ee1aa653f0 0e6d6336c6
commit b662f8bdff
177 changed files with 10404 additions and 11429 deletions
@@ -904,7 +904,7 @@
        this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey});

        this.closeHatchPetDialog();
-        this.$root.$emit('hatchedPet::open', pet);
+        // this.$root.$emit('hatchedPet::open', pet);
      },

      onDragStart (ev, food) {