1.替换首页部分资源

金学艇
Commit 224549ff ... 224549ff57c6ecfbf283919060ee9c6016d4a8e1 authored 2020-03-18 12:00:01 +0800 by 金学艇
Showing 10 changed files with 124 additions and 209 deletions
assets/Scene/sceneMain.fire
assets/Script/listCell/pfbViewPagerLabelCell.js
assets/Script/main.js
assets/resources/Hot_update/bg_update.png
assets/resources/Hot_update/btn_cancel.png
assets/resources/Hot_update/btn_update.png
assets/resources/Main/block1_shadow2.png
assets/resources/Prefab/pfbMainViewPagerLabelCell.prefab
assets/resources/data_template/main_layout.json
assets/resources/data_template/main_recommend.json
--- a/assets/Scene/sceneMain.fire
View file @224549f
+++ b/assets/Scene/sceneMain.fire
View file @224549f
@@ -90,19 +90,19 @@
        "__id__": 81
      },
      {
-        "__id__": 118
+        "__id__": 116
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 121
+        "__id__": 119
      },
      {
-        "__id__": 122
+        "__id__": 120
      },
      {
-        "__id__": 125
+        "__id__": 123
      }
    ],
    "_prefab": null,
@@ -192,7 +192,7 @@
      "array": [
        0,
        0,
-        265.0037841796875,
+        250.28134155273438,
        0,
        0,
        0,
@@ -930,7 +930,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1004,7 +1004,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1091,7 +1091,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 2256,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1168,7 +1168,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1302,7 +1302,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1436,7 +1436,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1570,7 +1570,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 564,
-      "height": 348
+      "height": 358
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1890,7 +1890,7 @@
    "_alignFlags": 9,
    "_left": 358,
    "_right": 0,
-    "_top": 180,
+    "_top": 178,
    "_bottom": 350,
    "_verticalCenter": 0,
    "_horizontalCenter": 0,
@@ -2121,7 +2121,7 @@
    "_alignFlags": 9,
    "_left": 922,
    "_right": 0,
-    "_top": 180,
+    "_top": 178,
    "_bottom": 0,
    "_verticalCenter": 0,
    "_horizontalCenter": 0,
@@ -3995,18 +3995,15 @@
      },
      {
        "__id__": 111
-      },
-      {
-        "__id__": 114
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 116
+        "__id__": 114
      },
      {
-        "__id__": 117
+        "__id__": 115
      }
    ],
    "_prefab": null,
@@ -4020,8 +4017,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 500,
+      "width": 580,
-      "height": 378
+      "height": 394
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -4191,7 +4188,7 @@
      "__id__": 85
    },
    "_children": [],
