1

egret/libs/new_wx/MainBase.ts

@@ -338,9 +338,9 @@ export default class MainBase extends eui.UILayer {
                 RES.getResAsync("线条尾部炸开_0000" + i + "_png");
             }
             var arr = [
-                "alert_blood","alert_prop1","alert_prop2","alert_prop3","alert_yb",
+                "alert_blood", "alert_prop1", "alert_prop2", "alert_prop3", "alert_yb",
                 "rectLatWhite",
-                "redBombBStar","redBombYStar","redBombBSnow",
+                "redBombBStar", "redBombYStar", "redBombBSnow",
                 "fesRedBigLight", "fesRedBombSta1", "fesRedBombSta2", "fesRedCap", "fesRedDown", "fesRedSmallLight", "fesRedUp", "xingxingbi",
                 "tinyRedLeft", "tinyRedMid", "tinyRedRight",
                 "festivalTargetBg",
@@ -422,7 +422,10 @@ export default class MainBase extends eui.UILayer {
                 loadSvga(getResPath() + 'resource/assets/svgas/loading_progress.svga'),
                 loadSvga(getResPath() + 'resource/assets/svgas/loading_animals.svga'),
                 loadSvga(getResPath() + 'resource/assets/svgas/loading_title.svga'),
-                loadSvga(getResPath() + 'resource/assets/svgas/拖尾结束.svga')
+                loadSvga(getResPath() + 'resource/assets/svgas/拖尾结束.svga'),
+                new Promise((r) => {
+                    RES.getResAsync('loading_jpg', (t) => { r(t) }, this)
+                })
             ]);
             loadSvga(getResPath() + 'resource/assets/svgas/box.svga');
             loadSvga(getResPath() + 'resource/assets/svgas/invite.svga');

egret/resource/default.res.json

@@ -3971,6 +3971,11 @@
 			"url": "assets/common/common_block.png",
 			"type": "image",
 			"name": "common_block_png"
+		},
+		{
+			"url": "assets/loading.jpg",
+			"type": "image",
+			"name": "loading_jpg"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/StartSkin.exml

@@ -3,9 +3,10 @@
 	<w:Config id="16705cb4eec"/>
 	<e:Label id="FZY3JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY3JW" horizontalCenter="0" visible="false"/>
 	<e:Label id="FZY4JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY4JW" horizontalCenter="0" visible="false"/>
+	<e:Component id="bg" width="750" height="1624"/>
 	<e:Component id="container2" width="20" height="20" x="0" y="0"/>
-	<e:Component id="container1" width="20" height="20" x="0" y="0"/>
-	<e:Group x="140" y="1023.94">
+	<e:Component id="container1" width="20" height="20" x="0" y="230"/>
+	<e:Group x="140" y="1096.67">
 		<e:Image source="loadingbg_png" y="0" x="0"/>
 		<e:Group id="maskwrapper" x="14.56" y="7.14" locked="true">
 			<e:Group id="container4" x="0" y="0">
@@ -17,6 +18,6 @@
 		<e:Image id="progressmask2" y="9.14" x="16" source="mask2_png" width="444" height="60" scaleX="1"/>
 	</e:Group>
 	<e:Image source="头顶树丛_png" x="0" y="0" visible="false"/>
-	<e:Label id="tips" text="正在加载中，请稍后" y="993" textColor="0x244b00" horizontalCenter="0" size="24"/>
-	<e:Label id="percentTxt" text="63%" y="1110" textColor="0x244B00" horizontalCenter="0.5"/>
+	<e:Label id="tips" text="正在加载中，请稍后" y="1065.73" horizontalCenter="0" size="24" textColor="0x000000"/>
+	<e:Label id="percentTxt" text="63%" y="1182.73" horizontalCenter="0.5" textColor="0x000000"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/QuitPanel.ts

@@ -11,13 +11,7 @@ export default class QuitPanel extends Panel {
         super.start();
         if (data)
             this._level = data.level;
-        // this['resumeBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-        //     if (this._level)
-        //         SceneCtrl.instance.change(ModuleTypes.START_SCENE, { level: this._level });
-        //     else
-        //         SceneCtrl.instance.change(ModuleTypes.START_SCENE);
 
-        // }, this);
 
         this['quitBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             NetManager.ins.clickLog(getlogItem(18));

egret/src/shareCtrl.ts

@@ -64,7 +64,7 @@ class Share2 extends ComponentBase {
             // img.src = base64;
             // img.src = data.data;
             if(this.type==1)
-                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare5.jpg', channel);
+                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare6.jpg', channel);
                 // callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare3.jpg', channel);
             else
                 callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);

egret/src/startScene/StartScene.ts

@@ -21,6 +21,7 @@ export default class StartScene extends Scene {
     private _current = 0;
     private _timer;
     level;
+
     async start(data?) {
         super.start();
         if (data)
@@ -34,16 +35,18 @@ export default class StartScene extends Scene {
         const index = Math.floor(Math.random() * list.length);
         this['tips'].text = list[index];
         // setGlow(this['tips'], 0xffffff, 1);
+        console.log(data);
         if (data && Array.isArray(data)) {
             this['container3'].addChild(data[0]);
             this['container2'].addChild(data[1]);
             this['container1'].addChild(data[2]);
+            this['bg'].addChild(new egret.Bitmap(data[4]));
         }
         else {
             await Promise.all([
                 loadSvga(getResPath() + 'resource/assets/svgas/loading_progress.svga', this['container3']),
                 loadSvga(getResPath() + 'resource/assets/svgas/loading_animals.svga', this['container2']),
-                loadSvga(getResPath() + 'resource/assets/svgas/loading_title.svga', this['container1'])
+                loadSvga(getResPath() + 'resource/assets/svgas/loading_title.svga', this['container1']),
             ]);
         }
 
@@ -96,7 +99,7 @@ export default class StartScene extends Scene {
             });
             this['percentTxt'].text = `100%`
             clearInterval(this._timer);
-        }, 200+1700 + 10000);
+        }, 200 + 1700 );
     }
 
     get skinKey() { return 'Start' }
