1

egret/index.html

@@ -66,7 +66,6 @@
         data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
     </div>
     <img id="shareImg" />
-    <script src="libs/svga.egret.min.js"></script>
     <script src="libs/modules/egret/egret.js"></script>
     <script src="libs/modules/egret/egret.web.js"></script>
     <script src="libs/modules/eui/eui.js"></script>
@@ -74,6 +73,7 @@
     <script src="libs/modules/assetsmanager/assetsmanager.js"></script>
     <script src="libs/modules/tween/tween.js"></script>
     <script src="libs/zepto.min.js"></script>
+    <script src="libs/svga.egret.min.js"></script>
     <script src="libs/security.js"></script>
     <script src="libs/downloadApp.js"></script>
     <script>
@@ -137,7 +137,7 @@
             adslotId: '',
             consumerId: '2972591116',
             isNotLoginUser: false,
-            uid: '60e66b21e5777f54e6b0a22f0a4e6bc4-169586076dc',
+            uid: '',
             hdType: 'duiba',
             hdToolId: '42649',
             appType: 'credits',
@@ -285,6 +285,15 @@
                 media.pause();
             }
         }
+
+        var oHead = document.querySelector('body');
+        var oScript = document.createElement('script');
+        oScript.type = 'text/javascript';
+        oScript.src = '//yun.duiba.com.cn/webapp/js/vconsole.min.js';
+        oHead.appendChild(oScript);
+        oScript.onload = function () {
+            var vConsole = new VConsole();
+        }
     </script>
     <script src="output.js"></script>
 </body>

egret/src/Main.ts

@@ -56,6 +56,14 @@ class Main extends MainBase {
         // let mv = await SVGACtrl.instance.load("http://yun.duiba.com.cn/db_games/activity/garbageSorting1.00/guideTips.svga");
         // let soundArr = ["numCountDown_mp3", "rightTips_mp3"]
         // preloadSound(soundArr);
+        if (!GameConst.getQueryString("first")) {
+            if (window.location.href.indexOf("?") >= 0) {
+                window.location.href = window.location.href + "&first=1"
+            } else {
+                window.location.href = window.location.href + "?first=1"
+            }
+
+        }
     }
 
 
@@ -152,7 +160,7 @@ class Main extends MainBase {
 window['Main'] = Main;
 egret.ImageLoader.crossOrigin = "anonymous";
 egret.runEgret({
-    renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: function (context: any) {
+    renderMode: "canvas", audioType: 0, calculateCanvasScaleFactor: function (context: any) {
         var backingStore = context.backingStorePixelRatio ||
             context.webkitBackingStorePixelRatio ||
             context.mozBackingStorePixelRatio ||

egret/src/playScene/PlayScene.ts

@@ -184,29 +184,36 @@ export default class PlayScene extends Scene {
     }
 
     onEnd_guideEle(e) {
-        const condition: boolean = GameConst.contain(this.recoverableWaste, this.guideTarget);
+        const condition: boolean = this.guideTarget ? GameConst.contain(this.recoverableWaste, this.guideTarget) : false;
         if (condition) {
             this.guideEle.removeEventListener(egret.TouchEvent.TOUCH_BEGIN, this.onBegin_guideEle, this);
             this.removeEventListener(egret.TouchEvent.TOUCH_MOVE, this.onMove_guideEle, this);
             this.removeEventListener(egret.TouchEvent.TOUCH_CANCEL, this.onEnd_guideEle, this);
             this.removeEventListener(egret.TouchEvent.TOUCH_END, this.onEnd_guideEle, this);
-            egret.Tween.get(this.guideTarget)
-                .to({ scaleX: 0, scaleY: 0 }, 200)
-                .call(() => {
-                    this.onTap_guideGroup();
-                })
+            if (this.guideTarget) {
+                egret.Tween.get(this.guideTarget)
+                    .to({ scaleX: 0, scaleY: 0 }, 200)
+                    .call(() => {
+                        this.onTap_guideGroup();
+                    })
+
+            }
+
         } else {
             this.guideEle.scaleX = 0;
             this.guideEle.scaleY = 0;
             egret.Tween.get(this.guideEle)
                 .to({ scaleX: 1, scaleY: 1 }, 200)
             this.guideEle.visible = true;
-            egret.Tween.get(this.guideTarget)
-                .to({ scaleX: 0, scaleY: 0 }, 200)
-                .call(() => {
-                    this.removeChild(this.guideTarget);
-                    this.guideTarget = null;
-                })
+            if (this.guideTarget) {
+                egret.Tween.get(this.guideTarget)
+                    .to({ scaleX: 0, scaleY: 0 }, 200)
+                    .call(() => {
+                        this.removeChild(this.guideTarget);
+                        this.guideTarget = null;
+                    })
+            }
+
             MovieClipCtrl.instance.getMovieClipByName("guideTips_0").visible = true;
             this.guideEle.addEventListener(egret.TouchEvent.TOUCH_BEGIN, this.onBegin_guideEle, this);
         }

egret/src/prize/PrizePanel.ts

@@ -89,7 +89,6 @@ export default class PrizePanel extends Panel {
 
     onUse() {
         if (this.lottery.type == LotteryType.LUCKY) {
-
             window["downloadAppConfig"] =
                 {
                     openUrl: this.lottery.openUrl,