Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/game/prefab/game.prefab

@@ -30,11 +30,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -276,11 +276,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -351,19 +351,22 @@
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -376,7 +379,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 475
+      "height": 605
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -455,7 +458,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        198,
+        263,
         0,
         0,
         0,
@@ -521,6 +524,7 @@
     "_enabled": true,
     "panel_name": "module/pigBank/pigBank",
     "open_type": 0,
+    "transition_type": 0,
     "onComplete": [],
     "_id": ""
   },
@@ -578,7 +582,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        99,
+        164,
         0,
         0,
         0,
@@ -644,6 +648,7 @@
     "_enabled": true,
     "panel_name": "module/turnable/turnable",
     "open_type": 0,
+    "transition_type": 0,
     "onComplete": {
       "__id__": 16
     },
@@ -711,7 +716,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        65,
         0,
         0,
         0,
@@ -777,6 +782,7 @@
     "_enabled": true,
     "panel_name": "module/sign/sign",
     "open_type": 0,
+    "transition_type": 0,
     "onComplete": {
       "__id__": 21
     },
@@ -844,7 +850,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -99,
+        -34,
         0,
         0,
         0,
@@ -910,6 +916,7 @@
     "_enabled": true,
     "panel_name": "module/reward/reward",
     "open_type": 0,
+    "transition_type": 0,
     "onComplete": {
       "__id__": 26
     },
@@ -977,7 +984,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -198,
+        -133,
         0,
         0,
         0,
@@ -1043,6 +1050,7 @@
     "_enabled": true,
     "panel_name": "module/redBagCash/redBagCash",
     "open_type": 0,
+    "transition_type": 0,
     "onComplete": {
       "__id__": 31
     },
@@ -1068,6 +1076,52 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_prefab": {
+      "__id__": 34
+    },
+    "_name": "btnMoreGame",
+    "_active": true,
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -2.842170943040401e-14,
+        -247.5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 33
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "28pU6cwiRMg7fkRB4Xr7ia",
+    "sync": true
+  },
+  {
     "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
@@ -1078,7 +1132,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 475
+      "height": 605
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1159,6 +1213,9 @@
     "btn4": {
       "__id__": 23
     },
+    "btn5": {
+      "__id__": 33
+    },
     "_id": ""
   },
   {

assets/resources/module/moreGame/btnMoreGame.prefab

@@ -0,0 +1,768 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnMoreGame",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 116,
+      "height": 110
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -2.842170943040401e-14,
+        -247.5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.95,
+        0.95,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "moreGame_bg_name",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_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": 105,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        1.183,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "608fabf9-520a-425f-ba4f-e5d0590e1cf0"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "bc470mzKhMw7F589N/HzYQ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "spMoreGame",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_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": 88,
+      "height": 88
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        11.358,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "5dcdcEBa9KuqKwD83Lwsi9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labMoreGameName",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_prefab": {
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 215,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 82,
+      "height": 52.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -45,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "更多游戏",
+    "_N$string": "更多游戏",
+    "_fontSize": 20,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "40uUpGZdlGQIkdqbqMftwD",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "moreGame_bg_redbg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 93,
+      "height": 36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        74.993,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1.2
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "05565799-27b4-4aa4-9b5e-fd0bf33284ae"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "c19bax/pJEe5FQI9SaAKAh",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labMoreGameName",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 94.47,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        80.961,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "20元红包",
+    "_N$string": "20元红包",
+    "_fontSize": 22,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 75,
+      "g": 48,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "4cCgYwBbhN1qm8V2NOvJqJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "8c28c878-143c-4136-943d-17aa099bb077"
+    },
+    "_clips": [
+      {
+        "__uuid__": "8c28c878-143c-4136-943d-17aa099bb077"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "9ab36AQuiJKw67bq+KV3Yrw",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "spMoregame": {
+      "__id__": 6
+    },
+    "labMoregame": {
+      "__id__": 16
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "panel_name": "module/moreGame/moreGame",
+    "open_type": 0,
+    "transition_type": 0,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/moreGame/btnMoreGame.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "87af2d92-1d51-45d4-9ffe-c343a549a2a0",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/moreGame/moreGameBanner.prefab

@@ -55,7 +55,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 680,
+      "width": 750,
       "height": 300
     },
     "_anchorPoint": {
@@ -67,8 +67,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -340,
-        125.374,
+        0,
+        0,
         0,
         0,
         0,
@@ -127,7 +127,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        24.991,
         0,
         0,
         0,
@@ -221,7 +221,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        24.991,
         0,
         0,
         0,
@@ -1221,7 +1221,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        750,
+        774.991,
         0,
         0,
         0,
@@ -2205,7 +2205,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        24.991,
         0,
         0,
         0,
@@ -2401,7 +2401,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        680,
+        704.991,
         0,
         0,
         0,
@@ -2597,7 +2597,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        633,
+        657.991,
         -116.531,
         0,
         0,

assets/resources/module/moreGame/moreGamePopNode.prefab

@@ -21,26 +21,26 @@
         "__id__": 2
       },
       {
-        "__id__": 7
+        "__id__": 9
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -104,10 +104,13 @@
       },
       {
         "__id__": 4
+      },
+      {
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -273,6 +276,34 @@
     "customEventData": ""
   },
   {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "onComplete": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "cd58fkToeZLvKuTEPhUbrbO",
+    "handler": "onClosePanel",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -294,17 +325,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 10
       },
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -358,7 +389,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -390,7 +421,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 9
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -458,7 +489,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 9
     },
     "_enabled": true,
     "node_panel": {
@@ -489,11 +520,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -547,7 +578,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -594,14 +625,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 18
       },
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -655,7 +686,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -688,7 +719,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "_color": {
@@ -721,10 +752,10 @@
     },
     "_enabled": true,
     "icon": {
-      "__id__": 13
+      "__id__": 15
     },
     "labName": {
-      "__id__": 16
+      "__id__": 18
     },
     "_id": ""
   },

