1

egret/libs/config.d.ts

+declare var TBSDK_ADA;
+declare var Zepto;
 declare var resPath:string;
 declare var requirelogin:Function;
 declare var CFG;

egret/libs/new_wx/MainBase.ts

-import { check_webp_feature } from "../tc/util/GFun";
+import getResPath from "../new_tc/getResPath";
+import { check_webp_feature, getImgURL } from "../tc/util/GFun";
 import { DataManager } from "../tw/manager/DataManager";
 import { NetManager } from "../tw/manager/NetManager";
 import AssetAdapter from "./adapter/AssetAdapter";
@@ -9,6 +10,7 @@ import Loading from "./components/Loading";
 import OptionsPanel from "./components/OptionsPanel";
 import PlaySceneBase from "./components/PlaySceneBase";
 import PrizePanel from "./components/PrizePanel";
+import RankPanel from "./components/RankPanel";
 import RulePanel from "./components/RulePanel";
 import StartSceneBase from "./components/StartSceneBase";
 import PanelCtrl from "./ctrls/panelCtrl";
@@ -16,14 +18,12 @@ import SceneCtrl from "./ctrls/sceneCtrl";
 import showAlertPanel from "./ctrls/showAlertPanel";
 import { ModuleTypes } from "./types/sceneTypes";
 import layers from "./views/layers";
-import RankPanel from "./components/RankPanel";
-import getResPath from "../new_tc/getResPath";
-import loadSpriteSheet from "./loadSpriteSheet";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
         super();
         check_webp_feature();
