Johson 6 år sedan
förälder
incheckning
ffc6f46822

+ 1199 - 0
assets/prefab/bxxItem.prefab

@@ -0,0 +1,1199 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bxxItem",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 26
+      }
+    ],
+    "_active": true,
+    "_level": 1,
+    "_components": [
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 338,
+      "height": 248
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "numbg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 183,
+      "height": 46
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 1,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 107,
+      "height": 25
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 8,
+      "y": -1,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "e3af93e8-50c7-4903-9af9-c45b16710924"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 18,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "3eWIRHP2JJ/ahr8x3Dw0Pm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "num",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 111.23,
+      "height": 25
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -44.4,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_useOriginalSize": true,
+    "_string": "12346789",
+    "_N$string": "12346789",
+    "_fontSize": 25,
+    "_lineHeight": 25,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 2,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "6e2X9A9cRFlKwLDOq/wtrX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "70983e9c-dddd-4932-8915-49a6e58f27c7"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 17,
+    "_left": 0,
+    "_right": 0,
+    "_top": 100,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "8eGUis5lhOqY91YrbjRL6C",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnin",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 98,
+      "height": 42
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -64,
+      "y": -63,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "a1ea90d9-b816-4615-8b64-f52659c6ba9e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 12,
+    "_left": 56,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 40,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [
+      {
+        "__id__": 18
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "8f47cyDsjRIZqR2zX7tb6CG",
+    "handler": "clickTable",
+    "customEventData": "IN"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "4bbh8qyhlLt7NgB4nEGerc",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnout",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 98,
+      "height": 42
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 63,
+      "y": -63,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "00fe9e0a-6471-459b-9d28-66145a0fa3fd"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 36,
+    "_left": 0,
+    "_right": 57,
+    "_top": 0,
+    "_bottom": 40,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "8f47cyDsjRIZqR2zX7tb6CG",
+    "handler": "clickTable",
+    "customEventData": "OUT"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "8bprjkYelHzILixszlakSW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ref",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 27
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 38,
+      "height": 36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 123,
+      "y": 85,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "2002796a-1d56-4dcb-bd56-a53db2d2abf4"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 33,
+    "_left": 0,
+    "_right": 27,
+    "_top": 21,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "014FrezwRG9pRFvs2lKkY0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "b3189f76-be4d-492f-b102-598eb9a1069a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 9,
+    "_left": -169,
+    "_right": 0,
+    "_top": 626,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "8f47cyDsjRIZqR2zX7tb6CG",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "bg": {
+      "__id__": 31
+    },
+    "num": {
+      "__id__": 8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+    },
+    "fileId": "f4aNaO0T9JRZyY2r9QQX2R",
+    "sync": false
+  }
+]

+ 7 - 0
assets/prefab/bxxItem.prefab.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "64267a62-e64c-48bc-b29c-78d485ca1d89",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 192 - 252
assets/scenes/hall.fire


+ 2 - 2
assets/scenes/start.fire

@@ -44,8 +44,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.34498612467447914,
-      "y": 0.34498612467447914,
+      "x": 0.350888916015625,
+      "y": 0.350888916015625,
       "z": 1
     },
     "_quat": {

+ 2 - 1
assets/scripts/common/Define.js

@@ -7,6 +7,7 @@ let Define = {
 	'MYACCOUNT': 'TEST_2',
 	'MYPASSWORD': 'E10ADC3949BA59ABBE56E057F20F883E',
 	"GameHttpUrl": "http://api.boyin18.com",
+	// "GameHttpUrl": "http://www.qpapi.com",
 	// "GameHttpUrl": "http://192.168.2.186/qpapi/public",//内网
 	'GameWanFaUrl':'http://yx.xxw360.com/api/game/game',
 	'GameWanFaMore':'http://yx.xxw360.com/api/game/game_lits',
@@ -25,7 +26,7 @@ let Define = {
     'INVALID_WORD':65535,
     'INVALID_USERID':0,
 	'DEVICE_TYPE':0x10,
-	'LOGIN_WS':'ws://123.207.167.163:9010/ajaxchattest',
+	'LOGIN_WS':'ws://192.168.2.200:9090',
 	'SOCKET_TYPE':
 	{
 		'PLAZA':0,//大厅

+ 97 - 4
assets/scripts/controller/UserMgr.js

@@ -1,5 +1,11 @@
+import BehaviorBase from '../framework/BehaviorBase';
+import Event from '../net/Event';
+import LogicUnitManager from '../framework/LogicUnitManager';
 cc.Class({
-    extends: cc.Component,
+    extends: BehaviorBase,
+    ctor: function () {
+        this.lum = LogicUnitManager;
+    },
     properties: {
         account:null,
 	    userId:null,
@@ -55,6 +61,7 @@ cc.Class({
                 // self.phone = ret.phone;
                 // self.amount = ret.amount;
                 // self.frozen_amount = ret.frozen_amount;
+                self.getUserDetails()
                 cc.director.loadScene("hall");
             }
         };
@@ -90,6 +97,7 @@ cc.Class({
                 // self.phone = ret.phone;
                 // self.amount = ret.amount;
                 // self.frozen_amount = ret.frozen_amount;
+                self.getUserDetails()
                 cc.director.loadScene("hall");
             }
         };
@@ -97,6 +105,37 @@ cc.Class({
         cc.vv.http.sendRequest("/sys/user/login",data,onLogin);
     },
 
+    
+
+    getUserDetails(){
+        if (this.token == null) {
+            return
+        }
+        var self = this;
+        var onGet = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+            }
+            else{
+                console.log(ret);
+                // self.token = ret.data.token
+                self.account = ret.data[0].name;
+                self.userId = ret.data[0].id;
+                // self.avatar = ret.data.avatar;
+                // self.phone = ret.data.phone;
+                self.amount = ret.data[0].amount;
+                // self.frozen_amount = ret.data.frozen_amount;
+                // cc.director.loadScene("hall");
+                // cc.director.loadScene("hall");
+                self.lum.getBehavior('LoginBehavior').emit(Event.DATA_MSG.LOGIN);
+            }
+        };
+        var data = {
+            token:this.token
+        }
+        cc.vv.http.sendRequest("/api/user/getUserDetails",data,onGet);
+    },
+
     getGameList(data,callback){
         var onEnter = function(ret){
             if(ret.status !== 1){
@@ -113,10 +152,28 @@ cc.Class({
                 pid :0
             };
         }
-        
         cc.vv.http.sendRequest("/sys/menu/getMenus",data,onEnter)
     },
-    
+    turnOutMoney(data,callback){
+        var onTurn = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+            }
+            else{
+                console.log(ret);
+                callback(ret)
+                // cc.director.loadScene("hall");
+            }
+        }
+        data.token = this.token
+        // if (data == null) {
+        //     data = {
+        //         pid :0
+        //     };
+        // }
+        cc.vv.http.sendRequest("/api/Agent/turnOutMoney",data,onTurn)
+    },
+
     create:function(data){
         var self = this;
         var onCreate = function(ret){
@@ -162,7 +219,43 @@ cc.Class({
             token :this.token,
             id :gameid
         };
-        cc.vv.http.sendRequest("/api/agent/login",data,onEnter)
+        cc.vv.http.sendRequest("/api/agent/login",data,onEnter,null,"POST")
+    },
+
+    getagentCash(callback){
+        var self = this
+        var onGet = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+                callback(ret)
+            }
+            else{
+                callback(ret)
+            }
+        }
+        var data = {
+            token :this.token,
+        };
+        cc.vv.http.sendRequest("/api/agentInfo/agentCash",data,onGet,null,"POST")
+    },
+
+    getActivityList(callback)
+    {
+        var self = this
+        var onGet = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+                callback(ret)
+            }
+            else{
+                callback(ret)
+            }
+        }
+        var data = {
+            type :null,
+            label:null
+        };
+        cc.vv.http.sendRequest("/sys/activity/activityList",data,onGet,null)
     },
     
     enterRoom:function(roomId,callback){

+ 4 - 1
assets/scripts/logic/LoginBehavior.js

@@ -64,7 +64,10 @@ export default class LoginBehavior extends BehaviorBase
 
 
     CreateLoginStart(){
-        var url =  Define.LOGIN_WS 
+        if (cc.vv.userMgr.token == null) {
+            return
+        }
+        var url =  Define.LOGIN_WS + "?token="+cc.vv.userMgr.token
         console.log("CreateLoginStarta:" + url)
         this._GameProcessManager.createSocket(url, null,Define.SOCKET_TYPE.PLAZA)
     }

+ 40 - 40
assets/scripts/net/Connect.js

@@ -260,7 +260,7 @@ export default class Connect extends DataModelBase
     sendMsg(msg)
     {
         
-        CCipher.encryptBuffer(msg,msg.byteLength)
+        // CCipher.encryptBuffer(msg,msg.byteLength)
         this._sendData(msg)
     }
    
@@ -344,52 +344,52 @@ export default class Connect extends DataModelBase
         console.log(evt.data)
         Common.Print(typeof(evt.data))
  
-        var dataview = new DataView(evt.data)
-        var dataviewLength = evt.data.byteLength
-        if(dataviewLength < Packet.TCPInfoSize) //
-        {
-            console.log("dataviewLength< Packet.TCPInfoSize(4)")
-            return
-        }
+        // var dataview = new DataView(evt.data)
+        // var dataviewLength = evt.data.byteLength
+        // if(dataviewLength < Packet.TCPInfoSize) //
+        // {
+        //     console.log("dataviewLength< Packet.TCPInfoSize(4)")
+        //     return
+        // }
 
-        CCipher.decryptBuffer(evt.data,evt.data.byteLength)
-
-        var readPos = 0
-        var cbDataKind = dataview.getUint8(readPos,Common.littleEndian)
-        readPos +=1
-        var cbCheckCode = dataview.getUint8(readPos,Common.littleEndian)
-        readPos +=1
-        var wPacketSize = dataview.getUint16(readPos,Common.littleEndian)
-        readPos +=2
-        var wMainCmdID = dataview.getUint16(readPos,Common.littleEndian)
-        readPos +=2
-        var wSubCmdID = dataview.getUint16(readPos,Common.littleEndian)
-        readPos +=2        
-        if(wMainCmdID != ConstMsgId.MDM_KN_COMMAND && wSubCmdID != ConstMsgId.SUB_KN_DETECT_SOCKET )
-        {
+        // CCipher.decryptBuffer(evt.data,evt.data.byteLength)
+
+        // var readPos = 0
+        // var cbDataKind = dataview.getUint8(readPos,Common.littleEndian)
+        // readPos +=1
+        // var cbCheckCode = dataview.getUint8(readPos,Common.littleEndian)
+        // readPos +=1
+        // var wPacketSize = dataview.getUint16(readPos,Common.littleEndian)
+        // readPos +=2
+        // var wMainCmdID = dataview.getUint16(readPos,Common.littleEndian)
+        // readPos +=2
+        // var wSubCmdID = dataview.getUint16(readPos,Common.littleEndian)
+        // readPos +=2        
+        // if(wMainCmdID != ConstMsgId.MDM_KN_COMMAND && wSubCmdID != ConstMsgId.SUB_KN_DETECT_SOCKET )
+        // {
             
-            Common.Print("_onMessage wMainCmdID:" + wMainCmdID + " wSubCmdID:" + wSubCmdID + " wPacketSize:" + wPacketSize)
-        }
+        //     Common.Print("_onMessage wMainCmdID:" + wMainCmdID + " wSubCmdID:" + wSubCmdID + " wPacketSize:" + wPacketSize)
+        // }
        
-        if(wMainCmdID == ConstMsgId.MDM_KN_COMMAND && wSubCmdID == ConstMsgId.SUB_KN_DETECT_SOCKET)
-        {
-            this.pingTimes = this.pingTimes - 1
-        }
+        // if(wMainCmdID == ConstMsgId.MDM_KN_COMMAND && wSubCmdID == ConstMsgId.SUB_KN_DETECT_SOCKET)
+        // {
+        //     this.pingTimes = this.pingTimes - 1
+        // }
 
 
 
-        if(wMainCmdID > 0 || wSubCmdID != Packet.SUB_KN_DETECT_SOCKET)
-        {
-            var pack = null 
-            if(dataviewLength > Packet.TCPInfoSize)
-            {
-               var  packBuf = evt.data.slice(Packet.TCPHeadSize,dataviewLength)
-            }
+        // if(wMainCmdID > 0 || wSubCmdID != Packet.SUB_KN_DETECT_SOCKET)
+        // {
+        //     var pack = null 
+        //     if(dataviewLength > Packet.TCPInfoSize)
+        //     {
+        //        var  packBuf = evt.data.slice(Packet.TCPHeadSize,dataviewLength)
+        //     }
 
 
-            this.emit(Event.SOCKET_MSG.DATA, wMainCmdID,wSubCmdID,packBuf)
+        //     this.emit(Event.SOCKET_MSG.DATA, wMainCmdID,wSubCmdID,packBuf)
 
-        }
+        // }
      
     }
 
@@ -520,8 +520,8 @@ export default class Connect extends DataModelBase
     {
         
         console.log(Common.GetDateString() + 'sendPing');
-        var msg = MsgTransfer.encodemsg(ConstMsgId.MDM_KN_COMMAND ,ConstMsgId.SUB_KN_DETECT_SOCKET,92 )
-        // var sre = "hert"
+        // var msg = MsgTransfer.encodemsg(ConstMsgId.MDM_KN_COMMAND ,ConstMsgId.SUB_KN_DETECT_SOCKET,92 )
+        var msg = "{type:ping}"
         // console.log('msg is: ',sre);
         this.sendMsg(msg);
     }

+ 1 - 1
assets/scripts/net/GameProcessManager.js

@@ -392,7 +392,7 @@ export default class GameProcessManager
     onConnectOk()
     {
        // this._lum.getBehavior('BattleBehavior').needCheckConnectGameing = true
-        this._lum.getBehavior('BattleBehavior').emit(Event.SOCKET_MSG.RECONNECT_OK, {});
+        // this._lum.getBehavior('BattleBehavior').emit(Event.SOCKET_MSG.RECONNECT_OK, {});
 
     }
 

+ 5 - 2
assets/scripts/net/HTTP.js

@@ -11,7 +11,7 @@ var HTTP = cc.Class({
         userId : 0,
         master_url:Define.GameHttpUrl,
         url:Define.GameHttpUrl,
-        sendRequest : function(path,data,handler,extraUrl){
+        sendRequest : function(path,data,handler,extraUrl,meth){
             var xhr = cc.loader.getXMLHttpRequest();
             xhr.timeout = 5000;
             var str = "?";
@@ -26,7 +26,10 @@ var HTTP = cc.Class({
             }
             var requestURL = extraUrl + path + encodeURI(str);
             console.log("RequestURL:" + requestURL);
-            xhr.open("GET",requestURL, true);
+            if (meth == null) {
+                meth = "GET"
+            }
+            xhr.open(meth,requestURL, true);
             xhr.setRequestHeader('Access-Control-Allow-Headers', '*');
             xhr.setRequestHeader('Content-type', 'application/ecmascript');
             xhr.setRequestHeader('Access-Control-Allow-Origin', '*');

+ 49 - 0
assets/scripts/view/BaoxianxiangController.js

@@ -0,0 +1,49 @@
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        bxxitem:cc.Prefab,
+        listView:cc.ScrollView,
+        gameLayout:cc.Layout,
+    },
+
+    init(){
+        cc.vv.userMgr.getagentCash(this.OnGetPageData.bind(this));
+    },
+
+    // OnGetPageData(ret){
+    //     console.log(ret)
+    // },
+
+    OnGetPageData(ret){
+        console.log("OnGetPageData bxx")
+        if (ret.data && ret.data.length>0) {
+            this.gameLayout.node.children.forEach(element => {
+                element.destroy()
+            });
+            var gameitems = ret.data
+            // gameitems.sort(function (a,b) {
+            //     return a.id - b.id
+            // })
+            for (let index = 0; index < gameitems.length; index++) {
+                const data = gameitems[index]
+                var gameItem = cc.instantiate(this.bxxitem)
+                gameItem.name = "item"+data.id
+                gameItem.getComponent('BaoxianxiangItem').setGameData(data,this)
+                this.gameLayout.node.addChild(gameItem)
+            }
+            this.gameLayout.node.width = gameitems.length*gameItem.width
+            this.gameLayout.node.parent.width =this.gameLayout.node.width
+            this.listView.scrollToOffset(cc.v2(0,0),0)
+            // this.gameLayout.node.height = 580
+        }
+    },
+    OnBtnClicked(sender,gameid,type)
+    {
+        cc.vv.userMgr.turnOutMoney(this.init.bind(this));
+    },
+
+});
+
+

+ 9 - 0
assets/scripts/view/BaoxianxiangController.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "656c2a80-bc10-4499-92fd-81092cbc0909",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 31 - 0
assets/scripts/view/BaoxianxiangItem.js

@@ -0,0 +1,31 @@
+import Common from '../common/Common';
+import Define from '../common/Define'
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        bg:cc.Sprite,
+        num:cc.Label,
+    },
+    
+	clickTable(sender,type)
+	{
+        console.log("clickTable")
+        var num = this.num.string
+        this.parentNode.OnBtnClicked(sender,this.gameid,type,num)
+    },
+
+    setGameData(data,parentNode)
+    {
+        var self = this;
+        this.gameid = data.id
+        this.parentNode = parentNode
+        var self = this;
+        if (data.iconUrl) {
+            Common.loadImage(Define.GameHttpUrl+data.iconUrl,function(texture){
+                var sprite  = new cc.SpriteFrame(texture);
+                self.bg.getComponent(cc.Sprite).spriteFrame = sprite;
+            })
+        }
+    },
+});

+ 9 - 0
assets/scripts/view/BaoxianxiangItem.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "8f47cc83-b234-4866-a476-cd7eed6fa086",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 1 - 1
assets/scripts/view/CaiPiaosubHallController.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "50f3f422-ed8f-4572-af5e-3fd89952a0b5",
+  "uuid": "bf0d0521-3942-4432-ab33-4fed2ae48b95",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 12 - 3
assets/scripts/view/GamesHallController.js

@@ -49,12 +49,12 @@ cc.Class({
         // this.loginBtnNode.active = false
         // this.progressBarTarget = 0;
         // this.scale = 1;
-        // this.initListener();
+        this.initListener();
         // this.preloadCount = 0;
         // this.preloadTotal = 5;
         // this.lum = LogicUnitManager;
-        // this.loginLogic = this.lum.getBehavior('LoginBehavior');
-        // // this.loginLogic.CreateLoginStart();
+        this.loginLogic = this.lum.getBehavior('LoginBehavior');
+        this.loginLogic.CreateLoginStart();
         // this.bloaded = true
         // this.node.Opacity=0;
         // this.node.runAction(cc.fadeIn(1.0));
@@ -142,6 +142,15 @@ cc.Class({
     {
         // this.onBehaviorEvent('LoginBehavior',Event.COM_MSG.PRELOAD_DONE,this.onLoaded.bind(this));
         // this.onBehaviorEvent('LoginBehavior',Event.SOCKET_MSG.OPEN, this.onSocketOpen.bind(this));
+        this.onBehaviorEvent('LoginBehavior',Event.DATA_MSG.LOGIN, this.onUserLogin.bind(this));
+    },
+
+    onUserLogin()
+    {
+        var playerInfo = this.node.getChildByName('top').getChildByName("playerInfo")
+        playerInfo.getChildByName("name").getComponent(cc.Label).string = cc.vv.userMgr.account
+        playerInfo.getChildByName("playerID").getComponent(cc.Label).string = "ID:"+cc.vv.userMgr.userId
+        console.log(cc.vv.userMgr.account)
     },
 
 

+ 18 - 0
assets/scripts/view/HuodongController.js

@@ -0,0 +1,18 @@
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+    },
+
+    init(){
+        cc.vv.userMgr.getagentCash(this.OnGetPageData.bind(this));
+    },
+
+    OnGetPageData(ret){
+        console.log(ret)
+    },
+    
+});
+
+

+ 9 - 0
assets/scripts/view/HuodongController.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "115f9254-83ae-4137-96f4-620c09480f67",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 4 - 0
assets/scripts/view/TipsLayerController.js

@@ -22,6 +22,10 @@ cc.Class({
         });
         var showingNode = this.node.getChildByName(mode)
         if (showingNode) {
+            var ctr = showingNode.getComponent(mode+"Controller")
+            if (ctr) {
+                ctr.init()
+            }
             showingNode.active = true
         }
     },

+ 1 - 1
assets/scripts/view/WebviewCtrl.js

@@ -32,7 +32,7 @@ cc.Class({
         if(ret.status !== 1){
             this.visitURL('http://sports.meme100.com/m/#/')
         }else{
-            this.visitURL('http://sports.meme100.com/m/#/?token='+ret.data.apiToken)
+            this.visitURL(ret.data.url)
         }
         
     },

+ 1 - 1
settings/project.json

@@ -23,7 +23,7 @@
   "group-list": [
     "default"
   ],
-  "last-module-event-record-time": 1558419924475,
+  "last-module-event-record-time": 1559297061690,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,

+ 28 - 12
settings/services.json

@@ -3,9 +3,9 @@
     {
       "service_id": "235",
       "service_name": "Cocos Analytics",
+      "service_icon": "https://account.cocos.com/client/3f8f31ccf66995e183044f167c092395.png",
       "service_desc": "提供最核心最基本的数据、标准化界面功能简洁易用、数据准确性最好",
       "service_title": "精准了解游戏的新增、活跃、留存、付费等数据",
-      "service_icon": "https://account.cocos.com/client/3f8f31ccf66995e183044f167c092395.png",
       "service_guide_url": "https://n-analytics.cocos.com/docs/",
       "service_sample_url": "https://github.com/cocos-creator/tutorial-dark-slash/tree/analytics",
       "service_dev_url": "http://analytics.cocos.com/realtime/jump_to/<app_id>",
@@ -42,19 +42,23 @@
         "quickgame",
         "qgame",
         "huawei"
-      ]
+      ],
+      "require_verify": 0,
+      "service_price": "",
+      "packpage_version_desc": "",
+      "service_protocol": "游戏首次开启该服务时,Cocos会后台通知服务方为游戏开通服务并初始化参数,服务方根据需要可能会获取您的Cocos账户信息,包括账户基本资料、游戏基本资料、账户余额等,点击确认开通按钮即视为您同意该服务访问您的账户信息,详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
     },
     {
       "service_id": "241",
       "service_name": "Matchvs",
+      "service_icon": "https://account.cocos.com/client/14406719a07eb3d714d36e5edc6e06fa.png",
       "service_desc": "通过SDK接入快速实现联网功能、帧同步、国内外多节点、服务器独立部署、gameServer自定义游戏服务端逻辑。\n技术支持群QQ群:822523258",
       "service_title": "专业成熟的移动游戏联网与服务端解决方案",
-      "service_icon": "https://account.cocos.com/client/14406719a07eb3d714d36e5edc6e06fa.png",
       "service_guide_url": "http://doc.matchvs.com/QuickStart/QuickStart-CocosCreator",
       "service_sample_url": "http://www.matchvs.com/serviceCourse",
       "service_dev_url": "http://www.matchvs.com/cocosLogin",
-      "service_type": "2",
-      "service_type_zh": "仅支持公司游戏",
+      "service_type": "3",
+      "service_type_zh": "公司和个人游戏",
       "support_platform": [
         "Android",
         "iOS",
@@ -83,16 +87,20 @@
         "quickgame",
         "qgame",
         "huawei"
-      ]
+      ],
+      "require_verify": 0,
+      "service_price": "该服务按使用量计费,<a href='https://www.matchvs.com/price'><font color='#dddddd'>计费规则</font></a>,所产生的费用将由第三方从您的 <a href='https://account.cocos.com/#/finance/finance_list'><font color='#dddddd'>Cocos 账户余额</font></a> 中扣除。",
+      "packpage_version_desc": "",
+      "service_protocol": "游戏首次开启该服务时,Cocos会后台通知服务方为游戏开通服务并初始化参数,服务方根据需要可能会获取您的Cocos账户信息,包括账户基本资料、游戏基本资料、账户余额等,点击确认开通按钮即视为您同意该服务访问您的账户信息,详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
     },
     {
       "service_id": "242",
       "service_name": "Agora Voice",
-      "service_desc": "稳定、低耗、76ms超低延时、全球200+数据中心覆盖;变声器、超高音质、听声辩位等丰富玩法极速接入;全平台支持:Android、iOS、Web。\n技术支持群QQ群:799099183",
-      "service_title": "游戏内置实时语音SDK",
       "service_icon": "https://account.cocos.com/uploads/client_icon/date(\"Y-m-d\")/50fe52b789c2fc1e1fff9eec161c1bb3.png",
+      "service_desc": "稳定、低耗、76ms超低延时、全球200+数据中心覆盖;变声器、超高音质、听声辩位等丰富玩法极速接入;全平台支持:Android、iOS、Web。\n技术支持群QQ群:799099183\n",
+      "service_title": "游戏内置实时语音",
       "service_guide_url": "https://docs.agora.io/cn/Interactive Gaming/game_c",
-      "service_sample_url": " https://github.com/AgoraIO/Voice-Call-for-Mobile-Gaming/tree/master/Basic-Voice-Call-for-Gaming/Hello-Cocos-Creator-Voice-Agora",
+      "service_sample_url": "https://github.com/AgoraIO/Voice-Call-for-Mobile-Gaming/tree/master/Basic-Voice-Call-for-Gaming/Hello-Cocos-Creator-Voice-Agora",
       "service_dev_url": "https://sso.agora.io/api/oauth/cocos/login",
       "service_type": "3",
       "service_type_zh": "公司和个人游戏",
@@ -112,14 +120,18 @@
         "web-desktop",
         "android",
         "ios"
-      ]
+      ],
+      "require_verify": 1,
+      "service_price": "该服务按使用量计费,<a href='https://docs.agora.io/cn/Agora Platform/billing_faq?platform=All Platforms'><font color='#dddddd'>计费规则</font></a>,所产生的费用将由第三方从您的 <a href='https://account.cocos.com/#/finance/finance_list'><font color='#dddddd'>Cocos 账户余额</font></a> 中扣除。",
+      "packpage_version_desc": "",
+      "service_protocol": "游戏首次开启该服务时,Cocos会后台通知服务方为游戏开通服务并初始化参数,服务方根据需要可能会获取您的Cocos账户信息,包括账户基本资料、游戏基本资料、账户余额等,点击确认开通按钮即视为您同意该服务访问您的账户信息,详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
     },
     {
       "service_id": "7",
       "service_name": "AnySDK",
+      "service_icon": "https://account.cocos.com/client/3ba1fcf9029140cf08d95813e387d04a.png",
       "service_desc": "800+渠道、支持多平台多引擎、安全稳定的本地打包工具。技术支持:https://forum.cocos.com/c/anysdk",
       "service_title": "游戏快速接入第三方SDK的解决方案",
-      "service_icon": "https://account.cocos.com/client/3ba1fcf9029140cf08d95813e387d04a.png",
       "service_guide_url": "http://docs.anysdk.com",
       "service_sample_url": "http://github.com/AnySDK",
       "service_dev_url": "http://dev.anysdk.com",
@@ -141,7 +153,11 @@
         "web-desktop",
         "android",
         "ios"
-      ]
+      ],
+      "require_verify": 0,
+      "service_price": "",
+      "packpage_version_desc": "",
+      "service_protocol": "游戏首次开启该服务时,Cocos会后台通知服务方为游戏开通服务并初始化参数,服务方根据需要可能会获取您的Cocos账户信息,包括账户基本资料、游戏基本资料、账户余额等,点击确认开通按钮即视为您同意该服务访问您的账户信息,详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
     }
   ]
 }

Vissa filer visades inte eftersom för många filer har ändrats