2 次代碼提交 fedc1dffea ... 79a84b6c69

作者 SHA1 備註 提交日期
  彭俊 79a84b6c69 Merge branch 'master' of http://git.bocai108.com:10180/aqm/cocos_sports 6 年之前
  彭俊 98cf02e3f2 追加推送 6/5 6 年之前
共有 38 個文件被更改,包括 2169 次插入1233 次删除
  1. 614 0
      assets/prefab/activityItem.prefab
  2. 7 0
      assets/prefab/activityItem.prefab.meta
  3. 45 824
      assets/prefab/bxxItem.prefab
  4. 1 1
      assets/prefab/bxxItem.prefab.meta
  5. 649 0
      assets/prefab/tradeRecordItem.prefab
  6. 7 0
      assets/prefab/tradeRecordItem.prefab.meta
  7. 393 340
      assets/scenes/hall.fire
  8. 2 2
      assets/scripts/common/Define.js
  9. 32 18
      assets/scripts/controller/UserMgr.js
  10. 32 0
      assets/scripts/view/ActivityItem.js
  11. 9 0
      assets/scripts/view/ActivityItem.js.meta
  12. 10 5
      assets/scripts/view/BaoxianxiangController.js
  13. 3 2
      assets/scripts/view/BaoxianxiangItem.js
  14. 1 0
      assets/scripts/view/GamesHallController.js
  15. 38 3
      assets/scripts/view/HuodongController.js
  16. 53 0
      assets/scripts/view/JiaoyiController.js
  17. 9 0
      assets/scripts/view/JiaoyiController.js.meta
  18. 27 0
      assets/scripts/view/JiaoyiItem.js
  19. 9 0
      assets/scripts/view/JiaoyiItem.js.meta
  20. 9 3
      assets/scripts/view/WebviewCtrl.js
  21. 1 1
      assets/textures/tips/baoxianxiang/X.png.meta
  22. 二進制
      assets/textures/tips/baoxianxiang/btnbg.png
  23. 31 0
      assets/textures/tips/baoxianxiang/btnbg.png.meta
  24. 二進制
      assets/textures/tips/baoxianxiang/btnbg1.png
  25. 31 0
      assets/textures/tips/baoxianxiang/btnbg1.png.meta
  26. 二進制
      assets/textures/tips/baoxianxiang/game7.png
  27. 31 0
      assets/textures/tips/baoxianxiang/game7.png.meta
  28. 二進制
      assets/textures/tips/baoxianxiang/jb.png
  29. 31 0
      assets/textures/tips/baoxianxiang/jb.png.meta
  30. 二進制
      assets/textures/tips/baoxianxiang/trI.png
  31. 31 0
      assets/textures/tips/baoxianxiang/trI.png.meta
  32. 二進制
      assets/textures/tips/baoxianxiang/trO.png
  33. 31 0
      assets/textures/tips/baoxianxiang/trO.png.meta
  34. 二進制
      assets/textures/tips/baoxianxiang/ye.png
  35. 31 0
      assets/textures/tips/baoxianxiang/ye.png.meta
  36. 二進制
      assets/textures/tips/baoxianxiang/底.png
  37. 1 1
      assets/textures/tips/baoxianxiang/底.png.meta
  38. 0 33
      settings/services.json

+ 614 - 0
assets/prefab/activityItem.prefab

@@ -0,0 +1,614 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "activityItem",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 181,
+      "height": 214
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 90.5,
+      "y": 43,
+      "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": "hot",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 75,
+      "height": 90
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -54,
+      "y": 64,
+      "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__": 2
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "3aaa0a1a-545c-42f7-9bc9-a540bd73476f"
+    },
+    "_type": 0,
+    "_sizeMode": 2,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_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": 9,
+    "_left": -1,
+    "_right": 0,
+    "_top": -2,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "e0Ash3CoxNt4AmZlxKhTLy",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "chaozhi",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 75,
+      "height": 91
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -54,
+      "y": 63.5,
+      "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__": 6
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "b0bca8a1-fd61-4b06-92e4-91899e117f23"
+    },
+    "_type": 0,
+    "_sizeMode": 2,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 9,
+    "_left": -1,
+    "_right": 0,
+    "_top": -2,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "bc222inGFKv7YM/iNCPcOU",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 127,
+      "height": 52
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -149,
+      "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__": 10
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "81dcfb91-1a38-4b06-b1ac-1a69f235bcfc"
+    },
+    "_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__": 10
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 16,
+    "_left": 463.5,
+    "_right": 0,
+    "_top": 396.5,
+    "_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__": 10
+    },
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "0f8be7UlRGp4nQhs2uDCvy",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "708183a5-20c4-4491-bf3e-9399eb06f43d"
+    },
+    "_type": 0,
+    "_sizeMode": 2,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_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": 1,
+    "_left": 249,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "6c4VAd5HRJfLx+9tg7a72K",
+    "sync": false
+  }
+]

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

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "e4ab447a-bec2-4d61-9379-8a1f1c08d33f",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

