Merge branch 'hotfix20200331_' of...

Merge branch 'hotfix20200331_' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into hotfix20200331 # Conflicts: # egret/src/something/chapters/Chapter22.ts 合并master

Merge branch 'hotfix20200331_' of...
Merge branch 'hotfix20200331_' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into hotfix20200331 # Conflicts: # egret/src/something/chapters/Chapter22.ts 合并master
e112bb69 · zjz1994 · 13da983c · 9afe448d · e112bb69 · e112bb69
Commit e112bb69 authored Mar 31, 2020 by zjz1994
40 changed files
--- a/egret/libs/new_wx/MainBase.ts
+++ b/egret/libs/new_wx/MainBase.ts
@@ -81,6 +81,7 @@ import BackIndexPanel from "../../src/panels/BackIndexPanel";
 import HelpBloodPanel from "../../src/panels/help/HelpBloodPanel";
 import HelpInvitePanel from "../../src/panels/help/HelpInvitePanel";
 import HelpScratchPanel from "../../src/panels/help/HelpScratchPanel";
+import HelpInvitePanel2 from "../../src/panels/help/HelpInvitePanel2";
 export default class MainBase extends eui.UILayer {
    constructor() {
@@ -171,6 +172,7 @@ export default class MainBase extends eui.UILayer {
            ['recharge', { cls: RechargePanel }],
            ['HelpBloodPanel', { cls: HelpBloodPanel }],
            ['HelpInvitePanel', { cls: HelpInvitePanel }],
+            ['HelpInvitePanel2', { cls: HelpInvitePanel2 }],
            ['HelpScratchPanel', { cls: HelpScratchPanel }],
        ];

--- a/egret/publish.js
+++ b/egret/publish.js
@@ -24,8 +24,8 @@ class TuiaAutoUpload {
        var _this = this;
        this.client = new OSS({
            region: 'oss-cn-hangzhou',
-            accessKeyId: 'LTAIqO2wblIxQvwc',
+            accessKeyId: 'LTAI4Fw25WcfcGv7FvcHoiHK',
-            accessKeySecret: '4brsaSRbRpjxw3oDIxJi6bNMcndIR6',
+            accessKeySecret: 'NZk1NtT9J5HFaAolNbtQdzTzLLvLYm',
            bucket: _this.type === 'prod' ? 'duiba' : 'daily-duiba'
        });
        this.bar = new ProgressBar(chalk.yellow(`  文件上传中 [:bar] :current/${this.files().length} :percent :elapseds`), {

--- a/egret/resource/TextureMerger/common.tmproject
+++ b/egret/resource/TextureMerger/common.tmproject
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/arrowbg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png"]}
\ No newline at end of file
--- a/egret/resource/TextureMerger/helpGroup.tmproject
+++ b/egret/resource/TextureMerger/helpGroup.tmproject
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"helpGroup","version":5,"files":["../assets/help/help_invite2.png","../assets/help/help_invite2_text4.png","../assets/help/help_invite2_text3.png","../assets/help/help_invite2_text2.png","../assets/help/help_invite2_text.png","../assets/help/help_invite2_btn2.png","../assets/help/help_invite2_btn.png","../assets/help/help_invite_text.png","../assets/help/help_invite_success.png","../assets/help/help_invite_success_txt.png","../assets/help/help_invite_success_btn.png","../assets/help/help_invite_fail.png","../assets/help/help_invite_fail_text4.png","../assets/help/help_invite_fail_text3.png","../assets/help/help_invite_fail_text2.png","../assets/help/help_invite_fail_text1.png","../assets/help/help_invite_fail_btn.png","../assets/help/help_invite_btn1.png","../assets/help/help_invite_bg.png","../assets/help/help_closebtn1.png","../assets/help/help_blood_success.png","../assets/help/help_blood_success_text2.png","../assets/help/help_blood_success_text.png","../assets/help/help_blood_fail.png","../assets/help/help_blood_fail_text4.png","../assets/help/help_blood_fail_text3.png","../assets/help/help_blood_fail_text2.png","../assets/help/help_blood_fail_text.png","../assets/help/help_blood_fail_btn.png","../assets/help/help_blood_1_text.png","../assets/help/help_blood_1_btn.png","../assets/help/help_blood_1_bg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"helpGroup","version":5,"files":["../assets/help/help_invite2_text4.png","../assets/help/help_invite2_text3.png","../assets/help/help_invite2_text2.png","../assets/help/help_invite2_text.png","../assets/help/help_invite2_btn2.png","../assets/help/help_invite2_btn.png","../assets/help/help_invite_text.png","../assets/help/help_invite_success_txt.png","../assets/help/help_invite_success_btn.png","../assets/help/help_invite_fail_text4.png","../assets/help/help_invite_fail_text3.png","../assets/help/help_invite_fail_text2.png","../assets/help/help_invite_fail_text1.png","../assets/help/help_invite_fail_btn.png","../assets/help/help_invite_btn1.png","../assets/help/help_invite_bg.png","../assets/help/help_closebtn1.png","../assets/help/help_blood_success_text2.png","../assets/help/help_blood_success_text.png","../assets/help/help_blood_fail_text4.png","../assets/help/help_blood_fail_text3.png","../assets/help/help_blood_fail_text2.png","../assets/help/help_blood_fail_text.png","../assets/help/help_blood_fail_btn.png","../assets/help/help_blood_1_text.png","../assets/help/help_blood_1_btn.png","../assets/help/help_card_prize.png","../assets/help/help_light.png","../assets/help/help_card_bg.png"]}
\ No newline at end of file
--- a/egret/resource/TextureMerger/main2.tmproject
+++ b/egret/resource/TextureMerger/main2.tmproject
--- a/egret/resource/TextureMerger/preload.tmproject
+++ b/egret/resource/TextureMerger/preload.tmproject
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/help/help_light.png"]}
\ No newline at end of file
--- a/egret/resource/assets/common/common_closebtn2.png
+++ b/egret/resource/assets/common/common_closebtn2.png
--- a/egret/resource/assets/help/help_blood_1_bg.png
+++ b/egret/resource/assets/help/help_blood_1_bg.png
--- a/egret/resource/assets/help/help_blood_fail.png
+++ b/egret/resource/assets/help/help_blood_fail.png
--- a/egret/resource/assets/help/help_blood_success.png
+++ b/egret/resource/assets/help/help_blood_success.png
--- a/egret/resource/assets/help/help_card_bg.png
+++ b/egret/resource/assets/help/help_card_bg.png
--- a/egret/resource/assets/help/help_card_prize.png
+++ b/egret/resource/assets/help/help_card_prize.png
--- a/egret/resource/assets/help/help_invite2.png
+++ b/egret/resource/assets/help/help_invite2.png
--- a/egret/resource/assets/help/help_invite_fail.png
+++ b/egret/resource/assets/help/help_invite_fail.png
--- a/egret/resource/assets/help/help_invite_success.png
+++ b/egret/resource/assets/help/help_invite_success.png
--- a/egret/resource/assets/help/help_light.png
+++ b/egret/resource/assets/help/help_light.png
--- a/egret/resource/assets/svgas/blood_fail.svga
+++ b/egret/resource/assets/svgas/blood_fail.svga
--- a/egret/resource/assets/svgas/blood_standby.svga
+++ b/egret/resource/assets/svgas/blood_standby.svga
--- a/egret/resource/assets/svgas/blood_success.svga
+++ b/egret/resource/assets/svgas/blood_success.svga
--- a/egret/resource/assets/svgas/bloodbg.svga
+++ b/egret/resource/assets/svgas/bloodbg.svga
--- a/egret/resource/assets/svgas/scratch_fail.svga
+++ b/egret/resource/assets/svgas/scratch_fail.svga
--- a/egret/resource/assets/svgas/scratch_standby.svga
+++ b/egret/resource/assets/svgas/scratch_standby.svga
--- a/egret/resource/assets/svgas/scratch_success.svga
+++ b/egret/resource/assets/svgas/scratch_success.svga
--- a/egret/resource/default.res.json
+++ b/egret/resource/default.res.json
@@ -81,7 +81,7 @@
 			"name": "signprize"
 		},
 		{
-			"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,arrowbg_png",
+			"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,arrowbg_png,common_closebtn2_png",
 			"name": "common"
 		},
 		{
@@ -241,7 +241,7 @@
 			"name": "eleDisNew"
 		},
 		{
-			"keys": "help_invite2_png,help_invite2_text4_png,help_invite2_text3_png,help_invite2_text2_png,help_invite2_text_png,help_invite2_btn2_png,help_invite2_btn_png,help_invite_text_png,help_invite_success_png,help_invite_success_txt_png,help_invite_success_btn_png,help_invite_fail_png,help_invite_fail_text4_png,help_invite_fail_text3_png,help_invite_fail_text2_png,help_invite_fail_text1_png,help_invite_fail_btn_png,help_invite_btn1_png,help_invite_bg_png,help_closebtn1_png,help_blood_success_png,help_blood_success_text2_png,help_blood_success_text_png,help_blood_fail_png,help_blood_fail_text4_png,help_blood_fail_text3_png,help_blood_fail_text2_png,help_blood_fail_text_png,help_blood_fail_btn_png,help_blood_1_text_png,help_blood_1_btn_png,help_blood_1_bg_png",
+			"keys": "help_invite2_text4_png,help_invite2_text3_png,help_invite2_text2_png,help_invite2_text_png,help_invite2_btn2_png,help_invite2_btn_png,help_invite_text_png,help_invite_success_txt_png,help_invite_success_btn_png,help_invite_fail_text4_png,help_invite_fail_text3_png,help_invite_fail_text2_png,help_invite_fail_text1_png,help_invite_fail_btn_png,help_invite_btn1_png,help_invite_bg_png,help_closebtn1_png,help_blood_success_text2_png,help_blood_success_text_png,help_blood_fail_text4_png,help_blood_fail_text3_png,help_blood_fail_text2_png,help_blood_fail_text_png,help_blood_fail_btn_png,help_blood_1_text_png,help_blood_1_btn_png,help_card_prize_png,help_light_png,help_card_bg_png",
 			"name": "helpGroup"
 		}
 	],
@@ -4962,11 +4962,6 @@
 			"type": "image",
 			"name": "help_blood_1_text_png"
 		},
-		{
-			"url": "assets/help/help_blood_1_bg.png",
-			"type": "image",
-			"name": "help_blood_1_bg_png"
-		},
 		{
 			"url": "assets/help/help_blood_fail_text.png",
 			"type": "image",
@@ -4977,11 +4972,6 @@
 			"type": "image",
 			"name": "help_blood_fail_btn_png"
 		},
-		{
-			"url": "assets/help/help_blood_fail.png",
-			"type": "image",
-			"name": "help_blood_fail_png"
-		},
 		{
 			"url": "assets/help/help_blood_success_text.png",
 			"type": "image",
@@ -4992,11 +4982,6 @@
 			"type": "image",
 			"name": "help_blood_success_text2_png"
 		},
-		{
-			"url": "assets/help/help_blood_success.png",
-			"type": "image",
-			"name": "help_blood_success_png"
-		},
 		{
 			"url": "assets/help/help_invite_bg.png",
 			"type": "image",
@@ -5007,11 +4992,6 @@
 			"type": "image",
 			"name": "help_invite_success_btn_png"
 		},
-		{
-			"url": "assets/help/help_invite_success.png",
-			"type": "image",
-			"name": "help_invite_success_png"
-		},
 		{
 			"url": "assets/help/help_invite_fail_btn.png",
 			"type": "image",
@@ -5037,11 +5017,6 @@
 			"type": "image",
 			"name": "help_invite_fail_text4_png"
 		},
-		{
-			"url": "assets/help/help_invite_fail.png",
-			"type": "image",
-			"name": "help_invite_fail_png"
-		},
 		{
 			"url": "assets/help/help_invite2_text.png",
 			"type": "image",
@@ -5052,11 +5027,6 @@
 			"type": "image",
 			"name": "help_invite2_btn_png"
 		},
-		{
-			"url": "assets/help/help_invite2.png",
-			"type": "image",
-			"name": "help_invite2_png"
-		},
 		{
 			"url": "assets/help/help_invite2_btn2.png",
 			"type": "image",
@@ -5113,14 +5083,34 @@
 			"name": "help_invite_btn1_png"
 		},
 		{
-			"url": "assets/mainScene/ele38.png",
+			"url": "assets/help/help_light.png",
 			"type": "image",
-			"name": "ele38_png"
+			"name": "help_light_png"
+		},
+		{
+			"url": "assets/help/help_card_prize.png",
+			"type": "image",
+			"name": "help_card_prize_png"
+		},
+		{
+			"url": "assets/help/help_card_bg.png",
+			"type": "image",
+			"name": "help_card_bg_png"
+		},
+		{
+			"url": "assets/common/common_closebtn2.png",
+			"type": "image",
+			"name": "common_closebtn2_png"
 		},
 		{
 			"url": "assets/mainScene/ele39.png",
 			"type": "image",
 			"name": "ele39_png"
+		},
+		{
+			"url": "assets/mainScene/ele38.png",
+			"type": "image",
+			"name": "ele38_png"
 		}
 	]
 }
\ No newline at end of file
--- a/egret/resource/default.thm.json
+++ b/egret/resource/default.thm.json
@@ -2,9 +2,6 @@
 	"skins": {},
 	"autoGenerateExmlsList": true,
 	"exmls": [
-        "resource/skins/HelpScratchSkin.exml",
-        "resource/skins/HelpBloodSkin.exml",
-        "resource/skins/HelpInviteSkin.exml",
 		"resource/skins/ADSkin.exml",
 		"resource/skins/ADSmallSkin.exml",
 		"resource/skins/AlertSkin.exml",
@@ -35,6 +32,9 @@
 		"resource/skins/HbNoPrizeSkin.exml",
 		"resource/skins/HbPrizeSkin.exml",
 		"resource/skins/HbRuleSkin.exml",
+		"resource/skins/HelpBloodSkin.exml",
+		"resource/skins/HelpInviteSkin.exml",
+		"resource/skins/HelpScratchSkin.exml",
 		"resource/skins/IconButtonSkin.exml",
 		"resource/skins/InviteCutTimePanelSkin.exml",
 		"resource/skins/InviteItemSkin.exml",

--- a/egret/resource/skins/HelpBloodSkin.exml
+++ b/egret/resource/skins/HelpBloodSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="HelpBloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image source="help_blood_1_bg_png" y="26" horizontalCenter="0" visible="false"/>
+	<e:Group id="g1" y="-250"> </e:Group>
 	<e:Group y="855" horizontalCenter="0">
 		<e:Image id="helpbtn" source="help_blood_1_btn_png" x="0" y="0"/>
 		<e:Image id="gobtn" source="help_blood_fail_btn_png" x="0" y="0" visible="false"/>
 	</e:Group>
-	<e:Group y="108" width="100%" horizontalCenter="0">
+	<e:Group y="128" width="100%" horizontalCenter="0">
 		<e:Image id="txt_standby" source="help_blood_1_text_png" y="0" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_success" source="help_blood_success_text2_png" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_error2002002026" source="help_blood_fail_text_png" horizontalCenter="0" visible="false"/>
@@ -13,4 +13,5 @@
 		<e:Image id="txt_error2002002036" source="help_blood_fail_text3_png" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_error2002002025" source="help_blood_fail_text4_png" horizontalCenter="0" visible="false"/>
 	</e:Group>
+	<e:Image id="closeBtn" x="613" y="200" anchorOffsetX="2" source="common_closebtn2_png"/>
 </e:Skin>
\ No newline at end of file
--- a/egret/resource/skins/HelpInviteSkin.exml
+++ b/egret/resource/skins/HelpInviteSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="HelpInviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Group id="g1"> </e:Group>
-	<e:Image y="26" horizontalCenter="0" source="help_invite2_png" visible="false"/>
 	<e:Group y="1000" horizontalCenter="0">
 		<e:Image id="helpbtn" x="0" y="0" source="help_invite2_btn_png"/>
 		<e:Image id="gobtn" x="0" y="0" source="help_invite2_btn2_png" visible="false"/>
@@ -12,4 +11,5 @@
 		<e:Image id="txt_error0200202" horizontalCenter="0" source="help_invite2_text3_png" visible="false"/>
 		<e:Image id="txt_error400017" horizontalCenter="0" source="help_invite2_text4_png" visible="false"/>
 	</e:Group>
+	<e:Image id="closeBtn" source="common_closebtn2_png" x="613" y="200" anchorOffsetX="2"/>
 </e:Skin>
\ No newline at end of file
--- a/egret/resource/skins/HelpScratchSkin.exml
+++ b/egret/resource/skins/HelpScratchSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="HelpScratchSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image y="240" horizontalCenter="0" source="help_invite_bg_png"/>
+	<e:Image id="light" source="help_light_png" y="401.34" x="381.82" anchorOffsetX="381.82" anchorOffsetY="421.22"/>
-	<e:Group y="695" horizontalCenter="0">
+	<e:Image y="352.12" horizontalCenter="0" source="help_invite_bg_png"/>
+	<e:Group y="807.12" horizontalCenter="0">
 		<e:Image id="helpbtn" y="0" source="help_invite_btn1_png" horizontalCenter="0"/>
 		<e:Image id="go2btn" x="0" y="0" source="help_invite_fail_btn_png" visible="false"/>
 		<e:Image id="go1btn" source="help_invite_success_btn_png" horizontalCenter="0" visible="false"/>
 	</e:Group>
-	<e:Group y="294" width="100%" horizontalCenter="0">
+	<e:Group y="406.12" width="100%" horizontalCenter="0">
 		<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite_text_png" visible="false"/>
 		<e:Image id="txt_success" horizontalCenter="0" source="help_invite_success_txt_png" visible="false"/>
-		<e:Image id="txt_error0000024" source="help_invite_fail_text1_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error0000024" horizontalCenter="0" source="help_invite_fail_text4_png" visible="false"/>
 		<e:Image id="txt_error0000022" source="help_invite_fail_text2_png" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_error0000023" source="help_invite_fail_text3_png" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_errorxxxx" horizontalCenter="0" source="help_invite_fail_text4_png" visible="false"/>
 	</e:Group>
-	<e:Image id="closeBtn" source="help_closebtn1_png" x="613" y="238"/>
+	<e:Image id="closeBtn" source="help_closebtn1_png" x="613" y="350.12"/>
+	<e:Image source="help_card_bg_png" y="497.48" x="94"/>
+	<e:Image id="prizeImg" source="help_card_prize_png" x="121.5" y="517.96" width="508" height="227"/>
 </e:Skin>
\ No newline at end of file
--- a/egret/resource/skins/ScratchSkin.exml
+++ b/egret/resource/skins/ScratchSkin.exml
@@ -25,7 +25,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label id="cutTimeLabel" text="23:43:21" y="888.5" size="28" textColor="0xffffff" fontFamily="FZY3JW" verticalAlign="middle" anchorOffsetX="0" width="749" textAlign="center" horizontalCenter="0"/>
+	<e:Label id="cutTimeLabel" text="23:43:21" y="888.5" size="28" textColor="0xffffff" fontFamily="FZY3JW" verticalAlign="middle" anchorOffsetX="0" width="487" textAlign="center" x="162"/>
 	<e:Label text="帮刮\n记录" y="805" size="28" textColor="0xFFFFFF" horizontalCenter="-248"/>
 	<e:Scroller width="487" height="90" y="783" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="32.5">
 		<e:Group anchorOffsetX="0" y="2">

--- a/egret/src/mapScene/MapScene.ts
+++ b/egret/src/mapScene/MapScene.ts
@@ -74,8 +74,8 @@ export default class MapScene extends Scene {
        else if (code.indexOf("12345678") == -1) {  // 邀请有礼
            const dojoin = DataManager.ins.getData('hc_doJoin');
            if (!dojoin) {
-                showToast("开启消除之旅");
+                panels.push('HelpInvitePanel2');
-                return false;
+                return true;
            }
            const netCallback = () => { doHelpFlag = true; };
            panels.push('HelpInvitePanel');
@@ -145,6 +145,7 @@ export default class MapScene extends Scene {
            const panels = [];
            const result = this.sendInvite(panels, parmas);
            if (result) {
+                this.updateSign();
                PanelCtrl.instance.showPanels(panels, parmas, this.onAllPanelHide);
                return;
            }
@@ -392,7 +393,7 @@ export default class MapScene extends Scene {
            if (!window['development']) {
                RES.getResAsync(`inviterulepanel_json`);
            }
-        }, 10 * 1000);
+        }, 20 * 1000);
        loadFireworks();

--- a/egret/src/panels/help/HelpBloodPanel.ts
+++ b/egret/src/panels/help/HelpBloodPanel.ts
@@ -5,98 +5,88 @@ import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
 import { gotoNextLevel } from "../gotoNextLevel";
 import { loadSvga } from "../../loadSvga";
 import getResPath from "../../../libs/new_tc/getResPath";
+import { play2 } from "./svgaTool";
+import wait from "../../../libs/new_tc/wait";
 export default class HelpBloodPanel extends Panel {
    netCallback;
    code;
-    mv1;
+    success;
-    mv2;
+    list: any[];
-    start(data) {
+    async start(data) {
+        super.start();
        this.netCallback = data.netCallback;
        this.code = data.code;
        NetManager.ins.showLog(getlogItem(87));
+        const s = new egret.Sprite();
+        this.addChildAt(s, 0);
+        s.y = -250;
-        this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
-        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
        this['txt_standby'].visible = true;
        this['helpbtn'].visible = true;
-        loadSvga(getResPath() + 'resource/assets/svgas/blood_success.svga', this).then((mv: egret.DisplayObject) => {
+        this.list = await Promise.all([
-            mv.touchEnabled = false;
+            loadSvga(getResPath() + 'resource/assets/svgas/blood_standby.svga'),
-            mv.visible = false;
+            loadSvga(getResPath() + 'resource/assets/svgas/blood_success.svga'),
-            this.mv1 = mv;
+            loadSvga(getResPath() + 'resource/assets/svgas/blood_fail.svga'),
-            this.mv1.y = -250;
+        ]);
-            this.tostandby1();
-            this.mv1.addEventListener(egret.Event.ENTER_FRAME, () => {
+        this.list.forEach(i => {
-                if (this.mv1.currentFrame == this.mv1_end)
+            i.gotoAndStop(1);
-                    this.mv1.gotoAndPlay(this.mv1_start);
+            this.addChild(i);
-                if (this.mv1.currentFrame == 420) {
+            i.visible = false;
-                    this.mv1_start = 421;
+            i.touchEnabled = false;
-                    this.mv1_end = this.mv1.totalFrames;
+            i.y = -250;
-                }
-            }, this);
-        });
-        loadSvga(getResPath() + 'resource/assets/svgas/blood_fail.svga', this).then((mv: egret.DisplayObject) => {
-            mv.touchEnabled = false;
-            mv.visible = true;
-            this.mv2 = mv;
-            this.mv2.y = -250;
-            this.tostandby2();
-            this.mv2.addEventListener(egret.Event.ENTER_FRAME, () => {
-                if (this.mv2.currentFrame == this.mv2_end)
-                    this.mv2.gotoAndPlay(this.mv2_start);
-                if (this.mv2.currentFrame == 420) {
-                    this.mv2_start = 421;
-                    this.mv2_end = this.mv2.totalFrames;
-                }
-            }, this);
        });
-    }
+        this.list[0].visible = true;
+        this.list[0].gotoAndPlay(1);
-    mv1_start;
+        this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
-    mv1_end;
+        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
-    mv2_start;
-    mv2_end;
+        loadSvga(getResPath() + 'resource/assets/svgas/bloodbg.svga', s);
-    tostandby1() {
-        this.mv1_start = 1;
+        this.addChild(this['closeBtn']);
-        this.mv1_end = 180;
-    }
-    toAction1() {
-        this.mv1.gotoAndPlay(181);
-    }
-    toAction2() {
-        this.mv2.gotoAndPlay(181);
    }
-    tostandby2() {
+    onTouchTap_closeBtn() {
-        this.mv2_start = 1;
+        this.netCallback();
-        this.mv2_end = 180;
+        this.hidePanel();
    }
    onclick_gobtn() {
+        if (this.success)
            NetManager.ins.clickLog(getlogItem(88));
+        // else
+            // NetManager.ins.clickLog(getlogItem(0));
        this.hidePanel();
        gotoNextLevel();
    }
    onClick() {
-        this['helpbtn'].visible = false;
-        this['gobtn'].visible = true;
-        this.mv1.visible = false;
-        this.mv2.visible = false;
-        NetManager.ins.showLog(getlogItem(88));
        NetManager.ins.clickLog(getlogItem(87));
-        NetManager.ins.doHelpNew((s, res) => {
+        NetManager.ins.doHelpNew(async (s, res) => {
            this.netCallback();
-            this['txt_standby'].visible = false;
            if (s) {
-                this.mv1.visible = true;
+                this.success = 1;
+                NetManager.ins.showLog(getlogItem(88));
+                play2(this.list[1]);
+                this.list[0].visible = false;
+                this.list[1].visible = true;
+                await wait(1200);
+                this['helpbtn'].visible = false;
+                this['gobtn'].visible = true;
+                this['txt_standby'].visible = false;
                this['txt_success'].visible = true;
-                this.toAction1();
            } else {
-                this.toAction2();
+                // NetManager.ins.showLog(getlogItem(0));
-                this.mv2.visible = true;
+                this.list[2].visible = true;
+                play2(this.list[2]);
+                this['helpbtn'].visible = false;
+                this['gobtn'].visible = true;
+                this['txt_standby'].visible = false;
                var codeMsgs = {//具体code还没给
                    "2002002016": "不可以给自己助力哦~",//
                    "2002002036": "已经给好友助力过了哦~",

--- a/egret/src/panels/help/HelpInvitePanel.ts
+++ b/egret/src/panels/help/HelpInvitePanel.ts
@@ -5,21 +5,29 @@ import { DataManager } from "../../../libs/tw/manager/DataManager";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import { loadSvga } from "../../loadSvga";
 import { gotoNextLevel } from "../gotoNextLevel";
+import { getlogItem } from "../../Main";
+import wait from "../../../libs/new_tc/wait";
 export default class HelpInvitePanel extends Panel {
    netCallback;
    code;
+    success;
    async start(data) {
+        super.start();
        this.netCallback = data.netCallback;
        this.code = data.code;
-        // NetManager.ins.showLog(getlogItem(87));
+        const s = new egret.Sprite();
+        this.addChildAt(s, 0);
+        s.touchEnabled=s.touchChildren=false;
-        this['txt_standby'].visible = true;
+        this['txt_standby'].visible = false;
-        this['helpbtn'].visible = true;
+        this['helpbtn'].visible = false;
+        this['gobtn'].visible = true;
        loadSvga(getResPath() + 'resource/assets/svgas/invitebg.svga', this).then((mv: egret.DisplayObject) => {
-            this['g1'].addChild(mv);
+            s.addChild(mv);
+            this.addChild(this['closeBtn']);
            mv.y = -180;
        });
@@ -29,42 +37,59 @@ export default class HelpInvitePanel extends Panel {
            loadSvga(getResPath() + 'resource/assets/svgas/inviteAct3.svga'),
        ]);
-        // this['list'][0].visible=false;
-        this['list'][1].visible=false;
+        this['list'][1].visible = false;
-        this['list'][2].visible=false;
+        this['list'][2].visible = false;
-        this['list'][0].y=-140;
+        this['list'][0].y = -140;
-        this['list'][1].y=-140;
+        this['list'][1].y = -140;
-        this['list'][2].y=-140;
+        this['list'][2].y = -140;
        this.addChild(this['list'][0]);
        this.addChild(this['list'][1]);
        this.addChild(this['list'][2]);
+        this['list'][0].touchEnabled=this['list'][0].touchChildren=false;
+        this['list'][1].touchEnabled=this['list'][1].touchChildren=false;
+        this['list'][2].touchEnabled=this['list'][2].touchChildren=false;
+        this.addChild(this['closeBtn']);
        this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
-        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
+        // wait(100).then(()=>{
+        this.onClick();
+        // })
+    }
+    onTouchTap_closeBtn() {
+        this.netCallback();
+        this.hidePanel();
    }
    onclick_gobtn() {
        // NetManager.ins.clickLog(getlogItem(88));
        this.hidePanel();
        gotoNextLevel();
+        if (this.success)
+            NetManager.ins.clickLog(getlogItem(92));
+        // else
+            // NetManager.ins.clickLog(getlogItem(0));
    }
    onClick() {
-        this['helpbtn'].visible = false;
-        this['gobtn'].visible = true;
        const dojoin = DataManager.ins.getData('hc_doJoin');
        NetManager.ins.doHelp((success, res) => {
            this.netCallback();
-            this['list'][0].visible=false;
+            this['list'][0].visible = false;
-            this['txt_standby'].visible = false;
            if (success) {
-                this['list'][1].visible=true;
+                this.success = 1;
+                NetManager.ins.showLog(getlogItem(92));
+                this['list'][1].visible = true;
                this['list'][1].gotoAndPlay(1);
                this['txt_success'].visible = true;
            } else {
+                // NetManager.ins.showLog(getlogItem(0));
                this['list'][2].gotoAndPlay(1);
-                this['list'][2].visible=true;
+                this['list'][2].visible = true;
                var codeMsgs = {
                    "400017": "您不是新用户呢～",
                    "0000022": "不可以给自己助力哦～",

--- a/egret/src/panels/help/HelpInvitePanel2.ts
+++ b/egret/src/panels/help/HelpInvitePanel2.ts
+import getResPath from "../../../libs/new_tc/getResPath";
+import Panel from "../../../libs/new_wx/components/Panel";
+import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
+import { DataManager } from "../../../libs/tw/manager/DataManager";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
+import { loadSvga } from "../../loadSvga";
+import { gotoNextLevel } from "../gotoNextLevel";
+import { getlogItem } from "../../Main";
+export default class HelpInvitePanel2 extends Panel {
+    // netCallback;
+    // code;
+    async start(data) {
+        super.start();
+        // this.netCallback = data.netCallback;
+        // this.code = data.code;
+        NetManager.ins.showLog(getlogItem(91));
+        const s = new egret.Sprite();
+        this.addChildAt(s,0);
+        s.touchEnabled=s.touchChildren=false;
+        this['txt_standby'].visible = true;
+        this['helpbtn'].visible = true;
+        loadSvga(getResPath() + 'resource/assets/svgas/invitebg.svga', this).then((mv: egret.DisplayObject) => {
+            s.addChild(mv);
+            mv.y = -180;
+            this.addChild(this['closeBtn']);
+        });
+        this['list'] = await Promise.all([
+            loadSvga(getResPath() + 'resource/assets/svgas/inviteAct1.svga')
+        ]);
+        this['list'][0].y=-140;
+        this.addChild(this['list'][0]);
+        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
+        this.addChild(this['closeBtn']);
+    }
+    onClick() {
+        NetManager.ins.clickLog(getlogItem(91));
+        this.hidePanel();
+        gotoNextLevel();
+    }
+    get skinResKey() { return 'helpGroup' }
+    get skinKey() { return 'HelpInvite' }
+}
\ No newline at end of file
--- a/egret/src/panels/help/HelpScratchPanel.ts
+++ b/egret/src/panels/help/HelpScratchPanel.ts
@@ -2,45 +2,138 @@ import Panel from "../../../libs/new_wx/components/Panel";
 import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import { gotoNextLevel } from "../gotoNextLevel";
+import { loadSvga } from "../../loadSvga";
+import getResPath from "../../../libs/new_tc/getResPath";
+import { play2 } from "./svgaTool";
+import wait from "../../../libs/new_tc/wait";
+import { getlogItem } from "../../Main";
 export default class HelpScratchPanel extends Panel {
    netCallback;
    code;
-    start(data) {
+    list: any[];
+    private myShape: egret.Shape = new egret.Shape();
+    private pIndex = 0;
+    setGtaphics(x, y) {
+        setTimeout(() => {
+            if (this.pIndex % 2 == 0) {   // 双数
+                y -= 25;
+                if (y <= this["prizeImg"].y) {
+                    this.pIndex++;
+                }
+            } else { // 单数
+                y += 25;
+                if (y >= (this["prizeImg"].y + this["prizeImg"].height)) {
+                    this.pIndex++;
+                }
+            }
+            x += 5;
+            this.myShape.graphics.lineTo(x, y);
+            if (x > this["prizeImg"].x + (+this.data.completePercent) / 100 * this["prizeImg"].width) {
+                return;
+            }
+            this.setGtaphics(x, y);
+        }, 20);
+    }
+    async start(data) {
+        this.data.completePercent=100;
        this.netCallback = data.netCallback;
        this.code = data.code;
-        // NetManager.ins.showLog(getlogItem(87));
+        NetManager.ins.showLog(getlogItem(89));
+        egret.Tween.get(this['light'], { loop: true }).to({ rotation: 360 }, 5000);
+        this['light'].visible = false;
        this['closeBtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_closeBtn, this);
-        this['go2btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
-        this['go1btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
-        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
        this['txt_standby'].visible = true;
        this['helpbtn'].visible = true;
+        this.myShape.graphics.beginFill(0xff0000, 0);
+        this.myShape.graphics.drawRect(this["prizeImg"].x, this["prizeImg"].y, this["prizeImg"].width, this["prizeImg"].height);
+        this.myShape.graphics.endFill();
+        this.addChild(this.myShape);
+        this["prizeImg"].mask = this.myShape;
+        this.myShape.graphics.lineStyle(130, 0xff0000, 1);
+        this.myShape.graphics.moveTo(this["prizeImg"].x - 30, this["prizeImg"].y + this["prizeImg"].height);
+        this.list = await Promise.all([
+            loadSvga(getResPath() + 'resource/assets/svgas/scratch_standby.svga'),
+            loadSvga(getResPath() + 'resource/assets/svgas/scratch_success.svga'),
+            loadSvga(getResPath() + 'resource/assets/svgas/scratch_fail.svga'),
+        ]);
+        this['go2btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn2, this);
+        this['go1btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn1, this);
+        this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
+        const w = [313, 433, 356];
+        const y = [180, 20, 140];
+        this.list.forEach((i, index) => {
+            i.gotoAndStop(1);
+            this.addChildAt(i, 1);
+            i.visible = false;
+            i.touchEnabled = false;
+            i.anchorOffsetX = w[index] / 2;
+            i.x = 750 / 2;
+            i.y = y[index];
+        });
+        wait(1000).then(async () => {
+            this.list[0].visible = true;
+            await play2(this.list[0]);
+            this['light'].visible = true;
+        });
+    }
+    startAni() {
+        this.setGtaphics(this["prizeImg"].x - 30, this["prizeImg"].y + this["prizeImg"].height);
    }
    onclick_closeBtn() {
        this.hidePanel();
+        this.netCallback();
    }
-    onclick_gobtn() {
+    onclick_gobtn1() {
-        // NetManager.ins.clickLog(getlogItem(88));
        this.hidePanel();
        gotoNextLevel();
+        NetManager.ins.clickLog(getlogItem(90));
    }
-    onClick() {
+    onclick_gobtn2() {
-        this['helpbtn'].visible = false;
+        this.hidePanel();
+        gotoNextLevel();
+        // NetManager.ins.clickLog(getlogItem(0));
+    }
+    onClick() {
+        NetManager.ins.clickLog(getlogItem(89));
        const _code = this.code.slice(8);
-        NetManager.ins.scratchDoHelp((success, res) => {
+        NetManager.ins.scratchDoHelp(async (success, res) => {
            this.netCallback();
+            if(!success)
+            this.data.completePercent=70;
+            this.startAni();
+            await wait(2000);
            this['txt_standby'].visible = false;
+            this.list[0].visible = false;
+            this['light'].visible = false;
+            this['helpbtn'].visible = false;
            if (success) {
+                NetManager.ins.showLog(getlogItem(90));
                this['go1btn'].visible = true;
                this['txt_success'].visible = true;
+                this.list[1].visible = true;
+                await play2(this.list[1]);
+                this['light'].visible = true;
            } else {
+                // NetManager.ins.showLog(getlogItem(0));
                this['go2btn'].visible = true;
+                this.list[2].visible = true;
                var codeMsgs = {
                    "0000024": "今日刮卡次数已达到上线限哦～",
                    "0000022": "不可以给自己刮哦～",
@@ -51,25 +144,9 @@ export default class HelpScratchPanel extends Panel {
                } else {
                    showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
                }
+                play2(this.list[2]);
            }
-            // switch (true) {
-            //     case (res.code == "0000024"):
-            //         showToast("今日刮卡次数已达到上线限哦～");
-            //         break;
-            //     case (res.code == "0000022"):
-            //         showToast("不可以给自己刮哦～");
-            //         break;
-            //     case (res.code == "0000023"):
-            //         showToast("已经给好友刮过了哦～");
-            //         break;
-            //     default:
-            //         break;
-            // }
-            // if (!success) {
-            //     return;
-            // }
-            // showToast("助力成功，参与闯关赢现金"/*"帮刮成功！"*/);
        }, _code);
    }

--- a/egret/src/panels/help/svgaTool.ts
+++ b/egret/src/panels/help/svgaTool.ts
+//播放完之后，在一个区间循环
+// export const play1 = (mv, start, end, loopStart, loopEnd) => {
+//     const func1 = () => {
+//         if (mv.currentFrame == end)
+//     };
+//     mv.gotoAndPlay(start);
+//     mv.addEventListener(egret.Event.ENTER_FRAME, func1, this);
+//     mv.addEventListener(egret.Event.ENTER_FRAME, () => {
+//         if (this.mv1.currentFrame == this.mv1_end)
+//             this.mv1.gotoAndPlay(this.mv1_start);
+//         if (this.mv1.currentFrame == 420) {
+//             this.mv1_start = 421;
+//             this.mv1_end = this.mv1.totalFrames;
+//         }
+//     }, this);
+// }
+export const play2 = (mv, start = 1, end = -1) => {
+    return new Promise((r) => {
+        if (end == -1)
+            end = mv.totalFrames;
+        const func1 = () => {
+            if (mv.currentFrame == end) {
+                mv.stop();
+                mv.removeEventListener(egret.Event.ENTER_FRAME, func1, this);
+                r();
+            }
+        };
+        mv.gotoAndPlay(start);
+        mv.addEventListener(egret.Event.ENTER_FRAME, func1, this);
+    })
+}
\ No newline at end of file
--- a/egret/src/something/chapters/Chapter21.ts
+++ b/egret/src/something/chapters/Chapter21.ts
@@ -122,8 +122,19 @@ export const Chapters21: ChapterData[] = [
   { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 33, passTarget: { type: 1, elements: [ { type: 9, count: 62 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 0, 3, 0, 3, 0, 3, 0, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 ], connectedLats: [], conveyor: [ [ 45, 53 ] ], conveyorConnectedLats: [ [ 53, 45 ] ], 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, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 0, 0, 1, 0, 14, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 2, 2, 2, 2, 14, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2 ], 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 } ] } },
   //539
   { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 23, count: 25 }, { type: 25, count: 25 }, { type: 26, count: 25 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 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, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0 ], connectedLats: [ [ 13, 31 ], [ 58, 76 ] ], conveyor: [ [ 10, 16 ], [ 79, 72 ], [ 27, 35 ], [ 54, 62 ] ], conveyorConnectedLats: [ [ 16, 10 ], [ 72, 79 ], [ 35, 27 ], [ 62, 54 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 13, 13, 13, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 13, 13, 13, 1, 1, 1, 2, 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: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
  //540
-   { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 34, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 16, 1, 1, 1, 1, 1, 1, 1, 16, 2, 1, 1, 1, 1, 1, 1, 1, 2, 16, 2, 2, 2, 1, 2, 2, 2, 16, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 14, 2, 14, 2, 2, 1, 1, 1, 2, 2, 14, 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 } ] } },
+  { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 34, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], 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,
+   16, 2, 2, 2, 1, 2, 2, 2, 16,
+   16, 1, 2, 2, 2, 2, 2, 1, 16,
+   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

--- a/egret/src/something/chapters/Chapter22.ts
+++ b/egret/src/something/chapters/Chapter22.ts
--- a/mock/happyclear/doHelp.json
+++ b/mock/happyclear/doHelp.json
 {
-    "success":0,
+    "success":1,
    "code":"0200202",
    "desc":null,
    "timestamp":1566199822308,

--- a/mock/happyclear/doHelpNew.json
+++ b/mock/happyclear/doHelpNew.json
 {
-    "success": true,
+    "success": 0,
    "code": "2002002036",
    "desc": "OK",
    "timestamp": 1571052938097,

--- a/mock/happyclear/scratchDoHelp.json
+++ b/mock/happyclear/scratchDoHelp.json
 {
    "success":0,
-    "code":"0000023",
+    "code":"0000024",
    "desc":null,
    "timestamp":1566199822308,
    "data":""