1

22eb0f4b · wildfirecode · 75fb7df5 · 22eb0f4b · 75fb7df5 · 22eb0f4b
Commit 22eb0f4b authored Dec 22, 2019 by wildfirecode
7 changed files
--- a/egret/index.html
+++ b/egret/index.html
@@ -60,6 +60,7 @@
 <script src="libs/fileSave.js"></script>
 <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
 <script>
+    window.fresp=0.00001;
    // localStorage.clear();
    window['testUrl'] = 'http://cuxiaoprexg.m.cnsuning.com/scms/cx521.html?activityId=SL446689024459878400&subactivityId=SUB446689681678090240&businessid=cx521';
    window['hbRainTime'] = 30;  // 红包雨倒计时

--- a/egret/resource/assets/redbombalert/alert_yb.png
+++ b/egret/resource/assets/redbombalert/alert_yb.png
--- a/egret/resource/assets/svgas/redbomb_prize.svga
+++ b/egret/resource/assets/svgas/redbomb_prize.svga
--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
@@ -122,7 +122,7 @@ const redBombPanelName = "RedBombAlert";
 const fesChapterData: number[] = [];

 for(let i = 1; i < 999; i++) {  /// TODO 测试
-    if(i == 25 || i == 44) continue;
+    if(i == 25 || i == 44  || i == 226) continue;
    fesChapterData.push(i);
 }

@@ -749,7 +749,7 @@ export default class MainScene extends Scene {
    //初始化引导，游戏和道具
    initGuide() {
        //游戏引导
-        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121]
+        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121,226]
        if(gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
            if(!readCache(getCacheKey() + this.chapter)) {
                this.gameGuide = new GameGuide(this);
@@ -775,7 +775,7 @@ export default class MainScene extends Scene {
        if(
            fesChapterData.indexOf(this.chapter >> 0) > -1 &&
            getRedBombTimes() &&
-            // Math.random() > 0.4 &&
+            Math.random() > (window['fresp'] || 0.4) &&
            this.lattices[festivalIndex] &&   //格子必须有
            (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element)  //没有元素也行
        ) {

--- a/egret/src/something/chapters/Chapter12.ts
+++ b/egret/src/something/chapters/Chapter12.ts
@@ -282,7 +282,20 @@ export const Chapters12: ChapterData[] = [

                2, 1, 1, 3, 3, 3, 1, 1, 2,

-                2, 1, 1, 1, 1, 1, 1, 1, 2], connectedLats: [[18, 54], [28, 46], [13, 31], [49, 67], [34, 52], [26, 62]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 }]
+                2, 1, 1, 1, 1, 1, 1, 1, 2],
+            connectedLats: [[18, 54], [28, 46], [13, 31], [49, 67], [34, 52], [26, 62]],
+            elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+            baseElements: [
+                10,10,20,20,30,30,40,40,50,
+50,50,40,40,30,30,20,20,10,
+30,10,20,20,10,10,50,50,40,
+40,40,30,30,20,30,50,40,10,
+20,20,50,50,40,40,30,20,50,
+10,10,20,20,30,30,40,40,50,
+50,50,40,40,30,30,20,20,10,
+30,10,20,20,10,10,50,50,40,
+40,40,30,30,20,30,50,40,10],
+            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 }]
        }
    },
    //227
@@ -551,8 +564,8 @@ export const Chapters12: ChapterData[] = [

                3, 3, 3, 3, 0, 3, 3, 3, 3,

-                3, 3, 3, 3, 1, 3, 3, 3, 3], 
-                connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 5, 4, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 4, 5, 4, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 4, 5, 4, 1, 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: 14, type: null }, { index: 15, type: null }, { index: 16, type: null }, { index: 17, type: null }]
+                3, 3, 3, 3, 1, 3, 3, 3, 3],
+            connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 5, 4, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 4, 5, 4, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 4, 5, 4, 1, 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: 14, type: null }, { index: 15, type: null }, { index: 16, type: null }, { index: 17, type: null }]
        }
    },
    //238
@@ -589,8 +602,8 @@ export const Chapters12: ChapterData[] = [

                2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 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, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 31, 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: 76, type: null }, { index: 77, type: null }, { index: 78, type: null }] 
+            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: 76, type: null }, { index: 77, type: null }, { index: 78, type: null }]
        }
    },
    //239

--- a/egret/src/something/chapters/getChapter.ts
+++ b/egret/src/something/chapters/getChapter.ts
@@ -53,29 +53,29 @@ var a = {
 };

 // 取数据格式用，一般情况注释
-(function exportFile(chapters: ChapterData[]) {
-    var obj = []
-    for (var i = 1; i < chapters.length; i++) {
-        var chapter: ChapterData = chapters[i]
-        var target: PassTargetData = chapter.passTarget
-        var a: any = {};
-        a["lev"] = i;
-        a["tar"] = [];
-        if (target.type == PassType.SCORE_TARGET) {
-            a["tar"].push({ "type": 1, "num": target.score })
-        } else {
-            for (var j = 0; j < target.elements.length; j++) {
-                var element = target.elements[j];
-                a["tar"].push({ "type": submitTran[element.type], "num": element.count })
-            }
-        }
+// (function exportFile(chapters: ChapterData[]) {
+//     var obj = []
+//     for (var i = 1; i < chapters.length; i++) {
+//         var chapter: ChapterData = chapters[i]
+//         var target: PassTargetData = chapter.passTarget
+//         var a: any = {};
+//         a["lev"] = i;
+//         a["tar"] = [];
+//         if (target.type == PassType.SCORE_TARGET) {
+//             a["tar"].push({ "type": 1, "num": target.score })
+//         } else {
+//             for (var j = 0; j < target.elements.length; j++) {
+//                 var element = target.elements[j];
+//                 a["tar"].push({ "type": submitTran[element.type], "num": element.count })
+//             }
+//         }

-        a["one"] = chapter.starScores[0];
-        a["two"] = chapter.starScores[1];
-        a["three"] = chapter.starScores[2];
+//         a["one"] = chapter.starScores[0];
+//         a["two"] = chapter.starScores[1];
+//         a["three"] = chapter.starScores[2];

-        obj.push(a)
-    }
-    var file = new File([JSON.stringify(obj)], "cfg.json", { type: "text/plain;charset=utf-8" });
-    window["saveAs"](file);
-})(chapters)
\ No newline at end of file
+//         obj.push(a)
+//     }
+//     var file = new File([JSON.stringify(obj)], "cfg.json", { type: "text/plain;charset=utf-8" });
+//     window["saveAs"](file);
+// })(chapters)
\ No newline at end of file
--- a/egret/src/something/uis/GameGuide.ts
+++ b/egret/src/something/uis/GameGuide.ts
@@ -367,6 +367,21 @@ const chapterFuns = {
        msg: [
            "需用特效将褐色毛球分裂成\n两个灰色毛球，才能将它消除"
        ]
+    },
+    226:{
+        stepCount: 1,
+        showIndexs: [
+            [29,30,31,32],
+        ],
+        hideIndexs: [
+            [ 29,30],
+        ],
+        handIndexs: [
+            [31,32],
+        ],
+        msg: [
+           "每走三步都会翻转的石门！\n在石门开启的时候赶快消除吧～"
+        ]
    }
 }