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

.gitignore

@@ -14,3 +14,4 @@ local
 /assets/scene/TestScene.ts
 /assets/scene/TestScene.ts.meta
 /assets/scene/TestScene.fire
+assets

assets/resources/game/prefab/cast.prefab

@@ -0,0 +1,669 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "cast",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_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": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        1134,
+        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.Node",
+    "_name": "bg",
+    "_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": 501,
+      "height": 38
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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__": "e7f21add-0901-45f9-ba08-7bef0c31b0bb"
+    },
+    "_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__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "1b2O751KFIBZ0ayrs2h7yC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "laba",
+    "_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": 33,
+      "height": 27
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -205,
+        0,
+        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": {
+      "__uuid__": "03225c46-195c-49ac-b8a1-4b68fee5b4a9"
+    },
+    "_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__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "1c+8p0GVpEvY3FxkKmFj+u",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "遮罩",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_active": true,
+    "_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": 500,
+      "height": 38
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.Node",
+    "_name": "New RichText",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 10
+      }
+    ],
+    "_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": 378.22,
+      "height": 37.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 378.22,
+      "height": 37.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -189.11,
+        -18.9,
+        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,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "留的住我不要成功提现了100元",
+    "_N$string": "留的住我不要成功提现了100元",
+    "_fontSize": 28,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "a5eNDoiDRH6YQ+jCK+u83A",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": false,
+    "_N$string": "<color=#00ff00>留的住我不要成功提现了100元</color>",
+    "_N$horizontalAlign": 0,
+    "_N$fontSize": 28,
+    "_N$font": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 0,
+    "_N$lineHeight": 30,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "a5dp48E/lMub10M1D7hZSF",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_spriteFrame": null,
+    "_type": 0,
+    "_segments": 64,
+    "_N$alphaThreshold": 0.1,
+    "_N$inverted": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "05zX+VfzxDP7t6g4+G/VZ1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": 200,
+    "_bottom": 0,
+    "_verticalCenter": 200,
+    "_horizontalCenter": 200,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "289ef0dnVFATL0DOb4NWYwm",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "rich_text": {
+      "__id__": 13
+    },
+    "display_time": 5,
+    "move_speed": 3,
+    "wait_time": 10,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/cast.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "43c489d3-8e64-48bd-aa3b-abddeb2d3dca",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/game/prefab/redbagitem.prefab

@@ -413,7 +413,7 @@
       "__id__": 1
     },
     "_enabled": true,
-    "panel_name": "module/reward/reward",
+    "panel_name": "module/reward/rewardLuck",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [],

assets/resources/module/redeem/RedeemNode.prefab

