【修改】 修改战斗界面

assets/resources/edt_prefab/Battle/BattleMain.prefab

@@ -121,7 +121,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 1440
+      "height": 1205
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -133,7 +133,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        22.5,
         0,
         0,
         0,
@@ -192,7 +192,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 1440
+      "height": 1205
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -266,7 +266,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 1170.184
+      "height": 1030.184
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -278,7 +278,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        720,
+        602.5,
         0,
         0,
         0,
@@ -370,7 +370,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -70,
+        0,
         0,
         0,
         0,
@@ -914,21 +914,11 @@
     "_N$normalSprite": {
       "__uuid__": "3678ce1d-9501-424a-b857-63b969499ab7"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 14
     },
@@ -3487,21 +3477,11 @@
     "_N$normalSprite": {
       "__uuid__": "1adb3c92-3ac6-4819-87cb-7078e5833ac2"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 85
     },
@@ -6655,7 +6635,7 @@
     "_alignFlags": 41,
     "_left": 0,
     "_right": 0,
-    "_top": 70,
+    "_top": 0,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -6715,7 +6695,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 395.18399999999997
+      "height": 325.18399999999997
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6727,7 +6707,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -1170.184,
+        -1030.184,
         0,
         0,
         0,
@@ -6791,7 +6771,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        291.12512,
+        221.12511999999998,
         0,
         0,
         0,
@@ -6897,7 +6877,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 395.18399999999997
+      "height": 325.18399999999997
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -6911,7 +6891,7 @@
     "_N$paddingLeft": 0,
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
-    "_N$paddingBottom": 70,
+    "_N$paddingBottom": 0,
     "_N$spacingX": 0,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
@@ -6968,7 +6948,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 810,
-      "height": 1170.184
+      "height": 1030.184
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -6981,7 +6961,7 @@
     "_N$startAxis": 0,
     "_N$paddingLeft": 0,
     "_N$paddingRight": 0,
-    "_N$paddingTop": 70,
+    "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
     "_N$spacingX": 0,
     "_N$spacingY": 0,
@@ -7098,8 +7078,8 @@
     "_alignFlags": 45,
     "_left": 0,
     "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_top": 95,
