1

egret/resource/skins/IntroSkin.exml

@@ -2,15 +2,15 @@
 <e:Skin class="IntroSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image source="bg_jpg" x="-2"/>
 	<e:Image source="introbg_png" y="272" horizontalCenter="0"/>
-	<e:Group id="status1" x="85" y="814">
+	<e:Group id="status1" x="85" y="964" visible="false">
 		<e:Image id="btn0" source="common_btn12_png" y="0" x="0"/>
 		<e:Label text="截止时间2019.10.01" y="130.85" textColor="0x515276" scaleX="1" scaleY="1" size="22" lineSpacing="10" id="dead" horizontalCenter="0"/>
 	</e:Group>
-	<e:Group id="status0" y="814" horizontalCenter="0" visible="false">
+	<e:Group id="status0" y="964" horizontalCenter="0" visible="false">
 		<e:Image id="btn1" y="0" x="0" source="common_btn10_png"/>
 		<e:Label id="lab1" text="快去为更多的梦想充能吧" y="130.85" textColor="0x515276" scaleX="1" scaleY="1" size="22" lineSpacing="10" x="191"/>
 	</e:Group>
-	<e:Scroller id="scroller" width="632" height="448" y="330.56" horizontalCenter="-5.5" skinName="skins.ScrollerSkin">
+	<e:Scroller id="scroller" width="632" height="578" y="330.56" horizontalCenter="-5.5" skinName="skins.ScrollerSkin">
 		<e:Group id="group" width="100%">
 		<e:layout>
 			<e:VerticalLayout/>

egret/resource/skins/RuleSkin.exml

@@ -18,7 +18,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Scroller id="scroller" width="530" height="384" y="344.56" horizontalCenter="0">
+	<e:Scroller id="scroller" width="530" height="423" y="330.56" horizontalCenter="0">
 		<e:Group id="group" width="100%">
 			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0x000000"/>
 			<e:layout>

egret/src/MainScene.ts

@@ -79,6 +79,12 @@ export default class MainScene extends Scene {
     }
 
     ontap_starWrapper() {
+        this['starWrapper'].touchEnabled=false;
+        this['starWrapper'].touchChildren=false;
+        wait(1500).then(()=>{
+            this['starWrapper'].touchEnabled=true;
+            this['starWrapper'].touchChildren=true;
+        });
         this.setNormal(!this['starWrapper']['isNormal'])
     }
 

egret/src/panels/RulePanel.ts

@@ -18,7 +18,7 @@ export default class RulePanel extends Panel {
             while(str.indexOf('</p>') != -1) {
                 str=str.replace('</p>','<br>');
             }
-            this.addRule(str);
+            this.addRule('<br>'+str);
         });
     }
 

mock/esports/projectRule.json

-{"data":"<p>111</p><p>2222</p><p>33333</p>","success":true}
+{"data":"<p>1﹜\t用户进入活动页面后，点击“我的梦想”可以以图文的形式提交亚运梦想并等待官方审核。审核通过后可以生成分享页面，邀请好友为自己的梦想充能。</p><p>2﹜\t点击“所有梦想”可以查看其他人提交的梦想，每天有5次充能机会，单个用户每天充能上限为1次，单个梦想的充能上限为5个能量值。累计充能次数达到100次即可点亮“能”字。</p><p>3﹜\t完成“能”字点亮后还可以继续给梦想充能，充能总量不会影响认领结果，但会影响梦想在其展示页面的排名顺序，能量值越高，排名越靠前。</p><p>4﹜\t完成充能的梦想即有机会被组委会和联合助梦方认领，并从中选择2022个梦想进行圆梦。</p>","success":true}
\ No newline at end of file