11
0

2 Revīzijas 9a9fb1d930 ... 0e8fd9f48a

Autors SHA1 Ziņojums Datums
  tang biao 0e8fd9f48a Merge branch 'dev' of http://svn.ouj.com:3000/DWG/taptapstar into dev 5 gadi atpakaļ
  tang biao 470c379d7a 修改红点 5 gadi atpakaļ
2 mainītis faili ar 106 papildinājumiem un 100 dzēšanām
  1. 98 98
      assets/scene/game.fire
  2. 8 2
      assets/scripts/game/HomeSideCtrl.js

+ 98 - 98
assets/scene/game.fire

@@ -41,8 +41,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.3688038793103448,
-      "y": 0.3688038793103448,
+      "x": 0.3013376124437781,
+      "y": 0.3013376124437781,
       "z": 1
     },
     "_quat": {
@@ -733,7 +733,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "3dxZGImmVMQrQtjY+2CrPe"
+    "_id": "45eL7MZ5FKJIZaIeDjfnBv"
   },
   {
     "__type__": "cc.Label",
@@ -758,7 +758,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "60rSvYlQdNzYVF4siBZkUb"
+    "_id": "46zKdQy79AzqwSS7yk+XbP"
   },
   {
     "__type__": "cc.LabelOutline",
@@ -776,7 +776,7 @@
       "a": 255
     },
     "_width": 3,
-    "_id": "29xg6iZmZP4IassECYBICj"
+    "_id": "6aLYmGGFdNnrqhHTzRVRPS"
   },
   {
     "__type__": "cc.RichText",
@@ -1831,7 +1831,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "4cg6fJFvZHMbSoZdKopiiL"
+    "_id": "18rrt1yfFC5bVczdgXcYEW"
   },
   {
     "__type__": "cc.Label",
@@ -1856,7 +1856,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "2aKqsOxktNaafqx+6L87Ip"
+    "_id": "18ClQ6fIhP2LkOvWeFCvFU"
   },
   {
     "__type__": "cc.RichText",
@@ -2276,7 +2276,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "09tS6sEIxPa5OvlDeJgykv"
+    "_id": "1dt78KYYJKNrCVMQ4WZaPa"
   },
   {
     "__type__": "cc.Label",
@@ -2301,7 +2301,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "a1ASS3BBRCIYwYj1+AN4sT"
+    "_id": "20LqAodDlLw5qxILh+K/tN"
   },
   {
     "__type__": "cc.RichText",
@@ -2473,7 +2473,7 @@
         "__id__": 128
       },
       {
-        "__id__": 117
+        "__id__": 118
       }
     ],
     "_active": true,
@@ -2686,17 +2686,17 @@
     "inviteNode": {
       "__id__": 79
     },
-    "recordNode": {
+    "recordButton": {
       "__id__": 117
     },
     "startRecordNode": {
-      "__id__": 118
+      "__id__": 119
     },
     "recordingNode": {
-      "__id__": 120
+      "__id__": 121
     },
     "recordTimeRichText": {
-      "__id__": 124
+      "__id__": 125
     },
     "_id": "d6AgrqucZEX7D85OwYPB/T"
   },
@@ -5201,6 +5201,73 @@
     "_id": "f1nbEiRRJPCp38ivaONUOz"
   },
   {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 118
+    },
+    "_enabled": true,
+    "transition": 1,
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 120,
+      "g": 120,
+      "b": 120,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 127
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 118
+    },
+    "_id": "00/FwMYAxAc6Huic6ij+uP"
+  },
+  {
     "__type__": "cc.Node",
     "_name": "recodeVideo_btn",
     "_objFlags": 0,
@@ -5209,17 +5276,17 @@
     },
     "_children": [
       {
-        "__id__": 118
+        "__id__": 119
       },
       {
-        "__id__": 120
+        "__id__": 121
       }
     ],
     "_active": true,
     "_level": 4,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 117
       }
     ],
     "_prefab": null,
@@ -5273,14 +5340,14 @@
     "_name": "record_video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 117
