Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/yyh into dev

egret/index.html

@@ -350,21 +350,21 @@
         console.log("进入分享图片");
         var imgUrl;
         if(num == 1){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/maphz.png"
         }else if(num == 2){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/mapam.png"
         }else if(num == 3){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/mapxg.png"
         }else if(num == 4){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/maptb.png"
         }else if(num == 5){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/maprb.png"
         }else if(num == 6){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/maphg.png"
         }else if(num == 7){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/mapcx.png"
         }else if(num == 8){
-            imgUrl = ""
+            imgUrl = "//yun.duiba.com.cn/db_games/activity/yzw_hjcd/map/mapmg.png"
         }
         AlipayJSBridge.call('esportsShare', {imgUrl:imgUrl});
     }
@@ -373,6 +373,7 @@
     }
 
     </script>
+      
     <!-- <script>
         //音乐自动播放
         $(document).ready(function () {

egret/src/startScene/StartScene.ts

@@ -133,7 +133,10 @@ export default class StartScene extends Scene {
         }else{
             this.scorelab.text = "我的分数：0";
         }
-        
+        if(this.level>0){
+            GCache.writeCache("isGuide",true);
+            GCache.writeCache("isGuide2",true);
+        }else{
             if(!GCache.readCache("isGuide")){
                 GCache.writeCache("isGuide",true);
                 this.openGuide();
@@ -143,6 +146,9 @@ export default class StartScene extends Scene {
                     PanelCtrl.instance.show(ModuleTypes.GUIDE_PANEL,data);
                 }
             }
+        }
+        
+        
         
         if(this.type && this.type == 1){
             //引导过程中点亮杭州 回到引导页面显示第几位火炬手