Prechádzať zdrojové kódy

修改商城和提现

tang biao 5 rokov pred
rodič
commit
f5b61ff1f8

+ 11 - 7
assets/resources/prefabs/precedence/draw_content.prefab

@@ -660,7 +660,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "cdTdk0ACtJW5yc/d+ao4NZ",
+    "fileId": "4fU7LPlyBCkq8kVW/Ae2kA",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -1529,7 +1529,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "38yIf3zsFNXJE7SzB3yLHM",
+    "fileId": "6fAa95sp5CV4F66k8keSLk",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -1628,7 +1628,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "3c+d1QxQ9H368MVym3THq2",
+    "fileId": "b8iHb0JrFCO6UY8PvNZj4X",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2316,7 +2316,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "13FPUlgcFP2pKFTJ5Yl7O7",
+    "fileId": "a2VLjGrPhKwa/glIoZDPtZ",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2415,7 +2415,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "87GVtyTHZOJoJqjddvQkDI",
+    "fileId": "d4aG1xFCdIDodfEYo8lM6+",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -3115,7 +3115,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "eajVuXZiZA86v+rNclIijq",
+    "fileId": "b8czzJdyNICY4xkC23VSz7",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -3214,7 +3214,7 @@
     "asset": {
     "asset": {
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
       "__uuid__": "ccee106e-a016-4055-9d7e-3862f77f1109"
     },
     },
-    "fileId": "a3wFEB6vhOF7Av0+ZcyKo9",
+    "fileId": "8dhJ/YdCBI2K4+eOIH+Zz6",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -4367,6 +4367,10 @@
     "drawMoneyLabel": {
     "drawMoneyLabel": {
       "__id__": 112
       "__id__": 112
     },
     },
+    "drawRecordButton": {
+      "__id__": 122
+    },
+    "_adState": 0,
     "_id": ""
     "_id": ""
   },
   },
   {
   {

+ 6 - 0
assets/scripts/draw/DrawContent.js

@@ -26,6 +26,8 @@ cc.Class({
         shareActionNode: cc.Node,
         shareActionNode: cc.Node,
         drawMoneyLabel: cc.RichText,
         drawMoneyLabel: cc.RichText,
 
 
+        drawRecordButton: cc.Button,
+
         /// 1视频广告  0普通分享
         /// 1视频广告  0普通分享
         _adState: 0
         _adState: 0
     },
     },
@@ -33,6 +35,10 @@ cc.Class({
      // LIFE-CYCLE CALLBACKS:
      // LIFE-CYCLE CALLBACKS:
 
 
     onLoad () {
     onLoad () {
+        ///头条隐藏提现
+        if (window.tt !== undefined) {
+            this.drawRecordButton.node.active = false;
+        }
         this.setUpUIIsShow(false);
         this.setUpUIIsShow(false);
         if (GameGlobal.isCheck) {
         if (GameGlobal.isCheck) {
             this.shareActionNode.active = false;
             this.shareActionNode.active = false;

+ 4 - 4
assets/scripts/game/Game.js

@@ -52,7 +52,7 @@ cc.Class({
     // LIFE-CYCLE CALLBACKS:
     // LIFE-CYCLE CALLBACKS:
 
 
     onLoad () {
     onLoad () {
-        this.isShowBar = false;
+        GameGlobal.isShowBar = false;
         this._isTimer = false;
         this._isTimer = false;
         this.winSize = cc.view.getVisibleSize();
         this.winSize = cc.view.getVisibleSize();
         GameGlobal.winSize = this.winSize;
         GameGlobal.winSize = this.winSize;
@@ -376,7 +376,7 @@ cc.Class({
             return;
             return;
         }
         }
 
 
-        this.isShowBar = true;
+        GameGlobal.isShowBar = true;
         let action = cc.moveBy(0.3, cc.v2(-this.sidebar.width, 0));
         let action = cc.moveBy(0.3, cc.v2(-this.sidebar.width, 0));
         this.sidebar.runAction(action);
         this.sidebar.runAction(action);
         this.sliderNode.getComponent('HomeSideCtrl').handelShowRedDot();
         this.sliderNode.getComponent('HomeSideCtrl').handelShowRedDot();
@@ -400,10 +400,10 @@ cc.Class({
     },
     },
 
 
     finishState29() {
     finishState29() {
-        if (this.isShowBar) {
+        if (GameGlobal.isShowBar) {
             return;
             return;
         }
         }
-        this.isShowBar = true;
+        GameGlobal.isShowBar = true;
         let action = cc.moveBy(0.3, cc.v2(-this.sidebar.width, 0));
         let action = cc.moveBy(0.3, cc.v2(-this.sidebar.width, 0));
         this.sidebar.runAction(action);
         this.sidebar.runAction(action);
         this.sliderNode.getComponent('HomeSideCtrl').handelShowRedDot();
         this.sliderNode.getComponent('HomeSideCtrl').handelShowRedDot();

+ 6 - 1
assets/scripts/game/HomeSideCtrl.js

@@ -51,6 +51,11 @@ cc.Class({
             this.drawNode.active = false;
             this.drawNode.active = false;
         }
         }
 
 
+        /// 如果是头条那么隐藏商城
+        if (window.tt != undefined) {
+            this.storeNode.active = false;
+        }
+
         //判断正在审核中的版本隐藏7天登录按钮或已完成7天登录任务
         //判断正在审核中的版本隐藏7天登录按钮或已完成7天登录任务
         if (GameGlobal.isCheck || (GameGlobal.userLoginReward.isLoginReward && GameGlobal.userLoginReward.rewardCount == 7)) {
         if (GameGlobal.isCheck || (GameGlobal.userLoginReward.isLoginReward && GameGlobal.userLoginReward.rewardCount == 7)) {
             this.loginRewardNode.active = false;
             this.loginRewardNode.active = false;
@@ -143,7 +148,7 @@ cc.Class({
         this.helpRedNode.active = redTypes.indexOf(GameRedDot.friendAward) != -1;
         this.helpRedNode.active = redTypes.indexOf(GameRedDot.friendAward) != -1;
         /// 只要这里一个有红点就都有红点
         /// 只要这里一个有红点就都有红点
         this.giftRedNode.active = this.awardRedNode.active || this.inviteFriendRedNode.active || this.signRedNode.active;
         this.giftRedNode.active = this.awardRedNode.active || this.inviteFriendRedNode.active || this.signRedNode.active;
-        if (this.isShowBar) {
+        if (GameGlobal.isShowBar) {
             let isStoreRed = (redTypes.indexOf(GameRedDot.storeDiamond) != -1 || redTypes.indexOf(GameRedDot.storeCoin) != -1);
             let isStoreRed = (redTypes.indexOf(GameRedDot.storeDiamond) != -1 || redTypes.indexOf(GameRedDot.storeCoin) != -1);
             this.storeRedNode.active = isStoreRed;
             this.storeRedNode.active = isStoreRed;
             if (isStoreRed) {
             if (isStoreRed) {