+      "__id__": 118
     },
     "_children": [],
     "_active": true,
     "_level": 5,
     "_components": [
       {
-        "__id__": 119
+        "__id__": 120
       }
     ],
     "_prefab": null,
@@ -5334,7 +5401,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 118
+      "__id__": 119
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -5362,18 +5429,18 @@
     "_name": "record_start",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 117
+      "__id__": 118
     },
     "_children": [
       {
-        "__id__": 121
+        "__id__": 122
       }
     ],
     "_active": false,
     "_level": 5,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 126
       }
     ],
     "_prefab": null,
@@ -5427,18 +5494,18 @@
     "_name": "richtext",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 120
+      "__id__": 121
     },
     "_children": [
       {
-        "__id__": 122
+        "__id__": 123
       }
     ],
     "_active": true,
     "_level": 6,
     "_components": [
       {
-        "__id__": 124
+        "__id__": 125
       }
     ],
     "_prefab": null,
@@ -5492,14 +5559,14 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 121
+      "__id__": 122
     },
     "_children": [],
     "_active": false,
     "_level": 7,
     "_components": [
       {
-        "__id__": 123
+        "__id__": 124
       }
     ],
     "_prefab": null,
@@ -5553,7 +5620,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 122
+      "__id__": 123
     },
     "_enabled": true,
     "_srcBlendFactor": 1,
@@ -5578,7 +5645,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 121
+      "__id__": 122
     },
     "_enabled": true,
     "_N$string": "<b><color=#fdfdef >00:00</c></b>",
@@ -5596,7 +5663,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 121
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -5620,73 +5687,6 @@
     "_id": "70XrgPimlByruG+RTuLVJe"
   },
   {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 117
-    },
-    "_enabled": true,
-    "transition": 1,
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 120,
-      "g": 120,
-      "b": 120,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [
-      {
-        "__id__": 127
-      }
-    ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "hoverSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
-    "_N$target": {
-      "__id__": 117
-    },
-    "_id": "00/FwMYAxAc6Huic6ij+uP"
-  },
-  {
     "__type__": "cc.ClickEvent",
     "target": {
       "__id__": 57

+ 8 - 2
assets/scripts/game/HomeSideCtrl.js

@@ -44,7 +44,7 @@ cc.Class({
         inviteNode: cc.Node,
 
         //// 以下都是头条录屏功能需要的节点
-        recordNode: cc.Node,
+        recordButton: cc.Button,
         startRecordNode: cc.Node,
         /// 正在录屏
         recordingNode: cc.Node,
@@ -73,7 +73,7 @@ cc.Class({
             this._starRecord = false;
             this._recordTime = 0;
         } else {
-            this.recordNode.active = false;
+            this.recordButton.node.active = false;
         }
 
         //判断正在审核中的版本隐藏7天登录按钮或已完成7天登录任务
@@ -276,11 +276,15 @@ cc.Class({
 
     recordTimeAction() {
         this._recordTime += 1;
+        if (this._recordTime === 4) {
+            this.recordButton.interactable = true;
+        }
         this.recordTimeRichText.string = `<b><color=#fdfdef >${DWTool.calculateTime(this._recordTime)}</c></b>`;
     },
 
     //处理头条录制视频然后分享的功能
     handleTTRecordVideo() {
+        this.recordButton.interactable = false;
         let recorder = tt.getGameRecorderManager();
         /// 如果是开始录制了
         if (this._starRecord) {
@@ -291,6 +295,7 @@ cc.Class({
                 microphoneEnabled: true,
             });
         }
+
         recorder.onStart(res =>{
             // 录屏开始
             console.log('录屏开始');
@@ -305,6 +310,7 @@ cc.Class({
             // 录屏结束;
             GameGlobal.commonAlert.showCommonErrorAlert('录屏结束');
             this._starRecord = false;
+            this.recordButton.interactable = true;
             this.startRecordNode.active = true;
             this.recordingNode.active = false;
             this.recordTimeRichText.string = '<b><color=#fdfdef >00:00</c></b>';