+ 45 - 824
assets/prefab/bxxItem.prefab

@@ -12,7 +12,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "bxxItem",
+    "_name": "bxxitem",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -20,30 +20,21 @@
         "__id__": 2
       },
       {
-        "__id__": 14
-      },
-      {
-        "__id__": 20
-      },
-      {
-        "__id__": 26
+        "__id__": 5
       }
     ],
     "_active": true,
-    "_level": 1,
+    "_level": 2,
     "_components": [
       {
-        "__id__": 31
-      },
-      {
-        "__id__": 32
+        "__id__": 9
       },
       {
-        "__id__": 33
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -55,13 +46,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 338,
-      "height": 248
+      "width": 220,
+      "height": 81
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 1
     },
     "_position": {
       "__type__": "cc.Vec3",
@@ -91,31 +82,21 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "numbg",
+    "_name": "choose",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 3
-      },
-      {
-        "__id__": 7
-      }
-    ],
+    "_children": [],
     "_active": true,
-    "_level": 4,
+    "_level": 3,
     "_components": [
       {
-        "__id__": 11
-      },
-      {
-        "__id__": 12
+        "__id__": 3
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 4
     },
     "_opacity": 255,
     "_color": {
@@ -127,83 +108,18 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 183,
-      "height": 46
+      "width": 220,
+      "height": 81
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 1
     },
     "_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": {
@@ -231,11 +147,11 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 2
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "e3af93e8-50c7-4903-9af9-c45b16710924"
+      "__uuid__": "0244ab93-f3d4-4e36-a8ab-8dc8df6a55dc"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -254,64 +170,37 @@
     "_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"
+      "__id__": 0
     },
-    "fileId": "3eWIRHP2JJ/ahr8x3Dw0Pm",
+    "fileId": "53/dw0GeFO5Y0fnxEyBZB0",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "num",
+    "_name": "name",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 1
     },
     "_children": [],
     "_active": true,
-    "_level": 5,
+    "_level": 3,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 6
       },
       {
-        "__id__": 9
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -323,18 +212,18 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 111.23,
-      "height": 25
+      "width": 134,
+      "height": 37
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 0.5,
       "y": 0.5
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -44.4,
-      "y": 0,
+      "x": 0,
+      "y": -40.5,
       "z": 0
     },
     "_scale": {
@@ -357,79 +246,16 @@
     "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
+      "__id__": 5
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "70983e9c-dddd-4932-8915-49a6e58f27c7"
+      "__uuid__": "61bf4f11-7a3e-47c6-8d52-3828fcb2a6ac"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -453,15 +279,15 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 5
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 17,
+    "_alignFlags": 18,
     "_left": 0,
     "_right": 0,
-    "_top": 100,
+    "_top": 0,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -481,89 +307,21 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "64267a62-e64c-48bc-b29c-78d485ca1d89"
+      "__id__": 0
     },
-    "fileId": "8eGUis5lhOqY91YrbjRL6C",
+    "fileId": "d9rKtAPspPCKbmV4m7S9vU",
     "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
+      "__id__": 1
     },
     "_enabled": true,
     "_spriteFrame": {
-      "__uuid__": "a1ea90d9-b816-4615-8b64-f52659c6ba9e"
+      "__uuid__": "0d6f6240-2a42-4227-8160-7e1cb2494380"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -582,48 +340,17 @@
     "_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
+      "__id__": 1
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 0.9,
-    "clickEvents": [
-      {
-        "__id__": 18
-      }
-    ],
+    "clickEvents": [],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 3,
@@ -679,521 +406,15 @@
     "_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"
+      "__id__": 0
     },