@@ -111,11 +114,11 @@ export const changeMapScene = (p?) => {
 
 let _startSceneData;
 export const createData = () => {
-    if(_startSceneData)return _startSceneData;
+    if (_startSceneData) return _startSceneData;
     const startSceneData: any = {};
     _startSceneData = startSceneData;
 
-    const repeatCount =getRepeatCount();
+    const repeatCount = getRepeatCount();
     const list = [];
     startSceneData.list = list;
 
@@ -123,23 +126,23 @@ export const createData = () => {
     startSceneData.top.loadSkin(); startSceneData.top.start();
 
     for (let i = 0; i < repeatCount; i++) {
-        const repeat = new MapRpeatPart(i,startSceneData.top.height);
+        const repeat = new MapRpeatPart(i, startSceneData.top.height);
         repeat.loadSkin(); repeat.start();
         list.push(repeat);
     }
 
     startSceneData.bottom = new MapBottomPart();
-    startSceneData.bottom.loadSkin(); 
+    startSceneData.bottom.loadSkin();
     startSceneData.bottom.start({
-        repeatHeight:list[0].height,
-        topHeight:startSceneData.top.height
+        repeatHeight: list[0].height,
+        topHeight: startSceneData.top.height
     });
-    
+
     return startSceneData
 }
 
-export const getRepeatCount = ()=>{
+export const getRepeatCount = () => {
     /// TODO 14 = MapTopPart.LEVEL_NUMS + MapBottomPart.LEVEL_NUMS
     /// TODO 13 = MapRpeatPart.LEVEL_NUMS
-   return  (window['total_level']  - MapTopPart.LEVEL_NUMS - MapBottomPart.LEVEL_NUMS)/(MapRpeatPart.LEVEL_NUMS);
+    return (window['total_level'] - MapTopPart.LEVEL_NUMS - MapBottomPart.LEVEL_NUMS) / (MapRpeatPart.LEVEL_NUMS);
 }
\ No newline at end of file