@@ -700,7 +700,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "txt",
+    "_name": "titileTxt",
     "_objFlags": 0,
     "_parent": {
       "__id__": 15
@@ -4399,7 +4399,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "tipBtn",
+    "_name": "tipName",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -4894,7 +4894,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "tipBtn",
+    "_name": "tipBag",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2

assets/resources/module/reward/reward.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 119
       },
       {
-        "__id__": 122
+        "__id__": 120
       },
       {
-        "__id__": 123
+        "__id__": 121
       },
       {
-        "__id__": 124
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 123
     },
     "_opacity": 255,
     "_color": {
@@ -101,17 +101,17 @@
         "__id__": 35
       },
       {
-        "__id__": 102
+        "__id__": 100
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 119
+        "__id__": 117
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 118
     },
     "_opacity": 255,
     "_color": {
@@ -1338,17 +1338,17 @@
         "__id__": 75
       },
       {
-        "__id__": 93
+        "__id__": 91
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 100
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -2644,7 +2644,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "背景",
+    "_name": "幸运盖子",
     "_objFlags": 0,
     "_parent": {
       "__id__": 67
@@ -2722,7 +2722,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "2656930f-e43a-4b90-8851-a2d73f503477"
+      "__uuid__": "565ece1e-8fa1-4afa-a106-8d0309447708"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -2746,7 +2746,7 @@
     "asset": {
       "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
     },
-    "fileId": "41TZ+HoCtPlL/wYBfxmqk2",
+    "fileId": "5etDwhMEtNNJo9GIJqYC4G",
     "sync": false
   },
   {
@@ -2778,13 +2778,13 @@
         "__id__": 82
       },
       {
-        "__id__": 87
+        "__id__": 86
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 92
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -2952,7 +2952,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "背景",
+    "_name": "通关盖子",
     "_objFlags": 0,
     "_parent": {
       "__id__": 75
@@ -3030,7 +3030,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "565ece1e-8fa1-4afa-a106-8d0309447708"
+      "__uuid__": "2656930f-e43a-4b90-8851-a2d73f503477"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -3054,7 +3054,7 @@
     "asset": {
       "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
     },
-    "fileId": "4bLhmIh/BCOJaAWq7rQcRt",
+    "fileId": "7fm2Wve9JFH4spJ+FP6dj5",
     "sync": false
   },
   {
@@ -3072,13 +3072,10 @@
       },
       {
         "__id__": 84
-      },
-      {
-        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 85
     },
     "_opacity": 255,
     "_color": {
@@ -3160,74 +3157,6 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 3,
-    "transition": 3,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "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__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
@@ -3238,7 +3167,7 @@
     "node_panel": {
       "__id__": 1
     },
-    "transition_type": 0,
+    "transition_type": 3,
     "onComplete": [],
     "_id": ""
   },
@@ -3264,17 +3193,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 88
-      },
-      {
-        "__id__": 89
+        "__id__": 87
       },
       {
-        "__id__": 90
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 89
     },
     "_opacity": 255,
     "_color": {
@@ -3328,7 +3254,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 87
+      "__id__": 86
     },
     "_enabled": true,
     "_materials": [
@@ -3356,87 +3282,17 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 87
-    },
-    "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 3,
-    "transition": 3,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "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": {
-      "__id__": 1
-    },
-    "_id": ""
-  },
-  {
     "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 87
+      "__id__": 86
     },
     "_enabled": true,
     "node_panel": {
       "__id__": 1
     },
-    "transition_type": 0,
+    "transition_type": 3,
     "onComplete": [],
     "_id": ""
   },
@@ -3471,17 +3327,17 @@
     },
     "_children": [
       {
-        "__id__": 94
+        "__id__": 92
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 99
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -3535,17 +3391,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 93
+      "__id__": 91
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3599,7 +3455,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 94
+      "__id__": 92
     },
     "_enabled": true,
     "_materials": [
@@ -3652,7 +3508,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 93
+      "__id__": 91
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3661,7 +3517,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 98
+        "__id__": 96
       }
     ],
     "_N$interactable": true,
