Merge branch 'hotfix_klm0327' into dev

egret/src/panels/help/HelpBloodPanel.ts

@@ -49,6 +49,11 @@ export default class HelpBloodPanel extends Panel {
         this.addChild(this['closeBtn']);
     }
 
+    onTouchTap_closeBtn() {
+        this.netCallback();
+        this.hidePanel();
+    }
+
     onclick_gobtn() {
         if (this.success)
             NetManager.ins.clickLog(getlogItem(88));

egret/src/panels/help/HelpInvitePanel.ts

@@ -60,6 +60,11 @@ export default class HelpInvitePanel extends Panel {
         // })
     }
 
+    onTouchTap_closeBtn() {
+        this.netCallback();
+        this.hidePanel();
+    }
+
     onclick_gobtn() {
         // NetManager.ins.clickLog(getlogItem(88));
         this.hidePanel();

egret/src/panels/help/HelpScratchPanel.ts

@@ -95,6 +95,7 @@ export default class HelpScratchPanel extends Panel {
 
     onclick_closeBtn() {
         this.hidePanel();
+        this.netCallback();
     }
     onclick_gobtn1() {
         this.hidePanel();

egret/src/something/chapters/Chapter21.ts

@@ -136,7 +136,6 @@ export const Chapters21: ChapterData[] = [
       1, 2, 1, 14, 2, 14, 2, 2, 1,
       1, 1, 2, 2, 2, 2, 2, 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: 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: 18, type: null }, { index: 26, type: null } ] } },   
    
-   
    //541
    { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [ { type: 1, count: 99 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1 ], connectedLats: [], conveyor: [ [ 27, 29 ], [ 30, 75 ] ], conveyorConnectedLats: [ [ 29, 30 ], [ 75, 27 ] ], 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, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 1, 7, 1, 1, 1, 1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 7, 1, 7, 1, 1, 7, 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 18, type: null }, { index: 27, type: null }, { index: 28, type: null }, { index: 29, type: null }, { index: 30, type: null } ] } },
    //542