-    "fileId": "f4aNaO0T9JRZyY2r9QQX2R",
+    "fileId": "37ioTFVMlFW6FTPq+h0tlB",
     "sync": false
   }
 ]

+ 1 - 1
assets/prefab/bxxItem.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.1",
-  "uuid": "64267a62-e64c-48bc-b29c-78d485ca1d89",
+  "uuid": "095a1140-625e-49bc-95b1-f9cce7b0aa44",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "subMetas": {}

+ 649 - 0
assets/prefab/tradeRecordItem.prefab

@@ -0,0 +1,649 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tradeRecordItem",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_level": 1,
+    "_components": [
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 722,
+      "height": 157
+    },
+    "_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": "moneyDetail",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 162,
+      "height": 27
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -255.5,
+      "y": 42.9,
+      "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__": 2
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "c0b2a9bc-c3e6-4b07-9f5a-bad4a13c7ef3"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "98AcXHvu1B8Yq5BFrPk00/",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 333,
+      "height": 52
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -171.6,
+      "y": -31.2,
+      "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__": 5
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "5033bf35-c6b3-4c70-ad08-03ed5754ab0b"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "70V9MuiqxNJ7gkX68Axtg6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "time",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 127,
+      "height": 24
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 278.9,
+      "y": -48.7,
+      "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__": 8
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "bcd392ab-ddef-4047-9625-28025bdb5562"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "41mlQIpMNG8qNAPIJLmuvy",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "moneyDetail",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 187.55,
+      "height": 26
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -338,
+      "y": 43,
+      "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__": 11
+    },
+    "_enabled": true,
+    "_useOriginalSize": true,
+    "_string": "红包转出 ¥500",
+    "_N$string": "红包转出 ¥500",
+    "_fontSize": 27,
+    "_lineHeight": 26.9,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "4eGSYm/pJI0bEUTT/5nVwo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "time",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 141.42,
+      "height": 24
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 1,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 342,
+      "y": -45,
+      "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__": 14
+    },
+    "_enabled": true,
+    "_useOriginalSize": true,
+    "_string": "5月06日 5:14",
+    "_N$string": "5月06日 5:14",
+    "_fontSize": 24,
+    "_lineHeight": 24,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_N$horizontalAlign": 2,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "45tDBZ/A9An5/cE/10dEAt",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "badf26d4-c786-4538-a681-be891068dc66"
+    },
+    "_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__": "bee1ci9CORFgY6x4FOv/tbv",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "bg": {
+      "__id__": 17
+    },
+    "num": {
+      "__id__": 12
+    },
+    "item": {
+      "__id__": 15
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eba23667-d33b-4c90-a0ea-86c45a9a6428"
+    },
+    "fileId": "357VieWfVKZ5OOOETOosh1",
+    "sync": false
+  }
+]

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

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "eba23667-d33b-4c90-a0ea-86c45a9a6428",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

File diff suppressed because it is too large
+ 393 - 340
assets/scenes/hall.fire


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

