1

egret/src/mainScene/MainScene.ts

@@ -1798,7 +1798,8 @@ export default class MainScene extends Scene {
         }
         //其中一个是魔力鸟
         if (s.effectType == EffectType.MAGICLION || o.effectType == EffectType.MAGICLION) {
-            if (s.type == ElementType.LOLLIPOP || o.type == ElementType.LOLLIPOP) {
+            if (s.type == ElementType.LOLLIPOP || o.type == ElementType.LOLLIPOP
+                || s.monster || o.monster) {
                 return false
             } else {
                 this.isManual = true;

egret/src/mainScene/jellyMonsterAI.ts

@@ -73,7 +73,10 @@ function judgeActionIndex(index: number, lattices: Lattice[]): number {
         var rand = Math.floor(Math.random() * arr.length);//随机4个方向
         var i = arr.splice(rand, 1)[0];
         if (Tool.judgeBaseEle(lattices[i]) &&
-            !lattices[i].element.hasAnyState() && !lattices[i].element.candy) {
+            !lattices[i].element.hasAnyState() 
+            && !lattices[i].element.candy
+            && !lattices[i].element.monster
+            ) {
             return i
         }
     }

egret/src/something/Tool.ts

@@ -465,6 +465,7 @@ export class Tool {
             ele.hasState(StateType.LOCK) ||
             ele.hasState(StateType.HAIRBALLGREY) ||
             ele.hasState(StateType.BLOCK_LOCK) ||
+            ele.monster ||
             ele.hasState(StateType.HAIRBALLBLACK) ||
             ele.hasState(StateType.HAIRBALLBROWN)
         ) {

egret/src/something/logic/AiControl.ts

@@ -319,6 +319,7 @@ export class AiControl {
             //是基础元素，但是不能有任何状态，去掉鸡
             if (Tool.judgeBaseEle(lat) &&
                 !lat.element.hasAnyState() &&
+                !lat.element.monster &&
                 lat.element.type !== ElementType.CHICKEN
             ) {
                 chickenIndexs.push(a);
@@ -736,7 +737,10 @@ function judgeActionIndex(index: number, lattices: Lattice[]): number {
         var rand = Math.floor(Math.random() * arr.length);
         var i = arr.splice(rand, 1)[0];
         if (Tool.judgeBaseEle(lattices[i]) &&
-            !lattices[i].element.hasAnyState() && !lattices[i].element.candy) {
+            !lattices[i].element.hasAnyState() && 
+            !lattices[i].element.candy &&
+            !lattices[i].element.monster
+            ) {
             return i
         }
     }