1

egret/resource/default.res.json

@@ -39,6 +39,10 @@
 		{
 			"keys": "success_png",
 			"name": "success"
+		},
+		{
+			"name": "preload",
+			"keys": "common_btn20_png"
 		}
 	],
 	"resources": [
@@ -441,6 +445,11 @@
 			"url": "assets/main/main_iconxx.png",
 			"type": "image",
 			"name": "main_iconxx_png"
+		},
+		{
+			"name": "common_btn20_png",
+			"type": "image",
+			"url": "assets/common/common_btn20.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/DreamSkin.exml

@@ -32,6 +32,9 @@
 				<e:Group x="46" y="810.7" width="100%" id="status1">
 					<e:Image id="resubmitBtn" y="0" horizontalCenter="0" source="common_btn9_png"/>
 				</e:Group>
+				<e:Group id="status2" x="46" y="810.7" width="100%">
+					<e:Image y="0" horizontalCenter="0" source="common_btn20_png"/>
+				</e:Group>
 				<e:layout>
 					<e:VerticalLayout/>
 				</e:layout>

egret/src/DreamScene.ts

@@ -8,6 +8,7 @@ import { NetManager } from "../libs/tw/manager/NetManager";
 export enum DreamSceneType {
     IN_PROGRESS=0,
     RESUBMIT=1,
+    TIME_OUT=2,//重新提交但是审核时间已过
 }
 
 export default class DreamScene extends Scene {
@@ -17,6 +18,7 @@ export default class DreamScene extends Scene {
         const yyh_join1_dreamDetail = DataManager.ins.getData('yyh_join1_dreamDetail').data;
         this['group'].removeChild(this['status0']);
         this['group'].removeChild(this['status1']);
+        this['group'].removeChild(this['status2']);
         
         this.status = data;
 

egret/src/MainScene.ts

@@ -51,14 +51,14 @@ export default class MainScene extends Scene {
                     this['starbtn'].alpha = 1;
                 } else {
                     this['starbtn'].alpha = 0;
-                    egret.Tween.get(this['starbtn']).set({scaleX:0,scaleY:0}).to({alpha:1,scaleX:1,scaleY:1},200,egret.Ease.getBackOut(5)).wait(400).to({alpa:1,x:680.51,y:176},500);
+                    egret.Tween.get(this['starbtn']).set({ scaleX: 0, scaleY: 0 }).to({ alpha: 1, scaleX: 1, scaleY: 1 }, 200, egret.Ease.getBackOut(5)).wait(400).to({ alpa: 1, x: 680.51, y: 176 }, 500);
                     egret.Tween.get(this['starWrapper']).wait(600).to({ x: 374, y: 562, scaleY: 1, scaleX: 1 }, 500, egret.Ease.backIn).call(() => {
                         this.playShakeAni();
                         this['starbtn'].alpha = 1;
                     });
                 }
             } else {
-                egret.Tween.get(this['starbtn']).set({x:680.51,y:176,alpha:1}).to({alpha:0,x:375,y:575},700);
+                egret.Tween.get(this['starbtn']).set({ x: 680.51, y: 176, alpha: 1 }).to({ alpha: 0, x: 375, y: 575 }, 700);
                 this.stopShakeAni();
                 this.updateStars(join_1_index.data.dreamList);
                 egret.Tween.get(this['starWrapper']).to({ x: 666 + 10, y: 135 + 30, scaleX: 0.15, scaleY: 0.15 }, rightnow ? 1 : 500, egret.Ease.backIn).call(() => {
@@ -79,11 +79,11 @@ 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['starWrapper'].touchEnabled = false;
+        this['starWrapper'].touchChildren = false;
+        wait(1500).then(() => {
+            this['starWrapper'].touchEnabled = true;
+            this['starWrapper'].touchChildren = true;
         });
         this.setNormal(!this['starWrapper']['isNormal']);
     }
@@ -108,10 +108,10 @@ export default class MainScene extends Scene {
             isFirstShow = false;
 
             this.setNormal(1, false, true);
-            this['starbtn'].touchEnabled=false;
+            this['starbtn'].touchEnabled = false;
 
             setTimeout(() => {
-                this['starbtn'].touchEnabled=true;
+                this['starbtn'].touchEnabled = true;
                 this.setNormal(0);
                 this['starWrapper'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.ontap_starWrapper, this);
             }, 3000);
@@ -209,7 +209,10 @@ export default class MainScene extends Scene {
         } else if (detail.dreamStatus == '1') {
             SceneCtrl.instance.change('MyDreamScene');//我的dream，已经通过
         } else if (detail.dreamStatus == '2') {
-            SceneCtrl.instance.change('DreamScene', DreamSceneType.RESUBMIT);
+            if (new Date().getTime() > join_1_index.data.reviewDeadline)
+                SceneCtrl.instance.change('DreamScene', DreamSceneType.TIME_OUT);
+            else
+                SceneCtrl.instance.change('DreamScene', DreamSceneType.RESUBMIT);
         }
     }
 

mock/esports/index.json

@@ -6,7 +6,7 @@
         "lightUpWindow": 0,
         "reviewPassedWindow": 0,
         "reviewFailedWindow": 0,
-        "reviewDeadline": 157489441000,
+        "reviewDeadline": 0,
         "assistDeadline": 99957489441000,
         
         "doAssistCount":10,