Merge branch 'dev' of http://svn.ouj.com:3000/DWG/taptapstar into dev

assets/scene/game.fire

@@ -41,8 +41,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.3013376124437781,
-      "y": 0.3013376124437781,
+      "x": 0.35384621353193324,
+      "y": 0.35384621353193324,
       "z": 1
     },
     "_quat": {
@@ -328,6 +328,9 @@
     "myInfoTop": {
       "__id__": 7
     },
+    "grossNode": {
+      "__id__": 8
+    },
     "sidebar": {
       "__id__": 56
     },
@@ -733,7 +736,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "45AoVUmPtJ5rWCuqev0xnb"
+    "_id": "9aYn30/W9BhLvWS80n/QvT"
   },
   {
     "__type__": "cc.Label",
@@ -758,7 +761,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "f0MjR7gd9AN45/Cg7oQocu"
+    "_id": "3bimRK99lIcaztothfxFXW"
   },
   {
     "__type__": "cc.LabelOutline",
@@ -776,7 +779,7 @@
       "a": 255
     },
     "_width": 3,
-    "_id": "82jRxk3RxFM6ohNIvYbQx4"
+    "_id": "61ybVljk9G6p+fCr4Zcovs"
   },
   {
     "__type__": "cc.RichText",
@@ -836,12 +839,12 @@
       "__id__": 8
     },
     "_enabled": true,
-    "alignMode": 1,
+    "alignMode": 2,
     "_target": null,
-    "_alignFlags": 18,
+    "_alignFlags": 17,
     "_left": 0,
     "_right": 0,
-    "_top": 0,
+    "_top": 40,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -1831,7 +1834,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "91iDWwP7pI2oEG93OHfh56"
+    "_id": "ffckjkwUVMCrh0tnS2v87b"
   },
   {
     "__type__": "cc.Label",
@@ -1856,7 +1859,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "70qRh9XCZHF6Pe7GY4zWJX"
+    "_id": "8aklNvd0BDB49kig5RWWC9"
   },
   {
     "__type__": "cc.RichText",
@@ -2276,7 +2279,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "f1donZxWRLn7TpNawuBeoT"
+    "_id": "806mxoHv5P7IO3hMfB79AP"
   },
   {
     "__type__": "cc.Label",
@@ -2301,7 +2304,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "28F2jvwItBk4IYc3WR9OTr"
+    "_id": "d0JqYruL1BE79dxvyfwE/v"
   },
   {
     "__type__": "cc.RichText",

assets/scripts/common/Platform.js

@@ -386,7 +386,7 @@ class Platform {
             /// 发通知更新跟定时器相关的数据
             GameEvent.fire(GameNotificationKey.GameShowNotificationKey);
 
-            console.log('plat onshow ======= ' + GameGlobal.clickShare);
+            console.log('游戏 onshow ========= ' + GameGlobal.clickShare);
             if (GameGlobal.clickShare) {
                 let onHideTime = cc.sys.localStorage.getItem('onHideTimestamp');
 
@@ -394,17 +394,22 @@ class Platform {
                 let difference = curTime - onHideTime;
 
                 var isShareOk = false;
-                //判断是否忽略分享的状态
-                if (GameGlobal.isIgnoreShareStatus) {
+                
+                if (window.tt != undefined) {
                     isShareOk = true;
                 } else {
-                    //在分享界面停留了3秒当作分享成功，如果少于3秒即有10%概率当作成功
-                    if (difference > 3000) {
+                    //判断是否忽略分享的状态
+                    if (GameGlobal.isIgnoreShareStatus) {
                         isShareOk = true;
                     } else {
-                        let randomOk = Math.random() <= 0.1 ? true : false;
-                        if (randomOk) {
+                        //在分享界面停留了3秒当作分享成功，如果少于3秒即有10%概率当作成功
+                        if (difference > 3000) {
                             isShareOk = true;
+                        } else {
+                            let randomOk = Math.random() <= 0.1 ? true : false;
+                            if (randomOk) {
+                                isShareOk = true;
+                            }
                         }
                     }
                 }
@@ -431,6 +436,7 @@ class Platform {
     }
 
     static handelOnHide() {
+        console.log('游戏 onhide =========== ');
         GameGlobal.isOnHide = true;
         if (GameModule.userInfo) {
             GameModule.userInfo.doReport();

assets/scripts/game/Game.js

@@ -22,6 +22,7 @@ cc.Class({
         levelHomePrefab: cc.Prefab,
 
         myInfoTop: cc.Node,
+        grossNode: cc.Node,
 
         sidebar: cc.Node,
 
@@ -114,6 +115,10 @@ cc.Class({
             this.messageListNode.getComponent(cc.Widget).top = 250 + 30;
         }
 
+        if (window.tt != undefined) {
+            this.grossNode.getComponent(cc.Widget).top = tt.getMenuButtonLayout().top;
+        }
+
         this.additionTipsNode = this.additionTipsNode.getComponent('AdditionTips');
         if (GameGlobal.shareType == ShareAction.SHOW_GROUP_RANK && GameGlobal.shareTicket.length > 0) {
             if (this.homeGuide.guideState.state1.pass) {

assets/scripts/game/HomeSideCtrl.js

@@ -77,7 +77,7 @@ cc.Class({
         }
 
         //判断正在审核中的版本隐藏7天登录按钮或已完成7天登录任务
-        if (GameGlobal.isCheck || (GameGlobal.userLoginReward.isLoginReward && GameGlobal.userLoginReward.rewardCount == 7)) {
+        if (GameGlobal.isCheck || GameGlobal.userLoginReward.rewardCount >= 7) {
             this.loginRewardNode.active = false;
             this.moreContentWidth = 225;
             if (window.tt != undefined) {

assets/scripts/net/WeChat.js

@@ -210,7 +210,7 @@ class WeChat {
                 imageUrl: 'https://pub.dwstatic.com/wxgame/taptapstar/share/' + shareObjct.icon,
                 query: 'uid=' + GameGlobal.user.uid + '&shareType=' + ShareAction.INVITE_FRIEND,
                 success: (res) => {
-                    console.log('分享成功');
+                    console.log('头条分享成功');
                     success && success();
                     if (GameGlobal.clickShare) {
                         GameEvent.fire(GameNotificationKey.ShowShareAction, GameGlobal.gameShareType, true);
@@ -225,7 +225,7 @@ class WeChat {
                     }
                 },
                 fail: () => {
-                    console.log('分享失败或取消');
+                    console.log('头条分享失败或取消');
                     fail && fail();
                     if (GameGlobal.clickShare) {
                         GameEvent.fire(GameNotificationKey.ShowShareAction, GameGlobal.gameShareType, false);