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

assets/resources/prefabs/precedence/offline_grossIncome.prefab

@@ -173,7 +173,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "4aPIlSSXpNhpwQnJK4WHbV"
+    "_id": ""
   },
   {
     "__type__": "cc.BlockInputEvents",
@@ -183,7 +183,7 @@
       "__id__": 2
     },
     "_enabled": true,
-    "_id": "d4TDotMx1GLobtCMjxAaso"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -191,7 +191,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "67HKADerdLjqvCCtbdWlhe",
     "sync": false
@@ -431,7 +431,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "acleq8cp5H6p1YklDX+6h7"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -439,9 +439,9 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
-    "fileId": "32llnDTlZJhpqt0x4Isaeh",
+    "fileId": "0fYvSjbadL6oxmwT11x81b",
     "sync": false
   },
   {
@@ -460,7 +460,7 @@
     "_N$lineHeight": 40,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "b2+Xb5I11C2rTEKlSg6vRb"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -468,7 +468,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "de2EmMkhFAMY2R9644DYCY",
     "sync": false
@@ -562,7 +562,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "82AiyScTVD75qGMXINdILF"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -570,7 +570,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "3bmr3zTFxJ56Tp0bZDzzWA",
     "sync": false
@@ -731,7 +731,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "28ro8mk4JH850+ADjXd0EJ"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -739,7 +739,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "90in/sA5RECr1HRYYZnca3",
     "sync": false
@@ -811,7 +811,7 @@
     "_N$target": {
       "__id__": 16
     },
-    "_id": "19afpqF31FGpbDkkqkQHa8"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -828,7 +828,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "74LcQZd5lBPbnjOCDGucir",
     "sync": false
@@ -986,7 +986,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "17s1b6wxNAWZKmCCNxiwcy"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -994,9 +994,9 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
-    "fileId": "dfMraWjgtJDa/QenGyA1ye",
+    "fileId": "bf1exGRPJGZoAb9JCavQhP",
     "sync": false
   },
   {
@@ -1015,7 +1015,7 @@
     "_N$lineHeight": 30,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "caChp6FJNGprZyufL40qCn"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1023,7 +1023,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "25Lp2lLoBPIKCo58uK2pdV",
     "sync": false
@@ -1184,7 +1184,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "b9f45mg0BCe5eNQJEcmhAG"
+    "_id": ""
   },
   {
     "__type__": "cc.LabelOutline",
@@ -1202,7 +1202,7 @@
       "a": 255
     },
     "_width": 4,
