Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

taobao_jn/client/pages/pagegamemain/pagegamemain.acss

@@ -684,7 +684,7 @@ letter-spacing: 3rpx;
 .gamemain .gamemguide .gamemguidecont .gamemguide2 {
   width: 482rpx;
   height: 290rpx;
-  opacity: 0.5;
+  opacity: 1;
   display: block;
   left: 96rpx;
   top: 310rpx;

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -48,8 +48,8 @@ Page({
     ],//实际展示的list
     iswin: false,//
     step: 1,//阶段
-    startime:0,
-    endtime:0,
+    startime: 0,
+    endtime: 0,
     //我的消息通知
     linvite: {
       count: 0,
@@ -117,10 +117,11 @@ Page({
       key: 'jn_' + app.openId + '_new'
     });
     let isnew = isnewdata.data ? 0 : 1;
+    isnew = 1;
     this.setData({
       isnew: isnew
     });
-    if(isnew!=0){
+    if (isnew != 0) {
       my.setStorageSync({
         key: 'jn_' + app.openId + '_new',
         data: 1
@@ -128,9 +129,9 @@ Page({
     }
 
     console.log("新手", isnew, query);
-    let {end,gl,start,step,toolcd} = query;
+    let { end, gl, start, step, toolcd } = query;
     step = Number(step);
-    gameatime = Math.floor((Number(end)-Number(start))/1000);
+    gameatime = Math.floor((Number(end) - Number(start)) / 1000);
     gtoolcd = Number(toolcd);
     let sucgl = Number(gl);
     let nranksuc = Math.random() * 100;
@@ -163,12 +164,16 @@ Page({
       showattionlist: [],
       canwin: canwin,
       isfirst: true,
-      gametime:gameatime,
-      tooltime:0,
-      startime:Number(start),
-      endtime:Number(end),
+      gametime: gameatime,
+      tooltime: 0,
+      startime: Number(start),
+      endtime: Number(end),
     });
     this.changePashow();
+    my.__updateWarms = () => {
+      this.updateActInfo();
+    }
+    console.log("my======>",my);
   },
   startGame() {
     if (this.data.isnew > 0 && this.data.isnew < 7) {
@@ -322,7 +327,7 @@ Page({
     }
   },
   onShow() {
-    if ((this.data.isnew > 0 && this.data.isnew < 7)||this.data.show_v!=2) {
+    if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2) {
       return;
     }
     this.updateActInfo();

taobao_jn/client/resconfig/resList.js

@@ -422,7 +422,7 @@ const resList = {
       '7e075ada-3bc1-4890-aa53-f0b3eb11c0bd': {
         name: '新手引导页3',
         ext: '.png',
-        url: '//yun.duiba.com.cn/spark/assets/新手引导页3.5914916fd7de9eaf741fc45c2a916ec966535b35.png',
+        url: '//yun.duiba.com.cn/spark/assets/新手引导页31.37457d8f9b581a6ee9c6d86e37f55389097f9e0f.png',
         uuid: '7e075ada-3bc1-4890-aa53-f0b3eb11c0bd',
       },
       'fd40efdd-8da6-4e1f-be5e-f920c917593e': {