+    "_bottom": 140,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -7268,7 +7248,13 @@
       "__id__": 194
     },
     "roomContent": {
-      "__id__": 179
+      "__id__": 180
+    },
+    "bottomLayout": {
+      "__id__": 183
+    },
+    "layerLayout": {
+      "__id__": 186
     },
     "roomPreviewPrefab": {
       "__uuid__": "bc806de8-a0c0-4ebb-99eb-6dbfc2fc7ef7"

assets/resources/edt_prefab/Battle/BattleRoomPreviweCell.prefab

@@ -39,23 +39,23 @@
         "__id__": 87
       },
       {
-        "__id__": 99
+        "__id__": 100
       },
       {
-        "__id__": 108
+        "__id__": 110
       },
       {
-        "__id__": 117
+        "__id__": 119
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 127
+        "__id__": 131
       }
     ],
     "_prefab": {
-      "__id__": 128
+      "__id__": 132
     },
     "_opacity": 255,
     "_color": {
@@ -776,7 +776,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "BattleRoomPlayerIcon1",
+    "_name": "BattleRoomPlayerIcon3",
     "_objFlags": 0,
     "_parent": {
       "__id__": 18
@@ -2420,7 +2420,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "BattleRoomPlayerIcon3",
+    "_name": "BattleRoomPlayerIcon1",
     "_objFlags": 0,
     "_parent": {
       "__id__": 41
@@ -3275,7 +3275,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -3666,7 +3666,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 98
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 2,
@@ -3716,27 +3720,25 @@
     "_N$normalSprite": {
       "__uuid__": "aa0553ee-603a-47ae-80d6-6d9859db4dd4"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 88
     },
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -3756,17 +3758,17 @@
     },
     "_children": [
       {
-        "__id__": 100
+        "__id__": 101
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 107
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -3820,21 +3822,21 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 99
+      "__id__": 100
     },
     "_children": [
       {
-        "__id__": 101
+        "__id__": 102
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -3888,17 +3890,17 @@
     "_name": "TextTitle",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 100
+      "__id__": 101
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 104
     },
     "_opacity": 255,
     "_color": {
@@ -3952,7 +3954,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 101
+      "__id__": 102
     },
     "_enabled": true,
     "_materials": [
@@ -3995,7 +3997,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 100
+      "__id__": 101
     },
     "_enabled": true,
     "_materials": [
@@ -4038,7 +4040,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 99
+      "__id__": 100
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -4047,7 +4049,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 108
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 2,
@@ -4097,27 +4103,25 @@
     "_N$normalSprite": {
       "__uuid__": "7d232ccc-6d99-4245-9ca6-9cb421d0ec63"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 100
+      "__id__": 101
     },
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -4137,20 +4141,20 @@
     },
     "_children": [
       {
-        "__id__": 109
+        "__id__": 111
       },
       {
-        "__id__": 112
+        "__id__": 114
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 115
+        "__id__": 117
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 118
     },
     "_opacity": 255,
     "_color": {
@@ -4204,17 +4208,17 @@
     "_name": "ImageGold",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 108
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 110
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 111
+      "__id__": 113
     },
     "_opacity": 255,
     "_color": {
@@ -4268,7 +4272,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 109
+      "__id__": 111
     },
     "_enabled": true,
     "_materials": [
@@ -4311,17 +4315,17 @@
     "_name": "TextGold",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 108
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 113
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -4375,7 +4379,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 112
+      "__id__": 114
     },
     "_enabled": true,
     "_materials": [
@@ -4418,7 +4422,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 108
+      "__id__": 110
     },
     "_enabled": true,
     "_layoutSize": {
@@ -4459,24 +4463,27 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ScrollView",
+    "_name": "ScrollViewBox",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
     "_children": [
       {
-        "__id__": 118
+        "__id__": 120
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 128
+      },
+      {
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 130
     },
     "_opacity": 255,
     "_color": {
@@ -4530,24 +4537,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 117
+      "__id__": 119
     },
     "_children": [
       {
-        "__id__": 119
+        "__id__": 121
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 122
+        "__id__": 125
       },
       {
-        "__id__": 123
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 124
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4601,17 +4608,20 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 118
+      "__id__": 120
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 120
+        "__id__": 122
+      },
+      {
+        "__id__": 123
       }
     ],
     "_prefab": {
-      "__id__": 121
+      "__id__": 124
     },
     "_opacity": 255,
     "_color": {
@@ -4623,20 +4633,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 369.8,
-      "height": 400
+      "width": 220,
+      "height": 1
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
+      "x": 0,
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
+        -184.9,
         0,
-        53,
         0,
         0,
         0,
@@ -4665,16 +4675,16 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 119
+      "__id__": 121
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 41,
+    "_alignFlags": 8,
     "_left": 0,
-    "_right": 0,
+    "_right": 74.9,
     "_top": 0,
-    "_bottom": 0,
+    "_bottom": -147,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -4684,7 +4694,40 @@
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
     "_originalWidth": 220,
-    "_originalHeight": 0,
+    "_originalHeight": 400,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 121
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 220,
+      "height": 1
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$padding": 0,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 0,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
     "_id": ""
   },
   {
@@ -4703,7 +4746,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 118
+      "__id__": 120
     },
     "_enabled": true,
     "_materials": [
@@ -4723,7 +4766,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 118
+      "__id__": 120
     },
     "_enabled": true,
     "alignMode": 1,
@@ -4761,11 +4804,11 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 117
+      "__id__": 119
     },
     "_enabled": true,
-    "horizontal": false,
-    "vertical": true,
+    "horizontal": true,
+    "vertical": false,
     "inertia": true,
     "brake": 0.75,
     "elastic": true,
@@ -4773,16 +4816,26 @@
     "scrollEvents": [],
     "cancelInnerEvents": true,
     "_N$content": {
-      "__id__": 119
+      "__id__": 121
     },
     "content": {
-      "__id__": 119
+      "__id__": 121
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
     "_id": ""
   },
   {
+    "__type__": "5fda8MpYDpKDoUJP269PaJX",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 119
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -4813,14 +4866,17 @@
     "textRoundNum": {
       "__id__": 15
     },
+    "textGold": {
+      "__id__": 115
+    },
     "buttonWatch": {
       "__id__": 97
     },
     "buttonFight": {
-      "__id__": 106
+      "__id__": 107
     },
     "goldLayout": {
-      "__id__": 108
+      "__id__": 110
     },
     "playerTop": {
       "__id__": 18
@@ -4829,13 +4885,16 @@
       "__id__": 41
     },
     "player1": {
-      "__id__": 36
+      "__id__": 80
     },
     "player2": {
       "__id__": 59
     },
     "player3": {
-      "__id__": 80
+      "__id__": 36
+    },
+    "scrollViewBox": {
+      "__id__": 128
     },
     "_id": ""
   },

assets/resources/edt_prefab/BoxContains/BoxItem.prefab

@@ -116,8 +116,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
-      "height": 319
+      "width": 299,
+      "height": 116
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -168,9 +168,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "d9e93c14-b1c5-4357-9c31-a8c57de9fd8a"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,
@@ -223,8 +221,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 36
+      "width": 299,
+      "height": 116
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/app/constants/AppConstants.js

@@ -76,6 +76,7 @@ window.JMC.PUBLIC_MSG = cc.Enum({
 window.JMC.PUBLIC_MSG_ORDER = cc.Enum({
     LOGIN: -1,          // 登录
     BAG: -1,            // 背包
+    BATTLE:-1,          // 战斗
 });
 
 

assets/script/app/view/battle/BattleMain.js

@@ -64,7 +64,19 @@ cc.Class({
 
         roomContent: {
             default: null,
-            type: cc.Node,
+            type: cc.Layout,
+            serializable: true,
+        },
+
+        bottomLayout: {
+            default: null,
+            type: cc.Layout,
+            serializable: true,
+        },
+
+        layerLayout: {
+            default: null,
+            type: cc.Layout,
             serializable: true,
         },
 
@@ -100,7 +112,7 @@ cc.Class({
 
         this.onClickPrice(null, "0");
         
-        cc.game.on(JMC.PUBLIC_MSG.ROOM_GET_INFO, this.updateRoom, this);
+        G.PublicMgr.on(JMC.PUBLIC_MSG.ROOM_GET_INFO, JMC.PUBLIC_MSG_ORDER.BATTLE, this.updateRoom, this);
         G.BattleMgr.requestInfo()
     },
 
@@ -119,13 +131,19 @@ cc.Class({
         let rooms = G.BattleMgr.getRoomList()
         for(let room of rooms)
         {
-            this.addRoom(room)
+            let roomNode = this.addRoom(room);
+            let roomCell = roomNode.getComponent(BattleRoomPreviweCell);
+            roomCell.resetData(room);
         }
+        this.roomContent.updateLayout();
+        this.bottomLayout.updateLayout();
+        // this.layerLayout.updateLayout();
     },
     
     addRoom(data) {
         let node = cc.instantiate(this.roomPreviewPrefab);
-        this.roomContent.addChild(node);
+        this.roomContent.node.addChild(node);
+        return node;
     },
 
     removeRoom(data) {

assets/script/app/view/battle/BattleRoom.js

@@ -79,7 +79,7 @@ cc.Class({
             playerCell.resetData(player);
             playerCell.setActive(isShow);
         }
-        this.playerLayout.updateLayout()
+        this.playerLayout.updateLayout();
     },
 
     refreshBoxs() {

assets/script/app/view/battle/BattleRoomPlayerIcon.js

@@ -15,6 +15,20 @@ cc.Class({
             serializable: true,
         },
     },
+    
+    resetData(data) {
+        this.data = data;
+        this.refreshView();
+    },
+    
+    refreshView(){
+        this.imageAdd.node.active = this.data == null;
+        this.headIcon.node.active = this.data != null;
+        if (this.data == null) {
+            return;
+        }
+        this.headIcon.setPlayerInfo(this.data.playerInfo);
+    },
 
     onClickHead() {
 

assets/script/app/view/battle/BattleRoomPreviweCell.js

@@ -1,14 +1,18 @@
-var BattleRoomPlayerIcon = require("BattleRoomPlayerIcon")
+const BattleRoomPlayerIcon = require("BattleRoomPlayerIcon")
+const BattleRoomSelectCell = require("BattleRoomSelectCell")
+const ViewBase = require("ViewBase")
+
+const SequenCreateView = require('SequenCreateView');
 
 cc.Class({
-    extends: cc.Component,
+    extends: ViewBase,
     properties: {
         imageBg: {
             default: null,
             type: cc.Sprite,
             serializable: true,
         },
-        
+
         textStatus: {
             default: null,
             type: cc.Label,
@@ -27,6 +31,12 @@ cc.Class({
             serializable: true,
         },
 
+        textGold: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+
         buttonWatch: {
             default: null,
             type: cc.Button,
@@ -74,12 +84,71 @@ cc.Class({
             type: BattleRoomPlayerIcon,
             serializable: true,
         },
+
+        scrollViewBox: {
+            default: null,
+            type: cc.ScrollView,
+            serializable: true,
+        },
+    },
+
+    onLoad () {
+        this.players = [
+            this.player1,
+            this.player2,
+            this.player3,
+        ];
+
+        this.sequenCreateBoxs = new SequenCreateView().initRoot(this);
     },
 
     setButtonSubShow(b) {
         this.buttonSub.node.active = b;
     },
 
+    resetData(data) {
+        this.data = data;
+        this.refreshView();
+    },
+
+    refreshView() {
+        if (this.data == null) {
+            return;
+        }
+
+        this.textStatus.string = this.data.status == 0 ? "等待中" : (this.data.status == 1 ? "进行中" : "结束");
+        this.textGold.string = G.PlayerUtils.getPrice(this.getBoxsPrice());
+        this.textPreviewNum.string = this.data.playCount + "人观看";
+        this.textRoundNum.string = this.data.battleBoxList.length + "回合";
+        this.playerTop.active = this.data.playerList.length >= 3;
+        for (let i = 0; i < 3; i++) {
+            let playerIcon = this.players[i];
+            let playerData = this.data.playerList.length > i ? this.data.playerList[i] : null;
+            playerIcon.resetData(playerData);
+        }
+        this.refreshBoxs();
+    },
+
+    refreshBoxs() {
+        let self = this;
+        this.sequenCreateBoxs.addDatas(this.data.battleBoxList);
+        this.sequenCreateBoxs.startCreate(JMC.UIEnum.BattleRoomSelectCell, this.scrollViewBox.content, function(node, index, data) {
+            let boxItem = node.getComponent(BattleRoomSelectCell);
+            boxItem.setIndex(index);
+            boxItem.setData(data);
+            boxItem.setButtonSubShow(false)
+        });
+    },
+
+    getBoxsPrice() {
+        let price = 0;
+        for (let b of this.data.battleBoxList) {
+            let cfg = G.CfgMgr.battleBoxConfig.getByMainKey(b);
+            price += cfg.price;
+        }
+        return price;
+    },
+
     onClickCell() {
         if (this.onClickCb) {
             this.onClickCb(this.index, this.data)

assets/script/framework/UIScrollViewEventSync.js

@@ -0,0 +1,55 @@
+cc.Class({
+    extends: cc.Component,
+    properties: {
+        
+    },
+    onLoad () {
+        let scrollView = this.node.getComponent(cc.ScrollView);
+        if (scrollView == null) {
+            return;
+        }
+        let parentScrollView = this.getComponentInParent(cc.ScrollView);
+        if (parentScrollView == null) {
+            return;
+        }
+
+        this.parentScrollView = parentScrollView;
+
+        this.oldOnTouchBegan = scrollView._onTouchBegan.bind(scrollView);
+        this.oldOnTouchMoved  = scrollView._onTouchMoved.bind(scrollView);
+        this.oldOnTouchEnded  = scrollView._onTouchEnded.bind(scrollView);
+
+        scrollView._onTouchBegan = this.onTouchBegan.bind(this);
+        scrollView._onTouchMoved = this.onTouchMoved.bind(this);
+        scrollView._onTouchEnded = this.onTouchEnded.bind(this);
+    },
+
+    onTouchBegan(event, captureListeners) {
+        this.oldOnTouchBegan(event, captureListeners);
+        this.parentScrollView._onTouchBegan(event, captureListeners);
+    },
+    
+    onTouchMoved(event, captureListeners) {
+        this.oldOnTouchMoved(event, captureListeners);
+        this.parentScrollView._onTouchMoved(event, captureListeners);
+    },
+
+    onTouchEnded(event, captureListeners) {
+        this.oldOnTouchEnded(event, captureListeners);
+        this.parentScrollView._onTouchEnded(event, captureListeners);
+    },
+
+    getComponentInParent(component) {
+        let parent = this.node.parent;
+        let result = null;
+        while(parent != null) {
+            let scrollView = parent.getComponent(component);
+            if (scrollView != null) {
+                result = scrollView;
+                break;
+            }
+            parent = parent.parent;
+        }
+        return result;
+    },
+});

assets/script/framework/UIScrollViewEventSync.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "5fda8329-603a-4a0e-8509-3f6ebd3da257",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}