1

egret/index.html

@@ -47,7 +47,7 @@
         window['activeRule'] = '<br>    唤醒梦想，赋能亚运！<br>    为打造一届充满情怀的亚运盛会，让更多公众通过公益+互联网的新模式参与到杭州亚运会的筹备中来，杭州亚组委于2019年12月15日正式启动“寻找2022个亚运梦想”大型公益品牌活动。<br>    从现在至杭州亚运会开幕，我们将汇聚包括吉利汽车、中国电信、中国移动、工商银行、长龙航空、支付宝、阿里集团、杭州市体育彩票管理中心、青少年足球成长公益基金、浙江省青少年发展基金会、浙江省慈善联合总会、新浪微博、网易新闻、浙江之声及浙江电视台公共新闻频道在内的15家企业、组织和单位一起组成“联合助梦方”搭建“寻梦通道”，同时在全球范围内“寻梦”。只要您的梦想与亚运有关，只要您对梦想的坚持一如既往，您便可以通过文字、视频、音频、图画等任何您想到的形式将您的梦想告诉我们。我们将与“联合助梦方”一起让您的梦想被更多的人看见，被更多的人关注，通过杭州亚组委开设的“杭州亚运圆梦行动”（暂名）公募项目汇聚公众的爱心为梦想助力。最后，我们将在所有亚运梦想中挑选2022个，以亚运的名义为您圆梦。  <br>    我们坚信，每个梦想都值得被尊重。来吧，唤醒您的梦想，让您的梦想汇聚成亚运梦想的“星空”。';
         window['rule'] = '1111<br>2222';
         window['projectID']='p32804e45';
-        window.firstScene='admin';
+        // window.firstScene='admin';
         // window.firstScene='invite';
         window['renderMode'] = 'webgl';
         window['development'] = true;

egret/resource/default.res.json

@@ -9,11 +9,11 @@
 			"name": "noname"
 		},
 		{
-			"keys": "main_star_png,main_pic_png,main_icon5_png,main_icon4_png,main_icon3_png,main_icon2_png,main_icon1_png,main_fu3_png,main_fu2_png,main_fu_png,main_fu_bg_png,main_btn3_png,main_btn2_png,main_btn1_png,main_bg2_png,main_bg1_png,main_text_png,main_starbg_png,main_iconxx_png",
+			"keys": "main_bg1_png,main_bg2_png,main_btn1_png,main_btn2_png,main_btn3_png,main_fu_bg_png,main_fu_png,main_fu2_png,main_fu3_png,main_icon1_png,main_icon10_png,main_icon11_png,main_icon12_png,main_icon13_png,main_icon14_png,main_icon15_png,main_icon2_png,main_icon3_png,main_icon4_png,main_icon5_png,main_icon6_png,main_icon7_png,main_icon8_png,main_icon9_png,main_iconxx_png,main_pic_png,main_star_png,main_starbg_png,main_text_png",
 			"name": "mainscene"
 		},
 		{
-			"keys": "admin_btn2_png,admin_btn1_png,admin_btn_png,admin_bg2_png",
+			"keys": "admin_btn2_png,admin_btn1_png,admin_btn_png,admin_bg2_png,admin_bg3_png",
 			"name": "admin"
 		},
 		{
@@ -451,6 +451,61 @@
 			"url": "assets/common/common_backbtn.png",
 			"type": "image",
 			"name": "common_backbtn_png"
+		},
+		{
+			"url": "assets/admin/admin_bg3.png",
+			"type": "image",
+			"name": "admin_bg3_png"
+		},
+		{
+			"url": "assets/main/main_icon6.png",
+			"type": "image",
+			"name": "main_icon6_png"
+		},
+		{
+			"url": "assets/main/main_icon7.png",
+			"type": "image",
+			"name": "main_icon7_png"
+		},
+		{
+			"url": "assets/main/main_icon8.png",
+			"type": "image",
+			"name": "main_icon8_png"
+		},
+		{
+			"url": "assets/main/main_icon9.png",
+			"type": "image",
+			"name": "main_icon9_png"
+		},
+		{
+			"url": "assets/main/main_icon10.png",
+			"type": "image",
+			"name": "main_icon10_png"
+		},
+		{
+			"url": "assets/main/main_icon11.png",
+			"type": "image",
+			"name": "main_icon11_png"
+		},
+		{
+			"url": "assets/main/main_icon12.png",
+			"type": "image",
+			"name": "main_icon12_png"
+		},
+		{
+			"url": "assets/main/main_icon13.png",
+			"type": "image",
+			"name": "main_icon13_png"
+		},
+		{
+			"url": "assets/main/main_icon14.png",
+			"type": "image",
+			"name": "main_icon14_png"
+		},
+		{
+			"url": "assets/main/main_icon15.png",
+			"type": "image",
+			"name": "main_icon15_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/AdminPanel2Skin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="AdminPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image source="admin_bg2_png" y="123" horizontalCenter="0"/>
+	<e:Image y="123" horizontalCenter="0" source="admin_bg3_png"/>
 	<e:Button id="closeBtn" label="" x="623.4" y="82">
 		<e:skinName>
 		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">

egret/resource/skins/StarAniSkin.exml

@@ -155,5 +155,5 @@
 			</tween:TweenItem>
 		</tween:TweenGroup>
 	</w:Declarations>
-	<e:Image id="image" source="main_icon1_png" x="398.48" y="705.98" anchorOffsetX="94.48" anchorOffsetY="120.48"/>
+	<e:Image id="image" source="main_icon1_png" x="398.48" y="705.98" anchorOffsetX="100" anchorOffsetY="100"/>
 </e:Skin>
\ No newline at end of file

egret/src/DreamAdminScene.ts

@@ -34,16 +34,6 @@ export default class DreamAdminScene extends Scene {
     ontap_btn2() {
         console.log('不通过');
         PanelCtrl.instance.show('AdminPanel2',{id:this.id});
-
-        
-        this.touchEnabled = false;
-        this.touchChildren = false;
-        NetManager.ins.yyh_assist1_reviewDream((s) => {
-            this.touchEnabled = true;
-            this.touchChildren = true;
-            if(s)
-            SceneCtrl.instance.change('AdminScene');
-        }, this.id, false);
     }
 
     loadImg(url) {

egret/src/StarAni.ts

@@ -16,7 +16,7 @@ const createItem = (i, delay, mainscene) => {
 export default class StarAni extends ComponentBase {
     public tweenGroup: egret.tween.TweenGroup;
     image: eui.Image;
-    static ALL_TOTAL = 5;
+    static ALL_TOTAL = 15;
     static TOTAL = 4;
     static next;
     constructor() {

egret/src/panels/AdminPanel2.ts

@@ -15,7 +15,6 @@ export default class AdminPanel2 extends Panel {
     }
 
     ontap_btn1() {
-        console.log('确认通过');
         this.touchEnabled = false;
         this.touchChildren = false;
         NetManager.ins.yyh_assist1_reviewDream((s) => {
@@ -26,7 +25,7 @@ export default class AdminPanel2 extends Panel {
                 SceneCtrl.instance.change('AdminScene');
             // }
             
-        }, this.id, true);
+        }, this.id, false);
     }
 
     protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['closeBtn2']] }