-    "_active": true,
+    "_active": false,
    "_components": [
      {
        "__id__": 90
@@ -4311,8 +4308,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        0,
+        1.4210854715202004e-14,
-        67.80000305175781,
+        75.80000305175781,
        0,
        0,
        0,
@@ -4377,7 +4374,7 @@
    "alignMode": 1,
    "_target": null,
    "_alignFlags": 1,
-    "_left": 0,
+    "_left": 172.54000000000002,
    "_right": 0,
    "_top": 96,
    "_bottom": 0,
@@ -4901,7 +4898,7 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 208,
+      "width": 224,
      "height": 100
    },
    "_anchorPoint": {
@@ -4913,8 +4910,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        -106,
+        -138,
-        -129,
+        -137,
        0,
        0,
        0,
@@ -5025,7 +5022,7 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 208,
+      "width": 224,
      "height": 100
    },
    "_anchorPoint": {
@@ -5037,8 +5034,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        106,
+        138,
-        -129,
+        -137,
        0,
        0,
        0,
@@ -5123,7 +5120,7 @@
  },
  {
    "__type__": "cc.Node",
-    "_name": "NewLabel",
+    "_name": "update_info",
    "_objFlags": 0,
    "_parent": {
      "__id__": 85
@@ -5142,15 +5139,15 @@
    "_opacity": 255,
    "_color": {
      "__type__": "cc.Color",
-      "r": 255,
+      "r": 133,
-      "g": 255,
+      "g": 140,
-      "b": 255,
+      "b": 150,
      "a": 255
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 120,
+      "width": 360,
-      "height": 50.4
+      "height": 96
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -5161,8 +5158,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        -140,
+        0,
-        104.01899719238281,
+        1,
        0,
        0,
        0,
@@ -5184,7 +5181,7 @@
    "_is3DNode": false,
    "_groupIndex": 0,
    "groupIndex": 0,
-    "_id": "6fHZ7zAI1OhqmnPcNdufIm"
+    "_id": "75MhLhB0xNnIcjuFRppyNo"
  },
  {
    "__type__": "cc.Label",
@@ -5200,21 +5197,21 @@
      }
    ],
    "_useOriginalSize": false,
-    "_string": "本次更新",
+    "_string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
-    "_N$string": "本次更新",
+    "_N$string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
-    "_fontSize": 30,
+    "_fontSize": 20,
-    "_lineHeight": 40,
+    "_lineHeight": 32,
    "_enableWrapText": true,
    "_N$file": null,
    "_isSystemFontUsed": true,
    "_spacingX": 0,
    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
+    "_N$horizontalAlign": 0,
-    "_N$verticalAlign": 1,
+    "_N$verticalAlign": 0,
    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 1,
    "_N$cacheMode": 0,
-    "_id": "56mospP9NJJZ3zaU9jLtkV"
+    "_id": "636/ZfiEJDJ6gO3ei8v3OE"
  },
  {
    "__type__": "cc.Widget",
@@ -5226,10 +5223,10 @@
    "_enabled": true,
    "alignMode": 1,
    "_target": null,
-    "_alignFlags": 8,
+    "_alignFlags": 1,
-    "_left": 50,
+    "_left": 0,
    "_right": 0,
-    "_top": 0,
+    "_top": 148,
    "_bottom": 0,
    "_verticalCenter": 0,
    "_horizontalCenter": 0,
@@ -5241,99 +5238,7 @@
    "_isAbsVerticalCenter": true,
    "_originalWidth": 0,
    "_originalHeight": 0,
-    "_id": "00IC5xpuVI7bjvF3fL3MzZ"
+    "_id": "2ei8frtwxN1Yog43cGT/Oj"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "update_info",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 85
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 115
-      }
-    ],
-    "_prefab": null,
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 133,
-      "g": 140,
-      "b": 150,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 360,
-      "height": 96
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float32Array",
-      "array": [
-        0,
-        -7,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": "75MhLhB0xNnIcjuFRppyNo"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 114
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
-    "_N$string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
-    "_fontSize": 20,
-    "_lineHeight": 32,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 0,
-    "_N$verticalAlign": 0,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
-    "_N$cacheMode": 0,
-    "_id": "636/ZfiEJDJ6gO3ei8v3OE"
  },
  {
    "__type__": "cc.Sprite",
@@ -5351,10 +5256,10 @@
    "_srcBlendFactor": 770,
    "_dstBlendFactor": 771,
    "_spriteFrame": {
-      "__uuid__": "0422cbf9-d228-4b63-9983-4cf68191ccf1"
+      "__uuid__": "f363425b-0b34-4e71-89f2-137a26db682d"
    },
    "_type": 1,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
    "_fillType": 0,
    "_fillCenter": {
      "__type__": "cc.Vec2",
@@ -5403,10 +5308,10 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 119
+        "__id__": 117
      },
      {
-        "__id__": 120
+        "__id__": 118
      }
    ],
    "_prefab": null,
@@ -5462,7 +5367,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 118
+      "__id__": 116
    },
    "_enabled": true,
    "_materials": [
@@ -5492,7 +5397,7 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 118
+      "__id__": 116
    },
    "_enabled": true,
    "alignMode": 2,
