Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

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_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"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"helpGroup","version":5,"files":["../assets/help/help_blood_1_btn.png","../assets/help/help_blood_1_text.png","../assets/help/help_blood_fail_btn.png","../assets/help/help_blood_fail_text.png","../assets/help/help_blood_fail_text2.png","../assets/help/help_blood_fail_text3.png","../assets/help/help_blood_fail_text4.png","../assets/help/help_blood_success_text.png","../assets/help/help_blood_success_text2.png","../assets/help/help_card_bg.png","../assets/help/help_card_prize.png","../assets/help/help_closebtn1.png","../assets/help/help_invite2_btn.png","../assets/help/help_invite2_btn2.png","../assets/help/help_invite2_text.png","../assets/help/help_invite2_text2.png","../assets/help/help_invite2_text3.png","../assets/help/help_invite2_text4.png","../assets/help/help_invite_bg.png","../assets/help/help_invite_btn1.png","../assets/help/help_invite_fail_btn.png","../assets/help/help_invite_fail_text1.png","../assets/help/help_invite_fail_text2.png","../assets/help/help_invite_fail_text3.png","../assets/help/help_invite_fail_text4.png","../assets/help/help_invite_success_btn.png","../assets/help/help_invite_success_txt.png","../assets/help/help_invite_text.png","../assets/help/help_light.png"]}
\ No newline at end of file