-    "_id": "35hl5uTi5Fr5dk1+9mDvE6"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1210,9 +1210,9 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
-    "fileId": "6eS8x/3RROXY34emMGj+bt",
+    "fileId": "d2MstZv55GLpaENLCguGHh",
     "sync": false
   },
   {
@@ -1231,7 +1231,7 @@
     "_N$lineHeight": 50,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "3erA7r7s5HPKbOgDWs5kDi"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1239,7 +1239,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "c6ZLEC3CNDobfBZRwdEPeF",
     "sync": false
@@ -1476,7 +1476,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "998oZnjYVGEKcMwD2Vwq3j"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1484,7 +1484,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "45356gzeBJjah/tlkIVvXl",
     "sync": false
@@ -1568,7 +1568,7 @@
     "_N$lineHeight": 30,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "60PY/3FmhMda+crc/JqNgn"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1576,7 +1576,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "8b8f4kOetJ17rrJfzCfMid",
     "sync": false
@@ -1607,7 +1607,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "b7RFvg4U1FYbXmRwQiVC9Y"
+    "_id": ""
   },
   {
     "__type__": "cc.Button",
@@ -1676,7 +1676,7 @@
     "_N$target": {
       "__id__": 37
     },
-    "_id": "e2nWr+n5tFA6cdPoRObPNy"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -1693,7 +1693,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "e7yytwhS5BJ754/t0iBJbT",
     "sync": false
@@ -1857,7 +1857,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "eblA1Fd81DBY7gtDJacrEX"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1865,7 +1865,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "43d1fFumVMvbraox5Pt8Cg",
     "sync": false
@@ -1949,7 +1949,7 @@
     "_N$lineHeight": 30,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "d0zEaZgClCK4pRMj2o+0QI"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1957,7 +1957,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "29OGt0FwhL44jtvJVa0cWa",
     "sync": false
@@ -1988,7 +1988,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "bf+9CiXj1G/IHFyC+YarKM"
+    "_id": ""
   },
   {
     "__type__": "cc.Button",
@@ -2057,7 +2057,7 @@
     "_N$target": {
       "__id__": 48
     },
-    "_id": "a5AvJOlSdB9qsyBRELORb5"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -2074,7 +2074,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "89BRkrXI1GZqk8NNOWdrqc",
     "sync": false
@@ -2235,7 +2235,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "2aKmV9y6xDDZLxia6hV6wO"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2243,7 +2243,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "6f2DCM6NVL5IQxwdrNdQIa",
     "sync": false
@@ -2274,7 +2274,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "b0ahoTCkNJz49bEyvSntmC"
+    "_id": ""
   },
   {
     "__type__": "cc.Button",
@@ -2331,7 +2331,7 @@
     "_N$target": {
       "__id__": 59
     },
-    "_id": "38+gFIildO/qTmnInPJYjD"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -2348,7 +2348,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "20A9ztz45LFI5T9BoRb4HJ",
     "sync": false
@@ -2383,7 +2383,7 @@
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "00D1/CB+5FjK8rFt9USeS7"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2391,7 +2391,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "53dF1LWQBDaab0bO3pTGgy",
     "sync": false
@@ -2422,7 +2422,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "e92P0L26BH16CPn+MKcflZ"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2430,7 +2430,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "2bSv2XkHdJJZ7gv8LqVgZV",
     "sync": false
@@ -2524,7 +2524,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "83WOPWWmBH1aQhJ9KclCx0"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2532,7 +2532,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "1f+eDN0EdJMYyr2AaCM1Kl",
     "sync": false
@@ -2566,11 +2566,14 @@
     "shareBtn": {
       "__id__": 48
     },
+    "shareLabel": {
+      "__id__": 50
+    },
     "normalBtn": {
       "__id__": 59
     },
     "_N$zIndex": 100,
-    "_id": "batC1xVbJPLqlxAbWfKZdz"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2578,7 +2581,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "3815ae2f-f25b-4b36-8131-96fa35866f5e"
+      "__uuid__": "75d30958-b1d0-4262-8216-1ceedeefa81e"
     },
     "fileId": "62OEGyCiNIHrjLwRY5lof2",
     "sync": false

assets/scripts/game/OfflineGrossIncome.js

@@ -32,6 +32,7 @@ cc.Class({
             default: null,
             type: cc.Node
         },
+        shareLabel: cc.Label,
         normalBtn: {
             tooltip: '普通确认按钮',
             default: null,
@@ -76,7 +77,7 @@ cc.Class({
         this.grossIncome = grossIncome;
 
         this._resetBtn();
-        if (CC_WECHATGAME) {
+        if (CC_WECHATGAME || window.tt != undefined || CC_QQPLAY) {
             //判断是否是正在审核的版本，是的话将隐藏分享到群的按钮
             if (GameGlobal.isCheck) {
                 this.videoBtn.active = false;
@@ -115,11 +116,15 @@ cc.Class({
             this.videoBtn.getComponent(cc.Button).interactable = true;
 
         });
+
+        if (window.tt != undefined) {
+            this.shareLabel.string = "分享获得2倍";
+        }
     },
 
     initAd() {
 
-        if (!CC_WECHATGAME) {
+        if (!CC_WECHATGAME || window.tt == undefined) {
             return;
         }