@@ -5571,14 +5476,14 @@
    },
    "targetAry": [
      {
-        "__id__": 123
+        "__id__": 121
      },
      {
-        "__id__": 124
+        "__id__": 122
      }
    ],
    "panel": {
-      "__id__": 117
+      "__id__": 115
    },
    "manifestUrl": {
      "__uuid__": "3182b77f-c5b1-435d-983a-41eab7118e39"
--- a/assets/Script/listCell/pfbViewPagerLabelCell.js
View file @224549f
+++ b/assets/Script/listCell/pfbViewPagerLabelCell.js
View file @224549f
@@ -48,6 +48,10 @@ cc.Class({
            this.normalName.enableWrapText = false;
            this.normalName.horizontalAlign = cc.Label.HorizontalAlign.LEFT;
        }
+        if (null != funCallback && typeof funCallback == 'function') {
+            funCallback.call();
+        }
    },
    setUIWithFocus: function () {
--- a/assets/Script/main.js
View file @224549f
+++ b/assets/Script/main.js
View file @224549f
@@ -67,6 +67,7 @@ cc.Class({
    onLoad: function () {
        this._super();
        this._iSceneStatus = 0;
+        this._MARGIN_TOP = 32;
        this._oInit = {};
        this._bAbleHotUpdate = false;
        this._bIsDataListMoving = false;
@@ -80,8 +81,8 @@ cc.Class({
        this._oSceneContext._iViewPagerIndex = 0;
        let oSceneParameter = this._cApplication.getTopSceneParameter();
        let aSceneParameter = this._cApplication.getSceneParameter();
-        cc.find("update/update_panel/update_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
+        cc.find("update/update_panel/update_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 224, 100));
-        cc.find("update/update_panel/close_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
+        cc.find("update/update_panel/close_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 224, 100));
        cc.log("main->aSceneParameter..." + aSceneParameter);
        cc.log("main->oSceneParameter..." + oSceneParameter);
        //首页无参数
@@ -103,7 +104,7 @@ cc.Class({
        }
        // cc.log("恢复上下文后的光标：" + this._oSceneContext._iPageIndex);
        this._oSceneContext._iCurrentLeftIndex = this._oSceneContext._iCurrentLeftIndex == 0 ? 1 : this._oSceneContext._iCurrentLeftIndex;
-        this.node.getChildByName("scrollContent").height = 2300;        //这里暂且写死，scrollView有bug
+        this.node.getChildByName("scrollContent").height = 2260;        //这里暂且写死，scrollView有bug
        this._scrollview.scrollToTop();
        //搞轮播图
@@ -115,6 +116,7 @@ cc.Class({
    //轮播图相关
    initViewPager: function () {
+        var self=this;
        this._pageView = cc.find('scrollContent/ViewPagerArea', this.node).getComponent(cc.PageView);
        Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_viewpager.json", null, null,
            function (strResponse) {
@@ -135,6 +137,11 @@ cc.Class({
                        nodeNav.getComponent(cc.Widget).top = i * (nodeNav.height + 2);
                        blockShadow.addChild(nodeNav, 10, "view_pager_label" + i);
                        nodeNav.getComponent('pfbViewPagerLabelCell').init(oJSONResult.resultSet[i], function () {  //让细胞自己渲染
+                            if (self._oSceneContext._iViewPagerIndex == i) {
+                                nodeNav.getChildByName("Title").active = false;
+                                nodeNav.getChildByName("Select").active = false;
+                                nodeNav.getChildByName("AfterSelect").active = true;
+                            }
                        }, i);
                        let fiNav = nodeNav.addComponent(FocusInfo);
@@ -408,11 +415,11 @@ cc.Class({
                widgetLayout.isAlignLeft = true;
                widgetLayout.top = bgHeight;
                widgetLayout.left = 0;
-                bgHeight += arrModules.resultSet[i].height;   //逐层增加高度
+                bgHeight += arrModules.resultSet[i].height + this._MARGIN_TOP;   //逐层增加高度
                // cc.log("高度" + bgHeight);
-                if (i == arrModules.resultSet.length - 1) {     //最后一个条目不够高，手动加高
+                // if (i == arrModules.resultSet.length - 1) {     //最后一个条目不够高，手动加高
-                    bgHeight += 300;
+                //     bgHeight += 300;
-                }
+                // }
                this._aBgHeight.push(bgHeight);      //
                if (arrModules.resultSet[i].hasChildFrame) {      //还有子列表
                    for (let j = 0; j < arrModules.resultSet[i].data.resultSet.length; j++) {
@@ -1015,7 +1022,7 @@ cc.Class({
                            // cc.log("滚动到：" + height);
                            this.scheduleOnce(function () {
                                this.keyDownDirection(Common.MOVE_DIRECTION_UP);
-                            }, 0.3);
+                            }, 0.4);
                            // setTimeout(function () {
                            //     this.keyDownDirection(Common.MOVE_DIRECTION_UP);
                            // }.bind(this), 300);
@@ -1080,7 +1087,7 @@ cc.Class({
                            this._oSceneContext._iPageIndex++;
                            this.scheduleOnce(function () {
                                this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
-                            }, 0.3);
+                            }, 0.4);
                            // setTimeout(function () {
                            //     this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
                            // }.bind(this), 300);
@@ -1554,7 +1561,6 @@ cc.Class({
    hotUpdate: function () {
        cc.log("hotUpdate start...");
        //隐藏更新说明，显示更新进度条
-        // cc.find("update/update_panel/NewLabel", this.node).active = false;//因为新的更新界面没有进度条，先不要显示更新进度
        // cc.find("update/update_panel/versionLabel", this.node).active = false;
        // cc.find("update/update_panel/update_info", this.node).active = false;
        // cc.find("update/update_panel/ProgressLabel", this.node).active = true;
--- a/assets/resources/Hot_update/bg_update.png 0 → 100644
View file @224549f
+++ b/assets/resources/Hot_update/bg_update.png 0 → 100644
View file @224549f
--- a/assets/resources/Hot_update/btn_cancel.png
View file @224549f
+++ b/assets/resources/Hot_update/btn_cancel.png
View file @224549f
--- a/assets/resources/Hot_update/btn_update.png
View file @224549f
+++ b/assets/resources/Hot_update/btn_update.png
View file @224549f
--- a/assets/resources/Main/block1_shadow2.png 0 → 100644
View file @224549f
+++ b/assets/resources/Main/block1_shadow2.png 0 → 100644
View file @224549f
--- a/assets/resources/Prefab/pfbMainViewPagerLabelCell.prefab
View file @224549f
+++ b/assets/resources/Prefab/pfbMainViewPagerLabelCell.prefab
View file @224549f
@@ -53,7 +53,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 294,
-      "height": 86
+      "height": 88
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -337,8 +337,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        -21,
+        -23,
-        9,
+        14,
        0,
        0,
        0,
@@ -684,8 +684,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        26,
+        24,
-        -23,
+        -18,
        0,
        0,
        0,
@@ -739,8 +739,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 69,
+      "width": 61.34,
-      "height": 22
+      "height": 27.72
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -874,8 +874,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 69,
+      "width": 61.34,
-      "height": 22
+      "height": 27.72
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1105,8 +1105,8 @@
      "__type__": "TypedArray",
      "ctor": "Float32Array",
      "array": [
-        26,
+        24,
-        -23,
+        -18,
        0,
        0,
        0,
@@ -1160,7 +1160,7 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 72,
+      "width": 250,
      "height": 22
    },
    "_anchorPoint": {
@@ -1223,7 +1223,7 @@
    "_N$horizontalAlign": 0,
    "_N$verticalAlign": 1,
    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 1,
    "_N$cacheMode": 0,
    "_id": ""
  },
@@ -1403,7 +1403,7 @@
    "_srcBlendFactor": 770,
    "_dstBlendFactor": 771,
    "_spriteFrame": {
-      "__uuid__": "161b1097-d637-42d7-9191-d269c714f6f9"
+      "__uuid__": "a5209e7c-e07f-4e52-985f-db1d936f8773"
    },
    "_type": 0,
    "_sizeMode": 0,
@@ -1797,7 +1797,7 @@
      "__uuid__": "752ebcfb-0221-4da8-905c-988333a9981c"
    },
    "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
    "_fillType": 0,
    "_fillCenter": {
      "__type__": "cc.Vec2",
@@ -1823,7 +1823,7 @@
    "_alignFlags": 9,
    "_left": 0,
    "_right": 0,
-    "_top": 677,
+    "_top": 676,
    "_bottom": 0,
    "_verticalCenter": 0,
    "_horizontalCenter": 0,
--- a/assets/resources/data_template/main_layout.json
View file @224549f
+++ b/assets/resources/data_template/main_layout.json
View file @224549f
@@ -46,7 +46,7 @@
                        "imageURL": "upload/image/main/icon_top1.png",
                        "code": "eb954b1e-712e-415c-ba27-asryg34ret43",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "top": 117,
                        "left": 60
                    },
@@ -57,7 +57,7 @@
                        "type": "promotion_item",
                        "imageURL": "upload/image/main/icon_top2.png",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "code": "eb954b1e-712e-415c-ba27-wetgrsehr6t",
                        "top": 117,
                        "left": 230
@@ -78,7 +78,7 @@
                        "imageURL": "upload/image/main/icon_top3.png",
                        "code": "eb954b1e-712e-415c-ba27-erhg43f4",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "top": 117,
                        "left": 400
                    },
@@ -98,7 +98,7 @@
                        "imageURL": "upload/image/main/icon_top4.png",
                        "code": "eb954b1e-712e-415c-ba27-fq34t34fe",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "top": 117,
                        "left": 570
                    },
@@ -117,7 +117,7 @@
                        "type": "promotion_item",
                        "imageURL": "upload/image/main/icon_top5.png",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "code": "eb954b1e-712e-415c-ba27-fq34tf4",
                        "top": 117,
                        "left": 740
@@ -137,7 +137,7 @@
                        "type": "promotion_item",
                        "imageURL": "upload/image/main/icon_top7.png",
                        "width": 170,
-                        "height": 85,
+                        "height": 84,
                        "code": "eb954b1e-712e-415c-ba27-f43werterf",
                        "top": 117,
                        "left": 910
--- a/assets/resources/data_template/main_recommend.json
View file @224549f
+++ b/assets/resources/data_template/main_recommend.json
View file @224549f
@@ -3,7 +3,7 @@
    "resultSet": [
        {
            "name": "ViewPager",
-            "height": 371,
+            "height": 358,
            "hasChildFrame": true,
            "data": {
                "name": "frame1",
@@ -11,29 +11,29 @@
                    {
                        "name": "Carousel0",
                        "code": "promotionItem_fd456495-2e32-44e1-9d92-q4ert34",
-                        "left": 63,
+                        "left": 64,
                        "top": 0,
                        "imageURL": "upload/image/main/block1_1.png",
                        "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameDetail\",\"packageName\":\"com.topdraw.xhx.cake\"}}]}",
                        "width": 270,
-                        "height": 162
+                        "height": 167
                    },
                    {
                        "name": "dailyRecommend",
                        "code": "promotionItem_4ca66642-33d0-41c9-9913-g5erhwgw5er",
-                        "left": 63,
+                        "left": 64,
-                        "top": 185,
+                        "top": 191,
                        "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameDetail\",\"packageName\":\"com.topdraw.xhx.candy\"}}]}",
                        "imageURL": "upload/image/main/block1_2.png",
                        "width": 270,
-                        "height": 162
+                        "height": 167
                    }
                ]
            }
        },
        {
            "name": "轮播下方图片",
-            "height": 205,
+            "height": 167,
            "hasChildFrame": true,
            "data": {
                "name": "frame1",
@@ -83,7 +83,7 @@
        },
        {
            "name": "特色推荐",
-            "height": 195,
+            "height": 153,
            "hasChildFrame": true,
            "data": {
                "name": "frame2",
@@ -94,8 +94,8 @@
                        "left": 63,
                        "top": 0,
                        "imageURL": "upload/image/main/font_2.png",
-                        "width": 126,
+                        "width": 128,
-                        "height": 31,
+                        "height": 45,
                        "disable": true
                    },
                    {
@@ -106,14 +106,14 @@
                            60
                        ],
                        "width": 1153,
-                        "height": 100,
+                        "height": 88,
                        "disable": true,
                        "childrenSize": [
                            172,
                            88
                        ],
                        "childrenMargin": [
-                            24,
+                            16,
                            24,
                            0,
                            0
@@ -168,7 +168,7 @@
        },
        {
            "name": "热门必玩上方图",
-            "height": 300,
+            "height": 258,
            "hasChildFrame": true,
            "data": {
                "name": "frame3",
@@ -180,14 +180,14 @@
                        "top": 0,
                        "imageURL": "upload/image/main/font_3.png",
                        "width": 158,
-                        "height": 31,
+                        "height": 45,
                        "disable": true
                    },
                    {
                        "name": "SingerList1",
                        "code": "promotionItem_0a911d4c-9223-4d49-se5hj54uh4w5g45w",
                        "left": 63,
-                        "top": 64,
+                        "top": 61,
                        "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameDetail\",\"packageName\":\"com.Orbbec.MortaKombat\",\"activityName\":\"com.orbbec.u3d.OrbbecActivity\",\"downloadUrl\":\"apk/com.Orbbec.MortaKombat_v2.1.4_bc55_20190717_Release.apk\"}}]}",
                        "imageURL": "upload/image/main/block5_1.jpg",
                        "width": 564,
@@ -197,7 +197,7 @@
                        "name": "SingerList2",
                        "code": "promotionItem_c388af5a-0351-43c4-e5sjhu45h54wh45h",
                        "left": 653,
-                        "top": 64,
+                        "top": 61,
                        "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameDetail\",\"packageName\":\"com.Orbbec.MortaKombat\",\"activityName\":\"com.orbbec.u3d.OrbbecActivity\",\"downloadUrl\":\"apk/com.Orbbec.MortaKombat_v2.1.4_bc55_20190717_Release.apk\"}}]}",
                        "imageURL": "upload/image/main/block5_1.jpg",
                        "width": 564,
@@ -208,7 +208,7 @@
        },
        {
            "name": "热门必玩下方图",
-            "height": 290,
+            "height": 252,
            "hasChildFrame": true,
            "data": {
                "name": "frame3",
@@ -248,7 +248,7 @@
        },
        {
            "name": "block高分排行榜",
-            "height": 365,
+            "height": 329,
            "hasChildFrame": true,
            "data": {
                "name": "frame2",
@@ -260,14 +260,14 @@
                        "top": 0,
                        "imageURL": "upload/image/main/font_4.png",
                        "width": 158,
-                        "height": 31,
+                        "height": 45,
                        "disable": true
                    },
                    {
                        "name": "highScore",
                        "layout": "horizontal",
                        "position": [
-                            63,
+                            61,
                            60
                        ],
                        "width": 1153,
@@ -338,7 +338,7 @@
        },
        {
            "name": "block适龄游戏",
-            "height": 250,
+            "height": 259,
            "hasChildFrame": true,
            "data": {
                "name": "frame2",
@@ -350,21 +350,21 @@
                        "top": 0,
                        "imageURL": "upload/image/main/font_5.png",
                        "width": 126,
-                        "height": 31,
+                        "height": 45,
                        "disable": true
                    },
                    {
                        "name": "SubjectList",
                        "layout": "horizontal",
                        "position": [
-                            63,
+                            61,
                            60
                        ],
                        "width": 1153,
                        "disable": true,
                        "childrenSize": [
                            270,
-                            108
+                            167
                        ],
                        "childrenMargin": [
                            0,