assets/script/game/data/GData.ts

@@ -16,6 +16,7 @@ import { CashPigData } from "./module/CashPigData";
 import { AdData } from "./AdData";
 import { RewardData } from "./module/RewardData";
 import MoreGameData from "./MoreGameData";
+import { Data } from "../../mk/data/Data";
 
 /**
  * 数据集合全局类
@@ -38,16 +39,16 @@ class GData {
     //module
     public reward: RewardData;
     public help: HelpData;
-    public push: PushData;
     public turnable: TurnableData;
     public fission: FissionData;
     public pigbank: PigBankData;
     public luckybag: LuckyBagData;
     public sign: SignData;
     public cashNormal: CashNormalData;
-    public cashPig: CashPigData;
     public moreGame: MoreGameData;
 
+    public moduleData:Map<number,Data>;
+
     init() {
         this.appData = new AppData();
         this.loginData = new LoginData();
@@ -59,16 +60,22 @@ class GData {
 
         this.reward = new RewardData();
         this.help = new HelpData();
-        this.pigbank = new PigBankData();
-        this.push = new PushData();
         this.turnable = new TurnableData();
         this.fission = new FissionData();
         this.pigbank = new PigBankData();
         this.luckybag = new LuckyBagData();
         this.sign = new SignData();
         this.cashNormal = new CashNormalData();
-        this.cashPig = new CashPigData();
         this.moreGame = new MoreGameData();
+
+        this.moduleData = new Map<number,Data>();
+        this.moduleData.set(Fun.moreGame,this.moreGame);
+        this.moduleData.set(Fun.turnable,this.turnable);
+        this.moduleData.set(Fun.fission,this.fission);
+        this.moduleData.set(Fun.pigbank,this.pigbank);
+        this.moduleData.set(Fun.luckybag,this.luckybag);
+        this.moduleData.set(Fun.sign,this.sign);
+        this.moduleData.set(Fun.cashNormal,this.cashNormal);
     }
 }
 
@@ -76,14 +83,13 @@ class GData {
  * 提现模块的功能ID
  */
 export enum Fun {
-    push = 1,       //互推
+    moreGame = 1,   //互推
     turnable = 2,   //转盘
     fission = 3,    //裂变
     pigbank = 4,    //存钱罐
     luckybag = 5,   //福袋
     sign = 6,       //签到
     cashNormal = 7, //常规提现
-    cashPig = 8,    //金猪提现
 }
 
 declare global {

assets/script/game/data/GameData.ts

@@ -15,6 +15,7 @@ export class GameData {
 
 
     public configs: any = {};
+    public gameData:any;
 
     public props: Map<number, number>;
 
@@ -36,6 +37,7 @@ export class GameData {
         if (response.errcode != 0) {
             return;
         }
+        this.gameData = response.data;
 
         if (this.props == null) {
             this.props = new Map<number, number>();
@@ -43,9 +45,11 @@ export class GameData {
 
         this.initProps(response.data.gameUserData);
 
-        this.dataFinish = true;
+        gData.moduleData.forEach(element => {
+            element.init();
+        });
 
-        gData.moreGame.init()
+        this.dataFinish = true;
     }
 
     /**

assets/script/game/data/MoreGameData.ts

@@ -4,9 +4,10 @@
  * @author kaka
  */
 
+import { Data } from "../../mk/data/Data";
 import JsbSystem from "../../mk/system/JsbSystem"
 
-export default class MoreGameData {
+export default class MoreGameData extends Data{
     /**推荐游戏信息 */
     private _moreGameList = null
 

assets/script/game/data/module/TurnableData.ts

@@ -1,6 +1,11 @@
 import { Data } from "../../../mk/data/Data";
 import { GameProp } from "../GameData";
 
+interface TurntableItem{
+    id:string,
+    type:string,
+}
+
 /**
  * @description 转盘数据
  * @author 邹勇
@@ -9,7 +14,11 @@ export class TurnableData extends Data {
 
 
     public leftTimes: number = 2;
+    public config:TurntableItem[];
 
+    public init(){
+        this.config = gData.gameData.configs.TurntableCfg;
+    }
 
     public setAdData(data) {
         super.setAdData(data);

assets/script/game/module/module/moreGame/BtnMoreGame.ts

@@ -0,0 +1,60 @@
+/**
+ * @description 更多游戏按钮
+ * @author kaka
+ */
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class BtnMoreGame extends cc.Component {
+    @property(cc.Sprite)
+    spMoregame: cc.Sprite = null;
+
+    @property(cc.Label)
+    labMoregame: cc.Label = null;
+
+    update() {
+        if (gData.moreGame.init_moreGameList) {
+            this.setMoreGameSp(gData.moreGame.moreGameList.normal);
+        }
+    }
+
+    lateUpdate() {
+        gData.moreGame.init_moreGameList = false;
+    }
+
+    /** 设置更多游戏图片 */
+    setMoreGameSp(arr) {
+        let len = arr.length
+        let index = mk.math.random(0, len - 1)
+        let data = arr[index]
+        this.showMoreGameSp(data)
+
+        this.schedule(() => {
+            index++
+            index = (index % len)
+            // LogUtil.logV('setMoreGameSp  ', 'index ' + index)
+            data = arr[index]
+            this.showMoreGameSp(data)
+        }, 10)
+    }
+
+    /** 切换图片 */
+    showMoreGameSp(data) {
+        //pc不加载，加载会报错
+        if (cc.sys.os != cc.sys.OS_WINDOWS) {
+            cc.loader.load(data.icon, (err, res) => {
+                if (err) {
+                    console.log('err:', err);
+                    return;
+                }
+                if (this.spMoregame) {
+                    let tex: cc.Texture2D = res as cc.Texture2D;
+                    this.spMoregame.spriteFrame = new cc.SpriteFrame(tex);
+                }
+            })
+        }
+
+        this.labMoregame.string = data.title
+    }
+}

assets/script/game/module/module/moreGame/BtnMoreGame.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "9ab36010-ba22-4ac3-aedb-abe295dd8af0",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/module/moreGame/MoreGame.ts

@@ -21,7 +21,7 @@ export default class MoreGameNode extends cc.Component {
 
     start() {
         this.node.setContentSize(cc.winSize)
-        gData.moreGame.init_moreGameList = true;
+        gData.moreGame.init();
 
         let addY = (cc.winSize.height - 1334)
         this.normalSv.node.height += addY

assets/script/game/module/module/moreGame/MoreGamePicItem.ts

@@ -30,16 +30,19 @@ export default class MoreGamePicItem extends cc.Component {
     init(data) {
         this.data = data
 
-        cc.loader.load(data.banner2, (err, res) => {
-            if (err) {
-                console.log('err:', err);
-                return;
-            }
-            if (this.banner) {
-                let tex: cc.Texture2D = res as cc.Texture2D;
-                this.banner.spriteFrame = new cc.SpriteFrame(tex);
-            }
-        })
+        //pc不加载，加载会报错
+        if (cc.sys.os != cc.sys.OS_WINDOWS) {
+            cc.loader.load(data.banner2, (err, res) => {
+                if (err) {
+                    console.log('err:', err);
+                    return;
+                }
+                if (this.banner) {
+                    let tex: cc.Texture2D = res as cc.Texture2D;
+                    this.banner.spriteFrame = new cc.SpriteFrame(tex);
+                }
+            })
+        }
 
         this.spPro.node.active = false
         this.btnStart.active = false

assets/script/game/module/module/moreGame/MoreGamePopNode.ts

@@ -31,14 +31,17 @@ export default class MoreGamePopNode extends cc.Component {
     init() {
         this.data = gData.moreGame.getRandomNormal();
         if (this.data) {
-            cc.loader.load(this.data.icon, (err, res) => {
-                if (err) {
-                    console.log('err:', err);
-                    return;
-                }
-                let tex: cc.Texture2D = res as cc.Texture2D;
-                this.icon.spriteFrame = new cc.SpriteFrame(tex);
-            })
+            //pc不加载，加载会报错
+            if (cc.sys.os != cc.sys.OS_WINDOWS) {
+                cc.loader.load(this.data.icon, (err, res) => {
+                    if (err) {
+                        console.log('err:', err);
+                        return;
+                    }
+                    let tex: cc.Texture2D = res as cc.Texture2D;
+                    this.icon.spriteFrame = new cc.SpriteFrame(tex);
+                })
+            }
 
             this.labName.string = this.data.title
         }
@@ -52,18 +55,18 @@ export default class MoreGamePopNode extends cc.Component {
             return
         }
 
-        // EffectNode.instance.PlayTip('红包币+300')
         this.cool = true
 
-        // UiM.Instance.offPanel(PANEL_NAME.MoreGamePopNode, false, () => {
+        if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
+            gData.moreGame.createNewTask(this.data)
+        }
+    }
+
+    onClosePanel() {
+        // EffectNode.instance.PlayTip('红包币+300')
         //     GameM.commonData.updateRedMoney(300, RecordTYPE.online)
 
         //     GameM.audioM.playEffect(AUDIO_TYPE.getGold, false)
         //     EffectNode.instance.PlayCoinAnim(1, 20, cc.v2(0, -300));
-        // })
-
-        if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
-            gData.moreGame.createNewTask(this.data)
-        }
     }
 }

assets/script/game/module/module/moreGame/MoreNormalGameItem.ts

@@ -38,7 +38,7 @@ export default class MoreNormalGameItem extends cc.Component {
      */
     public async setItemData(bData) {
         this.data = bData.item_data;
-        if (cc.sys.os == cc.sys.OS_ANDROID) {
+        if (cc.sys.os != cc.sys.OS_WINDOWS) {
             cc.loader.load(this.data.icon, (err, res) => {
                 if (err) {
                     console.log('err:', err);

assets/script/mk/data/Data.ts

@@ -4,9 +4,16 @@
  */
 export class Data {
     
+    /** 网络配置，登录后就有 */
+    public config:any;
+
     /** 视频广告后的奖励数据 */
     public adData:any;
 
+    public init(){
+        
+    }
+
     public setAdData(data){
         this.adData = data;
     }