@@ -3779,25 +3635,25 @@
     },
     "_children": [
       {
-        "__id__": 103
+        "__id__": 101
       },
       {
-        "__id__": 106
+        "__id__": 104
       },
       {
-        "__id__": 109
+        "__id__": 107
       },
       {
-        "__id__": 112
+        "__id__": 110
       },
       {
-        "__id__": 115
+        "__id__": 113
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 118
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -3851,17 +3707,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 103
     },
     "_opacity": 255,
     "_color": {
@@ -3915,7 +3771,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 103
+      "__id__": 101
     },
     "_enabled": true,
     "_materials": [
@@ -3958,17 +3814,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 107
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -4022,7 +3878,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 106
+      "__id__": 104
     },
     "_enabled": true,
     "_materials": [
@@ -4065,17 +3921,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 110
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 111
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -4129,7 +3985,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 109
+      "__id__": 107
     },
     "_enabled": true,
     "_materials": [
@@ -4172,17 +4028,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 113
+        "__id__": 111
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 112
     },
     "_opacity": 255,
     "_color": {
@@ -4236,7 +4092,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 112
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [
@@ -4279,17 +4135,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 100
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 117
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -4343,7 +4199,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 115
+      "__id__": 113
     },
     "_enabled": true,
     "_materials": [
@@ -4465,6 +4321,7 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lid_type": 0,
     "node_luck": {
       "__id__": 67
     },
@@ -4472,10 +4329,10 @@
       "__id__": 75
     },
     "anim_open_redbag": {
-      "__id__": 100
+      "__id__": 98
     },
     "btn_watch_video": {
-      "__id__": 97
+      "__id__": 95
     },
     "node_redBag": {
       "__id__": 43

assets/script/before.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "8a05eef2-bb3d-420c-9b10-315b47fd78c1",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/script/game/component/tween/FlyNode.ts

@@ -80,14 +80,14 @@ export default class FlyNode extends cc.Component {
             node_item.parent = this.node_fly;
             node_item.setPosition(start_pos);
             // // 创建位置
-            node_item.angle = this.Range(-45, 45, true);
-            let new_scale = this.Range(item_scale[0], item_scale[1], false);
+            node_item.angle = this.range(-45, 45, true);
+            let new_scale = this.range(item_scale[0], item_scale[1], false);
             node_item.scale = new_scale;
             // 偏移位置计算-新
-            let dir = cc.v2(this.Range(-1, 1, false), this.Range(-1, 1, false));
+            let dir = cc.v2(this.range(-1, 1, false), this.range(-1, 1, false));
             dir = dir.normalize();
-            let deltaInit = cc.v2(this.Range(10, 80, false) * dir.x, this.Range(10, 80, false) * dir.y);
-            let initPos = start_pos.add(deltaInit); Range
+            let deltaInit = cc.v2(this.range(10, 80, false) * dir.x, this.range(10, 80, false) * dir.y);
+            let initPos = start_pos.add(deltaInit);
             // node_item.setPosition(initPos);
 
             // 纹理
@@ -104,7 +104,7 @@ export default class FlyNode extends cc.Component {
      * @param initPos 
      */
     private movePos(node_item, initPos) {
-        let new_start_move_time = this.Range(0.3, 1, false);
+        let new_start_move_time = this.range(0.3, 1, false);
         //this.start_move_time
         let start_pos = cc.tween().to(new_start_move_time, { position: new cc.Vec2(initPos) }, { easing: 'sineOut' });
         let dt1 = cc.tween().delay(this.start_move_time * 1.5);
@@ -130,7 +130,7 @@ export default class FlyNode extends cc.Component {
      * @param isInt 
      * @returns 
      */
-    private Range(min: number, max: number, isInt: boolean = true): number {
+    private range(min: number, max: number, isInt: boolean = true): number {
         //return min + Math.ceil(Math.random() * 1000) % (max - min);         //不包含最大值
         let del: number = max - min;
         if (del > 0) {

assets/script/game/component/tween/TweenCast.ts

@@ -0,0 +1,63 @@
+
+const { ccclass, property } = cc._decorator;
+/**
+ * 世界公告 滚动播放
+ * @author 邹勇
+ */
+@ccclass
+export default class TweenCast extends cc.Component {
+    @property({ type: cc.RichText, displayName: "公告内容" })
+    private rich_text: cc.RichText = null;
+    @property({ displayName: "显示时间" })
+    private display_time: number = 5;
+    @property({ displayName: "进出速度" })
+    private move_speed: number = 3;
+    @property({ displayName: "等待时间" })
+    private wait_time: number = 10;
+
+    private names: string[] = ["拒绝寂寞", "孽緣", "祗為与妳相爱", "羙男", "浅蓝", "腊笔小东", "卡布奇诺", "苊狠幸福", "埋葬回忆", "早已该放手", "白兎",
+        "豿疍疍", "宿命", "渗透的葬礼", "全都是虚假", "俄侑伱-直", "隱裑", "你不配我", "非主流网名", "剧终", "如果沵走了", "續雪", "默默然", "大白痴", "衮开",
+        "越长大越不安", "寶疍疍", "爱笑的眼睛", "暧昧", "午夜", "我继续坚强", "冷温柔", "蹲在脚落", "喲妞你赞", "满足沵", "泪流", "听风在唱歌", "假装", "海岸线丶",
+        "流年换ノ", "细数惭愧", "寂寞别说爱╮", "疯男人", "Darling", "伤狠痛", "留的住我不要", "静静的思念", "涐愿化作飞蛾", "欲", "提苏米拉", "夜凄凉",
+        "一种矜持", "哼，涐呸", "贪婪", "一败涂地", "美如此多娇", "暧昧已落幕", "地平线"];
+    private moneys: number[] = [0.5, 0.8, 1.0, 2, 5, 10, 20, 100];
+    private weights: number[] = [40, 20, 10, 10, 10, 5, 3, 2];
+    /**
+     * 随机生成一个世界公告
+     */
+    private getContent(): string {
+        let len = this.names.length;
+        let i = Math.floor(mk.math.random(0, len, false));
+        let name = this.names[i];
+        len = this.moneys.length;
+        i = mk.math.randomByWeight(this.weights, 100, false);
+        let money = this.moneys[i];
+        return `<outline color=#000000 width=1><color=#19F7FF>${name}</color>成功提现了<color=#FCE300>${money}元</color></outline>`;
+    }
+
+    onLoad() {
+        this.play();
+    }
+
+    private play() {
+        this.reset();
+        cc.tween(this.node)
+            .delay(this.wait_time)
+            .call(this.rickPlay.bind(this)).start();
+    }
+
+    private rickPlay() {
+        this.node.active = true;
+        cc.tween(this.rich_text.node)
+            .to(this.move_speed, { x: 0 })
+            .delay(this.display_time)
+            .to(this.move_speed, { x: -500 })
+            .call(this.play.bind(this)).start();
+    }
+
+    private reset() {
+        this.node.active = false;
+        this.rich_text.node.x = 500;
+        this.rich_text.string = this.getContent();
+    }
+}

assets/script/game/component/tween/TweenCast.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "289efd1d-9d51-404c-bd03-39be0d598c26",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/data/AppData.ts

@@ -13,11 +13,14 @@ export class AppData {
     public tfChannel: string = '';
 
     /** api版本 */
-    public version: string = '1.0';
+    public version: string = '1.0.0';
 
+    /** 李杨/悍国服的appId */
+    // public appId: string = 'wxcf31f0e54f7fefda';
+    /** 测试服/正式服的appId */
     public appId: string = 'wxcf31f0e54f7fefda';
 
-    public mac: string = 'c9:02:e2:1c:b2:23,f6:60:e4:1a:b7:27';
+    public mac: string = 'c9:05:e2:1c:b2:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/GData.ts

@@ -11,7 +11,6 @@ import { SignData } from "./module/SignData";
 import { FissionData } from "./module/FissionData";
 import { AdData } from "./AdData";
 import { RewardData } from "./module/RewardData";
-import MoreGameData from "./MoreGameData";
 import { Data } from "../../mk/data/Data";
 import { CashNormalData } from "./module/CashNormalData";
 import { ReceiptNoticeData } from "./module/ReceiptNoticeData";
@@ -20,6 +19,7 @@ import CashProData from "./module/CashProData";
 import { RedBagCashData } from "./module/RedBagCashData";
 import RedCodeData from "./module/RedCodeData";
 import RedeemData from "./module/RedeemData";
+import { MoreGameData } from "./module/MoreGameData";
 
 /**
  * 数据集合全局类

assets/script/game/data/GameData.ts

@@ -15,6 +15,9 @@ export class GameData {
 
 
     public configs: any = {};
+    /** 功能开启 */
+    public funOpenData:string[] = [];
+
     public gameData: PlayerInfoType;
 
     public props: Map<number, number>;
@@ -40,7 +43,7 @@ export class GameData {
             }
             return;
         }
-        this.configs = response.data;
+        this.initConfigs(response.data);
 
         data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
@@ -61,6 +64,11 @@ export class GameData {
         this.dataFinish = true;
     }
 
+    private initConfigs(data){
+        this.configs = data;
+        this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
+    }
+
     /**
      * 保存单个数据
      */

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 3;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {
@@ -25,7 +25,7 @@ export class HttpData {
 
 
 export enum ServerUrl {
-    test = 'https://tafang-test.duiweize.com/', //测试服地址
+    test = 'https://cutfruitage-test.duiweize.com/', //测试服地址
     formal = '',    //正式服地址
     liyang = 'http://172.16.15.231:9162/',  //李杨服地址
     hanguo = 'http://172.16.15.167:9162/',  //悍国服地址

assets/script/game/data/LoginData.ts

@@ -209,6 +209,8 @@ export class LoginData {
      * 本地数据不是本账户的 清空数据 重新登录游戏
      */
     public reload() {
-
+        gData.storageData.clear();
+        //调用Android的更好
+        cc.game.restart();
     }
 }

assets/script/game/data/StorageData.ts

@@ -6,6 +6,10 @@ export class StorageData {
 
     /** 本地缓存key */
     public storageKey: string = 'wewishyouamerrychristmaswithout996';
+
+    public clear(){
+        mk.storage.clear();
+    }
 }
 
 /**

assets/script/game/data/MoreGameData.ts → assets/script/game/data/module/MoreGameData.ts

@@ -4,10 +4,10 @@
  * @author kaka
  */
 
-import { Data } from "../../mk/data/Data";
-import JsbSystem from "../../mk/system/JsbSystem"
+import { Data } from "../../../mk/data/Data";
+import JsbSystem from "../../../mk/system/JsbSystem";
 
-export default class MoreGameData extends Data {
+export class MoreGameData extends Data {
     /**推荐游戏信息 */
     private _moreGameList = null
 
@@ -85,7 +85,7 @@ export default class MoreGameData extends Data {
             if (response.errcode != 0) {
                 return;
             }
-            this.moreGameList(response.data);
+            this.moreGameList = response.data;
         }
         else {
             this.init_moreGameList = true;

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

@@ -55,7 +55,20 @@ export class PigBankData extends Data {
      * 提现操作
      * - 此处需要对接服务端数据
      */
-    public cashOP() {
+    public async cashOP() {
+        let data = {};
+        let response = await mk.http.sendRequest('piggyBankCash', 'POST', JSON.stringify(data));
+        // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+        if (response.errcode != 0) {
+            return;
+        }
+
+        if (response.CashMode == 0) {//星云打款
+
+        }
+        else if (response.CashMode == 1) {//公众号打款
+
+        }
         this.cash_enable = false;
     }
 }

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

@@ -9,9 +9,14 @@ export default class RedeemData extends Data {
     init_redeemData = false;
     _redeemData: any = null;
 
+    init_btnChange = false;
+    showBtn = true;
+
     set redeemData(value) {
         this._redeemData = value;
         this.init_redeemData = true;
+        this.showBtn = this.redeemData.code == 1;
+        this.init_btnChange = true;
     }
 
     get redeemData() {
@@ -31,8 +36,6 @@ export default class RedeemData extends Data {
             return;
         }
 
-        this.redeemData = response.data;
-
         return response;
     }
 

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

@@ -7,43 +7,17 @@ import { Data } from "../../../mk/data/Data";
 export class RewardData extends Data {
     /** 
      * 标志位 
-     * - 初始化红包封面样式
-    */
-    public init_luck_style: boolean = false;
-
-    /** 默认幸运红包 */
-    private _lid_type: LidType = LidType.none;
-    /** 是幸运红包 不是通关红包 */
-    set lid_type(value: LidType) {
-        this._lid_type = value;
-        this.init_luck_style = true;
-    }
-    get lid_type(): LidType {
-        return this._lid_type;
-    }
-
-    /** 奖励列表 */
-    data: Array<any> = [];
-    /** 
-     * 标志位 
      * - 初始化提现样式
     */
     public init_cash_style: boolean = true;
 
-    /** 
-     * 盖子类型
-     * - 外部赋值 lid_type 时，使用此变量赋值
-     */
-    public type_lid: typeof LidType = LidType
-}
-/**
- * 盖子类型
- */
-enum LidType {
-    /** 无盖子 */
-    none = 0,
-    /** 幸运红包盖子 */
-    luck = 1,
-    /** 通关红包盖子 */
-    mission = 2
+    private _data: Array<any> = [];
+    /** 奖励列表 */
+    set data(value: Array<any>) {
+        this._data = value;
+        this.init_cash_style = true;
+    }
+    get data(): Array<any> {
+        return this._data;
+    }
 }

assets/script/game/game/FunBtns.ts

@@ -1,18 +1,25 @@
+import { Fun } from "../data/GData";
 
 const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class FunBtns extends cc.Component {
-    @property({ type: cc.Node, displayName: "存钱罐" })
+    @property({ type: cc.Node, displayName: "互推" })
     btn1: cc.Node = null;
     @property({ type: cc.Node, displayName: "转盘" })
     btn2: cc.Node = null;
-    @property({ type: cc.Node, displayName: "签到" })
+    @property({ type: cc.Node, displayName: "裂变" })
     btn3: cc.Node = null;
-    @property({ type: cc.Node, displayName: "提现" })
+    @property({ type: cc.Node, displayName: "存钱罐" })
     btn4: cc.Node = null;
-    @property({ type: cc.Node, displayName: "互推" })
+    @property({ type: cc.Node, displayName: "福袋" })
     btn5: cc.Node = null;
+    @property({ type: cc.Node, displayName: "签到" })
+    btn6: cc.Node = null;
+    @property({ type: cc.Node, displayName: "常规提现" })
+    btn7: cc.Node = null;
+    @property({ type: cc.Node, displayName: "福利礼包" })
+    btn_redeem: cc.Node = null;
 
     onLoad() {
 
@@ -24,12 +31,22 @@ export default class FunBtns extends cc.Component {
     }
 
     init() {
-        // data功能开启
-        let data = [1, 1, 1, 1, 1];
+        let data = gData.gameData.funOpenData;
         for (let i = 0; i < data.length; i++) {
-            if (data[i] == 0) {
-                this['btn' + (i + 1)].active = data[i] == 1;
-            }
+            this['btn' + (i + 1)].active = data[i] == "1";
+        }
+        this.updateRedeem();
+    }
+
+    private updateRedeem() {
+        this.btn_redeem.active = gData.redeem.showBtn;
+    }
+
+
+    update() {
+        if (gData.redeem.init_btnChange) {
+            this.updateRedeem();
+            gData.redeem.init_btnChange = false;
         }
     }
 }

assets/script/game/game/Game.ts

@@ -26,8 +26,6 @@ export default class Game extends cc.Component {
     btn_getRed3: cc.Node = null;
     @property({ type: cc.Button, displayName: "开始游戏" })
     btn_start: cc.Button = null;
-    @property({ type: cc.RichText, displayName: "公告" })
-    rich_cast: cc.RichText = null;
 
     onLoad() {
         mk.ui.closePanel("login");
@@ -37,6 +35,7 @@ export default class Game extends cc.Component {
         this.initMusic();
         this.initBtns();
         this.initQiPaos();
+        this.initInfo();
     }
 
     private initMusic() {
@@ -57,14 +56,15 @@ export default class Game extends cc.Component {
         cc.tween(this.btn_getRed3).delay(0.6).to(2, { y: -50 }).to(2, { y: -150 }).union().repeatForever().start();
     }
 
+    private initInfo() {
+        this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
+        this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+    }
+
     //测试道具获取效果
     private testFly() {
         mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));
         // mk.fly.PlayCoinAnim(2, 20, cc.v2(0, -300), 'Canvas/界面层/game/功能按钮/右侧按钮/btn2');
     }
-
-    update() {
-
-    }
 }
 

assets/script/game/module/module/blessingBag/BlessingBag.ts → assets/script/game/module/blessingBag/BlessingBag.ts

@@ -3,8 +3,8 @@
  * @author kaka
  */
 
-import { AdFun } from "../../../data/AdData";
-import { cashProType } from "../../../data/module/CashProData";
+import { AdFun } from "../../data/AdData";
+import { cashProType } from "../../data/module/CashProData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -80,7 +80,9 @@ export default class BlessingBag extends cc.Component {
 
     onEnable() {
         this.isPlayAni = false;
-        this.isPlayInitAni = true;
+        this.isPlayInitAni = false;
+        gData.blessingBag.isPlayAniUpdate = false;
+        gData.blessingBag.init_videoRbData = true;
     }
 
     // onDisable() {
@@ -184,6 +186,7 @@ export default class BlessingBag extends cc.Component {
         }
 
         this.isPlayInitAni = false;
+        gData.blessingBag.isPlayAniUpdate = false;
     }
 
     private isPlayAni = false;

assets/script/game/module/module/cashNormal/CashNormalItem.ts → assets/script/game/module/cashNormal/CashNormalItem.ts

@@ -1,4 +1,4 @@
-import { TCashList } from "../../../data/module/CashNormalData";
+import { TCashList } from "../../data/module/CashNormalData";
 
 const { ccclass, property } = cc._decorator;
 /**

assets/script/game/module/module.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "44d4b414-9934-4531-99cd-c0259f97704a",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/script/game/module/module/moreGame/MoreGameNormalItem.ts → assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -2,7 +2,7 @@
  * @description 互推界面常规item
  * @author kaka
  */
-import JsbSystem from "../../../../mk/system/JsbSystem";
+import JsbSystem from "../../../mk/system/JsbSystem";
 
 
 const { ccclass, property } = cc._decorator;

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

@@ -2,7 +2,7 @@
  * @description 互推banner 单个item
  * @author kaka
  */
-import JsbSystem from "../../../../mk/system/JsbSystem";
+import JsbSystem from "../../../mk/system/JsbSystem";
 
 const { ccclass, property } = cc._decorator;
 

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

@@ -3,7 +3,7 @@
  * @author kaka
  */
 
-import JsbSystem from "../../../../mk/system/JsbSystem";
+import JsbSystem from "../../../mk/system/JsbSystem";
 
 
 const { ccclass, property } = cc._decorator;

assets/script/game/module/module/redBagCash/RedBagCash.ts → assets/script/game/module/redBagCash/RedBagCash.ts

@@ -1,4 +1,4 @@
-import TableView from "../../../component/TableView";
+import TableView from "../../component/TableView";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -17,7 +17,7 @@ export default class RedBagCash extends cc.Component {
 
     private tableview: TableView = null;
     onLoad() {
-        gData.gameData.gameData.redMoney = 10200;// 测试数据，数据正确后请删除
+        // gData.gameData.gameData.redMoney = 10200;// 测试数据，数据正确后请删除
         this.tableview = this.sroll_view.getComponent('TableView');
     }
 

assets/script/game/module/module/redBagCash/RedBagCashItem.ts → assets/script/game/module/redBagCash/RedBagCashItem.ts

@@ -1,4 +1,4 @@
-import { CDataType } from "../../../data/module/RedBagCashData";
+import { CDataType } from "../../data/module/RedBagCashData";
 
 const { ccclass, property } = cc._decorator;
 /**

assets/script/game/module/module/redBagCode/RedBagCodeItem.ts → assets/script/game/module/redBagCode/RedBagCodeItem.ts

@@ -1,5 +1,5 @@
-import JsbSystem from "../../../../mk/system/JsbSystem";
-import { TCashList } from "../../../data/module/CashNormalData";
+import JsbSystem from "../../../mk/system/JsbSystem";
+import { TCashList } from "../../data/module/CashNormalData";
 
 const { ccclass, property } = cc._decorator;
 /**

assets/script/game/module/module/reward/Reward.ts → assets/script/game/module/reward/Reward.ts

@@ -1,14 +1,28 @@
-import { AdFun } from "../../../data/AdData";
-import { RewardType } from "../../../data/GameData";
+import { AdFun } from "../../data/AdData";
+import { RewardType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 /**
+ * 盖子类型
+ */
+enum LidType {
+    /** 无盖子 */
+    none = 0,
+    /** 幸运红包盖子 */
+    luck = 1,
+    /** 通关红包盖子 */
+    mission = 2
+}
+/**
  * 获取奖励界面-红包
  * @author 薛鸿潇
  */
 @ccclass
 export default class Reward extends cc.Component {
 
+
+    @property({ displayName: '红包类型', type: cc.Enum(LidType), tooltip: 'none无类型，luck幸运红包，mission通关红包' })
+    private lid_type: LidType = LidType.none;
     @property({ displayName: '幸运红包', type: cc.Node })
     private node_luck: cc.Node = null;
     @property({ displayName: '通关红包', type: cc.Node })
@@ -44,11 +58,6 @@ export default class Reward extends cc.Component {
     }
 
     update(dt) {
-        if (gData.reward.init_luck_style) {
-            gData.reward.init_luck_style = null;
-            this.initLid();
-            return;
-        }
         if (gData.reward.init_cash_style) {
             gData.reward.init_cash_style = null;
             this.initCashOutStyle();
@@ -66,18 +75,21 @@ export default class Reward extends cc.Component {
      * 初始化封面样式
      */
     private initLid() {
-        if (gData.reward.lid_type === gData.reward.type_lid.none) {// 无盖子样式
+        if (this.lid_type === LidType.none) {// 无盖子样式
             this.node_luck.active = false;
             this.node_mission.active = false;
+            this.btn_watch_video.node.active = false;
             this.watchVideoCall();
             mk.audio.playEffect("rewardOpen");
-        } else if (gData.reward.lid_type === gData.reward.type_lid.luck) {
-            this.node_luck.active = false;
-            this.node_mission.active = true;
+        } else if (this.lid_type === LidType.luck) {
+            this.node_luck.active = true;
+            this.node_mission.active = false;
+            this.btn_watch_video.node.active = true;
             mk.audio.playEffect("reward");
-        } else if (gData.reward.lid_type === gData.reward.type_lid.mission) {
+        } else if (this.lid_type === LidType.mission) {
             this.node_luck.active = false;
             this.node_mission.active = true;
+            this.btn_watch_video.node.active = true;
             mk.audio.playEffect("reward");
         }
     }
@@ -86,9 +98,10 @@ export default class Reward extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle() {
-        const cash_bar = gData.redBagCash.cash_bar
-        let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar)
-        
+        const cash_bar = gData.redBagCash.cash_bar;
+        let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
+        if (!cash_data) return;
+
         this.lbl_cash.string = cash_data.money + '元';
         this.lbl_cash_out.string = gData.gameData.gameData.redMoney + '/' + cash_data.type_value;
         this.spr_cash_out.fillRange = gData.gameData.gameData.redMoney / cash_data.type_value;
@@ -99,7 +112,7 @@ export default class Reward extends cc.Component {
      */
     private clickWatchVideo() {
         cc.log('看广告请求');
-        if (gData.reward.data[0].rewardType === 1) {
+        if (gData.reward.data[0] && gData.reward.data[0].rewardType === 1) {
             gData.adData.watchVideo(AdFun.settlement)// 关卡结算视频
         } else {
             gData.adData.watchVideo(AdFun.bubble);// 气泡视频
@@ -165,7 +178,7 @@ export default class Reward extends cc.Component {
 
     }
 
-    onDestroy(){
+    onDestroy() {
         mk.audio.playEffect("rewardClose");
     }
 

assets/script/game/module/module/setting/Setting.ts → assets/script/game/module/setting/Setting.ts

@@ -1,4 +1,4 @@
-import JsbSystem from "../../../../mk/system/JsbSystem";
+import JsbSystem from "../../../mk/system/JsbSystem";
 import Rule from "./Rule";
 
 

assets/script/game/module/module/sign/Sign.ts → assets/script/game/module/sign/Sign.ts

@@ -1,6 +1,5 @@
-import TableView from "../../../component/TableView";
-import { AdFun } from "../../../data/AdData";
-import { GameProp, RewardState } from "../../../data/GameData";
+import TableView from "../../component/TableView";
+import { AdFun } from "../../data/AdData";
 
 /**
  * 签到界面

assets/script/game/module/module/sign/SignIconItem.ts → assets/script/game/module/sign/SignIconItem.ts

@@ -1,5 +1,5 @@
-import { RewardState, RewardType } from "../../../data/GameData";
-import { CSignType } from "../../../data/module/SignData";
+import { RewardState, RewardType } from "../../data/GameData";
+import { CSignType } from "../../data/module/SignData";
 
 const { ccclass, property } = cc._decorator;
 /**

assets/script/game/module/module/turntable/Turnable.ts → assets/script/game/module/turntable/Turnable.ts

@@ -1,5 +1,5 @@
-import BtnClosePanel from "../../../component/BtnClosePanel";
-import { AdFun } from "../../../data/AdData";
+import BtnClosePanel from "../../component/BtnClosePanel";
+import { AdFun } from "../../data/AdData";
 import TurnableItem from "./TurnableItem";
 
 const { ccclass, property } = cc._decorator;
@@ -20,7 +20,7 @@ export default class Turnable extends cc.Component {
     @property(cc.RichText)
     lbl_left: cc.RichText = null;
 
-    private audioId:number;
+    private audioId: number;
 
     onLoad() {
         this.initData();
@@ -43,7 +43,12 @@ export default class Turnable extends cc.Component {
     /** 点击抽奖 */
     clickDraw() {
         if (gData.turnable.leftTimes > 0) {
-            gData.adData.watchVideo(AdFun.turntable);
+            mk.ad.watchAd((success: boolean) => {
+                mk.console.log("watchAD:" + success);
+                if (success) {
+                    gData.adData.watchVideo(AdFun.turntable);
+                }
+            });
         }
     }