@@ -6,8 +6,8 @@ let Define = {
 	'NICKNAME': 'Gavin',
 	'MYACCOUNT': 'TEST_2',
 	'MYPASSWORD': 'E10ADC3949BA59ABBE56E057F20F883E',
-	"GameHttpUrl": "http://api.boyin18.com",
-	// "GameHttpUrl": "http://www.qpapi.com",
+	// "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',

+ 32 - 18
assets/scripts/controller/UserMgr.js

@@ -154,6 +154,38 @@ cc.Class({
         }
         cc.vv.http.sendRequest("/sys/menu/getMenus",data,onEnter)
     },
+
+    getActivityList(callback){
+        var onEnter = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+            }
+            else{
+                console.log(ret);
+                callback(ret)
+            }
+        }
+        var data={
+            type:null,
+            label:null,
+        }
+        cc.vv.http.sendRequest("/sys/activity/activityList",data,onEnter)
+    },
+    gettradeRecord(callback){
+        var onEnter = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+            }
+            else{
+                console.log(ret);
+                callback(ret)
+            }
+        }
+        var data = {
+            member_id:this.userId
+        }
+        cc.vv.http.sendRequest("/api/user/tradeRecord",data,onEnter)
+    },
     turnOutMoney(data,callback){
         var onTurn = function(ret){
             if(ret.status !== 1){
@@ -239,24 +271,6 @@ cc.Class({
         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){
         var self = this;

+ 32 - 0
assets/scripts/view/ActivityItem.js

@@ -0,0 +1,32 @@
+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
+        this.num.string = data.gameMoney_money
+        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/ActivityItem.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "744be3c2-14b5-4518-961d-f09503c05ba6",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 10 - 5
assets/scripts/view/BaoxianxiangController.js

@@ -6,6 +6,7 @@ cc.Class({
         bxxitem:cc.Prefab,
         listView:cc.ScrollView,
         gameLayout:cc.Layout,
+        num:cc.EditBox,
     },
 
     init(){
@@ -33,17 +34,21 @@ cc.Class({
                 gameItem.getComponent('BaoxianxiangItem').setGameData(data,this)
                 this.gameLayout.node.addChild(gameItem)
             }
-            this.gameLayout.node.width = gameitems.length*gameItem.width
+            this.gameLayout.node.width = gameitems.length*gameItem.width +10
             this.gameLayout.node.parent.width =this.gameLayout.node.width
             this.listView.scrollToOffset(cc.v2(0,0),0)
-            // this.gameLayout.node.height = 580
+            this.gameLayout.node.height = 248
         }
     },
-    OnBtnClicked(sender,gameid,type)
+    OnBtnClicked(sender,type)
     {
-        cc.vv.userMgr.turnOutMoney(this.init.bind(this));
+        // var data = {
+        //     gameid : gameid,
+        //     type : type,
+        //     money : money
+        // }
+        cc.vv.userMgr.turnOutMoney(data,this.init.bind(this));
     },
-
 });
 
 

+ 3 - 2
assets/scripts/view/BaoxianxiangItem.js

@@ -20,9 +20,10 @@ cc.Class({
         var self = this;
         this.gameid = data.id
         this.parentNode = parentNode
+        this.num.string = data.gameMoney_money
         var self = this;
-        if (data.iconUrl) {
-            Common.loadImage(Define.GameHttpUrl+data.iconUrl,function(texture){
+        if (data.smalliconUrl) {
+            Common.loadImage(Define.GameHttpUrl+data.smalliconUrl,function(texture){
                 var sprite  = new cc.SpriteFrame(texture);
                 self.bg.getComponent(cc.Sprite).spriteFrame = sprite;
             })

+ 1 - 0
assets/scripts/view/GamesHallController.js

@@ -150,6 +150,7 @@ cc.Class({
         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
+        this.node.getChildByName('top').getChildByName("addcoin").getChildByName("num").getComponent(cc.Label).string = cc.vv.userMgr.amount
         console.log(cc.vv.userMgr.account)
     },
 

+ 38 - 3
assets/scripts/view/HuodongController.js

@@ -3,16 +3,51 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
+        item:cc.Prefab,
+        listView:cc.ScrollView,
+        gameLayout:cc.Layout,
     },
 
     init(){
-        cc.vv.userMgr.getagentCash(this.OnGetPageData.bind(this));
+        cc.vv.userMgr.getActivityList(this.OnGetPageData.bind(this));
     },
 
+    // OnGetPageData(ret){
+    //     console.log(ret)
+    // },
+
     OnGetPageData(ret){
-        console.log(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('ActivityItem').setGameData(data,this)
+                this.gameLayout.node.addChild(gameItem)
+            }
+            this.gameLayout.node.width = gameitems.length*gameItem.width +10
+            this.gameLayout.node.parent.width =this.gameLayout.node.width
+            this.listView.scrollToOffset(cc.v2(0,0),0)
+            // this.gameLayout.node.height = 248
+        }
+    },
+    OnBtnClicked(sender,gameid,type,money)
+    {
+        // var data = {
+        //     gameid : gameid,
+        //     type : type,
+        //     money : money
+        // }
+        // cc.vv.userMgr.turnOutMoney(data,this.init.bind(this));
     },
-    
 });
 
 

+ 53 - 0
assets/scripts/view/JiaoyiController.js

@@ -0,0 +1,53 @@
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        item:cc.Prefab,
+        listView:cc.ScrollView,
+        gameLayout:cc.Layout,
+    },
+
+    init(){
+        cc.vv.userMgr.gettradeRecord(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('JiaoyiItem').setGameData(data,this)
+                this.gameLayout.node.addChild(gameItem)
+            }
+            this.gameLayout.node.height = gameitems.length*gameItem.height +10
+            this.gameLayout.node.parent.height =this.gameLayout.node.height
+            this.listView.scrollToOffset(cc.v2(0,0),0)
+            // this.gameLayout.node.height = 248
+        }
+    },
+    OnBtnClicked(sender,gameid,type,money)
+    {
+        var data = {
+            gameid : gameid,
+            type : type,
+            money : money
+        }
+        cc.vv.userMgr.turnOutMoney(data,this.init.bind(this));
+    },
+});
+
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "7b4c8bc7-7ce9-4ba4-a15c-3cf75a1b2617",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 27 - 0
assets/scripts/view/JiaoyiItem.js

@@ -0,0 +1,27 @@
+import Common from '../common/Common';
+import Define from '../common/Define'
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        bg:cc.Sprite,
+        num:cc.Label,
+        item:cc.Label,
+    },
+
+    setGameData(data,parentNode)
+    {
+        var self = this;
+        this.gameid = data.moneyDetails_id
+        this.parentNode = parentNode
+        this.num.string = data.moneyDetails_money
+        this.num.string = data.moneyDetails_time
+        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/JiaoyiItem.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "bee1c8bd-08e4-4581-8eb1-e053affed6ef",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 9 - 3
assets/scripts/view/WebviewCtrl.js

@@ -7,9 +7,9 @@ cc.Class({
         webview: cc.WebView,
     },
     onLoad(){
-        cc.vv.userMgr.agentLogin(this.gameid,function (ret) {
-            this.reqSuccess(ret)
-        }.bind(this))
+        // cc.vv.userMgr.agentLogin(this.gameid,function (ret) {
+        //     this.reqSuccess(ret)
+        // }.bind(this))
     },
 
     onWebFinishLoad: function (sender, event) {
@@ -27,6 +27,12 @@ cc.Class({
     // setView(gameid){
     //     this.gameid = gameid
     // },
+    initScene()
+    {
+        cc.vv.userMgr.agentLogin(this.gameid,function (ret) {
+            this.reqSuccess(ret)
+        }.bind(this))
+    },
 
     reqSuccess(ret){
         if(ret.status !== 1){

+ 1 - 1
assets/textures/tips/baoxianxiang/X.png.meta

@@ -8,7 +8,7 @@
   "subMetas": {
     "X": {
       "ver": "1.0.3",
-      "uuid": "8b2b793a-77bf-457e-9192-5179e8ef4f4d",
+      "uuid": "b6027799-d65e-4f9c-9719-274cb43e8e5e",
       "rawTextureUuid": "a5f1032f-fab4-4765-8c9b-ac4f1e2e29be",
       "trimType": "auto",
       "trimThreshold": 1,

二進制
assets/textures/tips/baoxianxiang/btnbg.png


+ 31 - 0
assets/textures/tips/baoxianxiang/btnbg.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "83db1d50-7e3a-449f-b747-2e44c7bf28b8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "btnbg": {
+      "ver": "1.0.3",
+      "uuid": "0d6f6240-2a42-4227-8160-7e1cb2494380",
+      "rawTextureUuid": "83db1d50-7e3a-449f-b747-2e44c7bf28b8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 220,
+      "height": 81,
+      "rawWidth": 220,
+      "rawHeight": 81,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/btnbg1.png


+ 31 - 0
assets/textures/tips/baoxianxiang/btnbg1.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "3b544e81-2cc8-4034-bcc2-7e3ac1628b06",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "btnbg1": {
+      "ver": "1.0.3",
+      "uuid": "0244ab93-f3d4-4e36-a8ab-8dc8df6a55dc",
+      "rawTextureUuid": "3b544e81-2cc8-4034-bcc2-7e3ac1628b06",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 220,
+      "height": 81,
+      "rawWidth": 220,
+      "rawHeight": 81,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/game7.png


+ 31 - 0
assets/textures/tips/baoxianxiang/game7.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "e35f1f3d-1d0c-4a43-83d5-964795ce27f6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game7": {
+      "ver": "1.0.3",
+      "uuid": "61bf4f11-7a3e-47c6-8d52-3828fcb2a6ac",
+      "rawTextureUuid": "e35f1f3d-1d0c-4a43-83d5-964795ce27f6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 134,
+      "height": 37,
+      "rawWidth": 135,
+      "rawHeight": 38,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/jb.png


+ 31 - 0
assets/textures/tips/baoxianxiang/jb.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "5bb17174-2faa-426b-b861-817f28ac07c4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "jb": {
+      "ver": "1.0.3",
+      "uuid": "4c8c2ede-aadd-490d-a5aa-00e92a8758de",
+      "rawTextureUuid": "5bb17174-2faa-426b-b861-817f28ac07c4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 40,
+      "height": 39,
+      "rawWidth": 40,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/trI.png


+ 31 - 0
assets/textures/tips/baoxianxiang/trI.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "192eb400-59d8-48f8-a41a-344c4be6b778",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "trI": {
+      "ver": "1.0.3",
+      "uuid": "4fd92bfe-e0b3-460b-97fd-e745510dc0fe",
+      "rawTextureUuid": "192eb400-59d8-48f8-a41a-344c4be6b778",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 168,
+      "height": 64,
+      "rawWidth": 168,
+      "rawHeight": 64,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/trO.png


+ 31 - 0
assets/textures/tips/baoxianxiang/trO.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "024d75c2-6f5a-4e8b-9a14-b934afebb250",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "trO": {
+      "ver": "1.0.3",
+      "uuid": "01684cb2-af71-46b5-9ca0-8dc0d15c62ee",
+      "rawTextureUuid": "024d75c2-6f5a-4e8b-9a14-b934afebb250",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 168,
+      "height": 64,
+      "rawWidth": 168,
+      "rawHeight": 64,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/ye.png


+ 31 - 0
assets/textures/tips/baoxianxiang/ye.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "27d0e464-db6a-4018-bad9-0ff972e21b4f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "ye": {
+      "ver": "1.0.3",
+      "uuid": "b87b1bac-38eb-45f8-9b37-819db770d056",
+      "rawTextureUuid": "27d0e464-db6a-4018-bad9-0ff972e21b4f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 40,
+      "height": 39,
+      "rawWidth": 40,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

二進制
assets/textures/tips/baoxianxiang/底.png


+ 1 - 1
assets/textures/tips/baoxianxiang/底.png.meta

@@ -8,7 +8,7 @@
   "subMetas": {
     "底": {
       "ver": "1.0.3",
-      "uuid": "e9a2e2a5-b5f9-4269-8c7e-c6b5dea50de7",
+      "uuid": "504e2c57-4d28-497a-898a-a63c40e23133",
       "rawTextureUuid": "80790050-7224-409b-9b04-6a0538827394",
       "trimType": "auto",
       "trimThreshold": 1,

+ 0 - 33
settings/services.json

@@ -125,39 +125,6 @@
       "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_guide_url": "http://docs.anysdk.com",
-      "service_sample_url": "http://github.com/AnySDK",
-      "service_dev_url": "http://dev.anysdk.com",
-      "service_type": "0",
-      "service_type_zh": "不支持游戏",
-      "support_platform": [
-        "Android",
-        "iOS",
-        "HTML5"
-      ],
-      "package_download_url": "http://download.cocos.com/CocosServices/plugins/service-anysdk/1.0.1_2.2.5.zip",
-      "package_version_desc": "修复 Creator 2.0.x 系列版本 2.0.7 以上因调用 cc.game.restart(); 而导致的 AnySDK 调用失败的错误",
-      "service_component_name": "service-anysdk",
-      "package_versions": [
-        "1.0.1_2.2.5"
-      ],
-      "build_platform": [
-        "web-mobile",
-        "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>"
     }
   ]
 }

Some files were not shown because too many files changed in this diff