1

egret/src/mainScene/MainScene.ts

@@ -772,7 +772,7 @@ export default class MainScene extends Scene {
         if(
             fesChapterData.indexOf(this.chapter >> 0) > -1 &&
             getRedBombTimes() &&
-            Math.random() > 0.4 &&
+            // Math.random() > 0.4 &&
             this.lattices[festivalIndex] &&   //格子必须有
             (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element)  //没有元素也行
         ) {
@@ -2883,7 +2883,7 @@ export default class MainScene extends Scene {
         });
         //如果附近有节日小红包
         this.checkNebEle(latttice, (lat) => {
-            return lat && lat.element && lat.element.type == ElementType.FESTIVALELE_SMALL;
+            return lat && lat.element && lat.element.type == ElementType.FESTIVALELE_SMALL && (!lat.block || !lat.block.isLock());
         });
     }
 

egret/src/something/Tool.ts

@@ -383,8 +383,8 @@ export class Tool {
      */
     public static judgeSetFesEle(lat: Lattice) {
         if (Tool.judgeBaseEle(lat) &&  //基础元素
+            !lat.block && 
             !lat.element.hasState(StateType.HAIRBALLGREY) &&  //不带毛球，下同
-            !lat.element.hasState(StateType.BLOCK_LOCK) &&
             !lat.element.hasState(StateType.HAIRBALLBLACK) &&
             !lat.element.hasState(StateType.HAIRBALLBROWN)
         ) {

egret/src/something/chapters/Chapter12.ts

@@ -263,7 +263,7 @@ export const Chapters12: ChapterData[] = [
     },
     //226
     {
-        baseElementTypes: [4, 3, 2, 0, 1], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [{ type: 9, count: 29 }] }, starScores: [12000, 18000, 22000], map: {
+        baseElementTypes: [4, 3, 2, 0, 1], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [{ type: 9, count: 28 }] }, starScores: [12000, 18000, 22000], map: {
             lattices: [
 
                 2, 1, 1, 1, 1, 1, 1, 1, 2,

egret/src/something/chapters/Chapter13.ts

@@ -22,7 +22,7 @@ export const Chapters13: ChapterData[] = [
 
                 1, 3, 1, 1, 6, 1, 1, 3, 1,
 
-                3, 1, 3, 6, 1, 6, 3, 1, 3,
+                3, 1, 3, 6, 6, 6, 3, 1, 3,
 
                 1, 3, 1, 1, 6, 1, 1, 3, 1,
 
@@ -30,7 +30,9 @@ export const Chapters13: ChapterData[] = [
 
                 0, 1, 61, 61, 1, 61, 61, 1, 0,
 
-                0, 0, 1, 1, 3, 1, 1, 0, 0], connectedLats: [], elements: [1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 7, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 2, 1, 2, 7, 2, 2, 7, 2, 2, 7, 2, 5, 2, 7, 5, 2, 5, 7, 2, 5, 2, 2, 7, 5, 2, 5, 7, 2, 2, 1, 5, 2, 2, 7, 2, 2, 5, 1, 1, 1, 5, 5, 2, 5, 5, 1, 1], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }]
+                0, 0, 1, 1, 3, 1, 1, 0, 0], 
+                connectedLats: [], elements:
+                [1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 7, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 2, 1, 2, 7, 2, 2, 7, 2, 2, 7, 2, 5, 2, 7, 5, 2, 5, 7, 2, 5, 2, 2, 7, 5, 2, 5, 7, 2, 2, 1, 5, 2, 2, 7, 2, 2, 5, 1, 1, 1, 5, 5, 2, 5, 5, 1, 1], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }]
         }
     },
     //243

egret/src/something/logic/AiControl.ts

@@ -112,7 +112,8 @@ export class AiControl {
             var lat = thisObj.lattices[a];
             //是基础元素，但是不能有任何状态,  考虑修改小红包属性为可fall，
             if (Tool.judgeBaseEle(lat) &&
-                !lat.element.hasAnyState()
+                !lat.element.hasAnyState() &&
+                (!lat.block || !lat.block.isLock()) //如果是石门的话，石门必须是开启的状态
             ) {
                 redIndexs.push(a);
             }