+        Loading.instace.loadImage();
     }
 
     protected registerModules() {
@@ -87,6 +87,8 @@ export default class MainBase extends eui.UILayer {
 
         layers.init(this);
         Loading.init(layers.topLayer);
+        Loading.instace.show();
+        
         PanelCtrl.instance.init(layers.popupLayer);
         SceneCtrl.instance.init(layers.sceneLayer);
 
@@ -95,7 +97,7 @@ export default class MainBase extends eui.UILayer {
         this.registerModules();
 
         this.loadFirstScreen();
-        this.loadAtlas();
+        Loading.instace.show();
         this.getData();
         RES.setMaxLoadingThread(10);
         this.runGame().catch(e => {
@@ -104,13 +106,13 @@ export default class MainBase extends eui.UILayer {
     }
 
     loadAtlas() {
-        if (!window['development']) {
-            loadSpriteSheet().then((spritesheet: egret.SpriteSheet) => {
-                Loading.instace.setSpriteSheet(spritesheet);
-                const t = Date.now() - window['__startTime__'];
-                console.log(`首屏loading显示时间：${t}ms`);
-            })
-        }
+        // if (!window['development']) {
+        //     loadSpriteSheet().then((spritesheet: egret.SpriteSheet) => {
+        //         Loading.instace.setSpriteSheet(spritesheet);
+        //         const t = Date.now() - window['__startTime__'];
+        //         console.log(`首屏loading显示时间：${t}ms`);
+        //     })
+        // }
     }
 
     _firstBgLoaded = false;
@@ -135,7 +137,8 @@ export default class MainBase extends eui.UILayer {
         }
         const imageLoader = new egret.ImageLoader();
         imageLoader.once(egret.Event.COMPLETE, onImageLoaded, this);
-        const url = getResPath() + "resource/assets/startScene/startscenebg.jpg"
+        const url = getResPath() + "resource/assets/startScene/startscenebg.jpg";
+        // url = getImgURL(url);
         imageLoader.load(url);
     }
 

egret/libs/new_wx/components/Loading.ts

-
 export default class Loading extends egret.Sprite {
     private static _parent: egret.Sprite;
     private static _instance: Loading;
-    static get instace(): Loading {
-        return Loading._instance || (Loading._instance = new Loading());
+    private static bg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAC0CAYAAAATiCegAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQwIDc5LjE2MDQ1MSwgMjAxNy8wNS8wNi0wMTowODoyMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjNCQzYyMjY2QTc2NDExRTg5QTUzRjU2RkQ3RDBDQzhDIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjNCQzYyMjY3QTc2NDExRTg5QTUzRjU2RkQ3RDBDQzhDIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6M0JDNjIyNjRBNzY0MTFFODlBNTNGNTZGRDdEMENDOEMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6M0JDNjIyNjVBNzY0MTFFODlBNTNGNTZGRDdEMENDOEMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4bbLCYAAACQklEQVR42uzZT0rDQBTA4fwBodssPEO3XiAH6Mqjuip0m2v0DrlBwYlkMJRUU6vzEL4PHlmUuhh+vGawrrY7zM9+fnYVfBrn5zA/j1u+VG8MrxccPwhy+C7EWnhEhth+Ed9rmp3z40FTQ/s0lzTnLQHm+OA3rUbYio/ICFvxERlhs/igdzYU0l9vwGn7vTgXCl5MPrZgY/sRuQVb24/ILdg4ByI1fn6J/Bm2AQnfgP7XS5TOBiR8A4IAESAIEAGCABEgCBABggARIAgQAYIAESAIEAGCABEgCBABggARIAgQAYIAESAIEAGCABEgCBABIkAQIAIEASJAECACBAEiQBAgAgQBIkAQIAIEASJAECACBAEiQBAgAgQBIkAQIAIEASJAECACRIAgQAQIAkSAIEAECAJEgCBABAgCRIAgQAQIAkSAIEAECAJEgCBABAgCRIAgQAQIAkSAIEAECAJEgAgQBIgAQYAIEASIAEGACBAEiABBgAgQBIgAQYAIEASIAEGACBAEiABBgAgQBIgAQYAIEASIAEGACBABggARIAgQAYIAESAIEAGCABEgCBABggARIAgQAYIAESAIkP8V4OgYCDLagIRq0zyl2TsKApxsQMLfAY/eA4l4/5vayxtwcB4UNuQNWNmCRGy/ZYC2IMW3X74FZ+c0Fzdi/thb3n7XAYqQovGtBShCisV3K8BlhM9pds6OBy8cp7X4JvWGP3BI06fpnCV3hjfcCu+eAJchVnOMlSBZCW55wz1u+dK7AAMAr747P8Ezfo0AAAAASUVORK5CYII=';
+    private static progress = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAA4CAYAAACohjseAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQwIDc5LjE2MDQ1MSwgMjAxNy8wNS8wNi0wMTowODoyMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGRDM0MjA1QTc4NDExRTg5QTUzRjU2RkQ3RDBDQzhDIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGRDM0MjA2QTc4NDExRTg5QTUzRjU2RkQ3RDBDQzhDIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6M0JDNjIyNjhBNzY0MTFFODlBNTNGNTZGRDdEMENDOEMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZEMzQyMDRBNzg0MTFFODlBNTNGNTZGRDdEMENDOEMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4SQhovAAABqUlEQVR42uyavW6EMAzHSQbEgrqxlQWpU5+m6ov0SfoifZxOlVArurFVLIAEbS0ViUbJ5ds57vxbDhhs/xMfJI6zDIllWd6//4BrLL8MyxEI++f4Fwy/PLtwSCAJJIFnLrBt25thGO7h91yCtomJ6QzVdf203Y/j+FKW5WvKzwQIK4ricbvvuu65aZovpxmsqup2fw+GwUGqmRPFyWK0Etj3/af4LJVImThVjFYrGZVh23T1SVGfGLQvGTAAhlLNpO8AG30mQohc1/VDdh07exjmaKbwxVI5xvJhvZJRpWue53ehZk9my3UAnZZqMpHzPL+FEijaivEXME6laZoeYrxNY9omCIIgiI19xdkUzMq0b5xM3KcZL2KRKtOq/WTUpdqR4KZ7M9XeDoujxEkQBEFcD0coWTCfAPalvZhlQx/bPEQAQMyyoc8xAQ8hDohZNvQRefGle47l0LbTKdSpFsMaTdfzwejHZ5hpGWMmTwqEJoSU4kxE6jotrJoQUojTiQzahJDslOeESF0TgpZQjUBixQsrJuoXPTokkASSwCsR6NLpFIIfAQYAmaA+/cC+3MAAAAAASUVORK5CYII=';
+
+    getBitmap(base64: string, callback: (bitmap) => void): void {
+        const img = new Image();
+        img["avaliable"] = true;
+        img.src = base64;
+        img.onload = () => {
+            const texture = new egret.Texture();
+            const bitmapdata = new egret.BitmapData(img);
+            texture._setBitmapData(bitmapdata);
+            callback(new egret.Bitmap(texture));
+        }
     }
 
     _bg: egret.Bitmap;
     _progress: egret.Bitmap;
-    setSpriteSheet(spritesheet: egret.SpriteSheet) {
-        this._bg = new egret.Bitmap(spritesheet.getTexture('bg_png'));
-        this._bg.x = 295;
-        this._bg.y = 288;
-        this._progress = new egret.Bitmap(spritesheet.getTexture('progress_png'));
-        this._progress.x = 375;
-        this._progress.y = 380;
-        this._progress.anchorOffsetX = this._progress.anchorOffsetY = 28;
-        this.addChild(this._bg);
-        this.addChild(this._progress);
-        this.show();
-        
+    loadImage() {
+        this.getBitmap(Loading.bg, (bitmap: egret.Bitmap) => {
+            const t = Date.now() - window['__startTime__'];
+            console.log(`首屏loading显示时间：${t}ms`);
+            this._bg = bitmap;
+            this._bg.x = 295;
+            this._bg.y = 288;
+            this.addChild(this._bg);
+        })
+
+        this.getBitmap(Loading.progress, (bitmap: egret.Bitmap) => {
+            this._progress = bitmap;
+            this._progress.x = 375;
+            this._progress.y = 380;
+            this._progress.anchorOffsetX = this._progress.anchorOffsetY = 28;
+            this.addChild(this._progress);
+        })
+    }
+
+    static get instace(): Loading {
+        return Loading._instance || (Loading._instance = new Loading());
     }
 
     show() {
@@ -28,7 +47,8 @@ export default class Loading extends egret.Sprite {
     }
 
     hide() {
-        Loading._parent.removeChild(this);
+        if (this.parent)
+            Loading._parent.removeChild(this);
         this.removeEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
     }
 
@@ -41,3 +61,4 @@ export default class Loading extends egret.Sprite {
             this._progress.rotation += 5;
     }
 }
+

egret/libs/new_wx/ctrls/sceneCtrl.ts

@@ -26,11 +26,11 @@ export default class SceneCtrl {
                 RES.getResAsync(`${key}scenebg_jpg`)]);
             p.then(() => {
                 // this.loadAtlasAndBg(scene, () => {
-                Loading.instace.hide();
                 this.showAfterLoadAtlas(scene, data, onComplete);
                 // })
             });
         } else {
+            
             this.showAfterLoadAtlas(scene, data, onComplete);
         }
     }
@@ -53,6 +53,7 @@ export default class SceneCtrl {
     // }
 
     showAfterLoadAtlas(scene: Scene, data, onComplete: Function) {
+        Loading.instace.hide();
         if (this._currentScene) {
             const oldScene = this._currentScene;
             egret.Tween.get(oldScene).to({ alpha: 0 }, 0).call(() => {

egret/libs/tc/util/GFun.ts

@@ -88,9 +88,9 @@ export const check_webp_feature = () => {
     return false;
 }
 
-// export const getImgURL = (url: string): any => {
-//     const isSupport = check_webp_feature();
-//     if (isSupport)
-//         return url + '?x-oss-process=image/format,webp';
-//     return url;
-// }
+export const getImgURL = (url: string): any => {
+    const isSupport = check_webp_feature();
+    if (isSupport)
+        return url + '?x-oss-process=image/format,webp';
+    return url;
+}
\ No newline at end of file

egret/resource/TextureMerger/loading.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["../assets/loading/bg.png","../assets/loading/progress.png"]}
\ No newline at end of file

egret/resource/default.res.json

@@ -28,10 +28,6 @@
 			"keys": "X_png,ruleBg_png",
 			"name": "rule"
 		},
-		{
-			"keys": "bg_png,progress_png",
-			"name": "loading"
-		},
 		{
 			"name": "preload",
 			"keys": "playscenebg_jpg,startscenebg_jpg"
@@ -208,16 +204,6 @@
 			"type": "image",
 			"name": "testbtn_png"
 		},
-		{
-			"url": "assets/loading/bg.png",
-			"type": "image",
-			"name": "bg_png"
-		},
-		{
-			"url": "assets/loading/progress.png",
-			"type": "image",
-			"name": "progress_png"
-		},
 		{
 			"name": "playscenebg_jpg",
 			"type": "image",

egret/resource/default.thm.json

@@ -3,7 +3,6 @@
 	"autoGenerateExmlsList": true,
 	"exmls": [
 		"resource/skins/AlertSkin.exml",
-		"resource/skins/LoadingSkin.exml",
 		"resource/skins/OptionItemSkin.exml",
 		"resource/skins/OptionsSkin.exml",
 		"resource/skins/PlaySkin.exml",

egret/resource/skins/LoadingSkin.exml

-<?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="loadingSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing" xmlns:tween="egret.tween.*">
-	<w:Declarations>
-	</w:Declarations>
-	<e:Image y="288" source="bg_png" x="295"/>
-	<e:Image id="waitImg" source="progress_png" y="380" anchorOffsetX="28" anchorOffsetY="28" rotation="{data.speed}" x="375"/>
-</e:Skin>
\ No newline at end of file