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

assets/resources/game/prefab/nodeRedPoint.prefab

@@ -0,0 +1,141 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "nodeRedPoint",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 25,
+      "height": 25
+    },
+    "_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__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f57ce631-4ef4-46a2-88ea-8d1ac1c03b76"
+    },
+    "_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__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f88b1639-f17d-4814-85b9-a3d3220bb997"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/nodeRedPoint.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "f88b1639-f17d-4814-85b9-a3d3220bb997",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/game/texture/main/default_radio_button_off.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "e965e12a-5549-461a-b545-ae931736dd65",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "default_radio_button_off": {
+      "ver": "1.0.4",
+      "uuid": "c66d31a0-72c4-4f57-a80a-fdbb65f657cc",
+      "rawTextureUuid": "e965e12a-5549-461a-b545-ae931736dd65",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 3,
+      "trimY": 3,
+      "width": 26,
+      "height": 26,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/main/hongdian.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "97362c6b-d150-4ca6-abf1-ff5eb838d0d0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 25,
+  "height": 25,
+  "platformSettings": {},
+  "subMetas": {
+    "hongdian": {
+      "ver": "1.0.4",
+      "uuid": "f57ce631-4ef4-46a2-88ea-8d1ac1c03b76",
+      "rawTextureUuid": "97362c6b-d150-4ca6-abf1-ff5eb838d0d0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 25,
+      "height": 25,
+      "rawWidth": 25,
+      "rawHeight": 25,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/cashNormal/cashNormal.prefab

@@ -1568,7 +1568,7 @@
     "_enabled": true,
     "alignMode": 1,
     "_target": {
-      "__id__": 1
+      "__id__": 2
     },
     "_alignFlags": 5,
     "_left": 0,

assets/resources/module/guide/guide.prefab

@@ -180,7 +180,7 @@
     "_prefab": {
       "__id__": 7
     },
-    "_opacity": 120,
+    "_opacity": 180,
     "_color": {
       "__type__": "cc.Color",
       "r": 0,
@@ -324,8 +324,8 @@
     ],
     "_spriteFrame": null,
     "_type": 0,
-    "_segments": 64,
-    "_N$alphaThreshold": 0.1,
+    "_segments": 3100,
+    "_N$alphaThreshold": 0,
     "_N$inverted": true,
     "_id": ""
   },
@@ -1164,7 +1164,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "dbN3oWWehNqovhIw60cRq1",
+    "fileId": "5aaltp/CNENrilqsipfFxS",
     "sync": false
   },
   {

assets/resources/module/guideWeak/GuideWeak.prefab

@@ -29,7 +29,7 @@
     "_prefab": {
       "__id__": 4
     },
-    "_opacity": 255,
+    "_opacity": 180,
     "_color": {
       "__type__": "cc.Color",
       "r": 255,

assets/resources/module/hotUpdate.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "27ca9321-290b-4769-b0e6-bd95cdf80996",
+  "uuid": "5e7a810b-d23b-485e-878a-4941e40c13f3",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/module/hotUpdate/perfab.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "e45f4d0f-7aa3-4f6e-a64f-6b9bcde71855",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/agreementTip/agreementTip.prefab → assets/resources/module/login/agreementTip.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 56
       },
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -107,20 +107,17 @@
         "__id__": 36
       },
       {
-        "__id__": 39
-      },
-      {
         "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -196,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 671,
-      "height": 422
+      "width": 630,
+      "height": 608
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -249,7 +246,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "429a1d4b-5117-4390-af51-840edb26f400"
+      "__uuid__": "00220b88-1f47-4efe-b465-ebd263bb4e31"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -316,7 +313,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        277.38800000000003,
+        356,
         0,
         0,
         0,
@@ -474,14 +471,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 630,
+      "width": 550,
       "height": 130.39999999999998
     },
     "_anchorPoint": {
@@ -493,8 +490,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.203,
-        -33.31,
+        0,
+        -33.195,
         0,
         0,
         0,
@@ -612,7 +609,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -153.761,
+        -178,
         0,
         0,
         0,
@@ -745,6 +742,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -795,9 +793,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
@@ -992,6 +990,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -1085,14 +1084,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 630,
+      "width": 550,
       "height": 90.39999999999999
     },
     "_anchorPoint": {
@@ -1104,8 +1103,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.203,
-        -193.633,
+        0,
+        -240,
         0,
         0,
         0,
@@ -1186,7 +1185,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "line",
+    "_name": "fenge",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -1201,18 +1200,18 @@
     "_prefab": {
       "__id__": 35
     },
-    "_opacity": 80,
+    "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 667.38,
-      "height": 50.4
+      "width": 630,
+      "height": 1
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1224,7 +1223,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        13,
+        -84,
         0,
         0,
         0,
@@ -1249,7 +1248,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1263,22 +1262,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "______________________________",
-    "_N$string": "______________________________",
-    "_fontSize": 40,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "522750f7-15e0-4c9e-a6de-de36ba71c076"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -1289,55 +1287,58 @@
     "asset": {
       "__uuid__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
     },
-    "fileId": "04JPmIPsdO243oj5GdKa9H",
+    "fileId": "09800PjsZIfIxhYdvrqEkz",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "line",
+    "_name": "btnDisAgree",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 37
+      },
+      {
+        "__id__": 40
       }
     ],
+    "_active": true,
+    "_components": [],
     "_prefab": {
-      "__id__": 38
+      "__id__": 43
     },
-    "_opacity": 80,
+    "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 196,
+      "g": 164,
+      "b": 164,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 88.98,
-      "height": 50.4
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
+        -157.5,
+        -140,
         0,
-        -53.137,
         0,
         0,
         0,
-        0.7071067811865475,
-        0.7071067811865476,
+        1,
         1,
         1,
         1
@@ -1347,7 +1348,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 90
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1357,78 +1358,34 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 36
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "____",
-    "_N$string": "____",
-    "_fontSize": 40,
-    "_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.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
-    },
-    "fileId": "5arLCWl/ZF3ZY6D/39f6iz",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "btnDisAgree",
+    "_name": "button1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 36
     },
-    "_children": [
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
-        "__id__": 40
+        "__id__": 38
       }
     ],
-    "_active": true,
-    "_components": [],
     "_prefab": {
-      "__id__": 43
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 239,
+      "g": 243,
+      "b": 246,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 100
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1439,14 +1396,14 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -149.556,
-        -48,
+        0,
+        0,
         0,
         0,
         0,
         0,
         1,
-        1,
+        -1,
         1,
         1
       ]
@@ -1465,11 +1422,54 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 37
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "449b7886-bda3-4585-a330-1c59d7691e85"
+    },
+    "_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__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
+    },
+    "fileId": "03y8p3FClCbaTaUzM0GvOl",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
     "_name": "btnDisAgree",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
@@ -1484,9 +1484,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
@@ -1593,29 +1593,32 @@
     "_children": [
       {
         "__id__": 45
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 5,
-      "g": 149,
-      "b": 173,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 250,
-      "height": 100
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1626,8 +1629,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        158.76,
-        -48,
+        157.5,
+        -140,
         0,
         0,
         0,
@@ -1653,7 +1656,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btnAgree",
+    "_name": "button",
     "_objFlags": 0,
     "_parent": {
       "__id__": 44
@@ -1671,9 +1674,116 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 5,
-      "g": 149,
-      "b": 173,
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 315,
+      "height": 111
+    },
+    "_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__": 45
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "545c017d-33f6-443b-9531-f6613e179357"
+    },
+    "_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__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
+    },
+    "fileId": "c5KvYbSSpJMKTHAS19bV3b",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnAgree",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 44
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
@@ -1720,7 +1830,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1768,11 +1878,12 @@
     },
     "_enabled": true,
     "panel_name": "game/prefab/game",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_id": ""

assets/resources/module/login/login.prefab

@@ -278,7 +278,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        362,
+        312,
         0,
         0,
         0,
@@ -349,7 +349,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": 150,
+    "_top": 200,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,

assets/resources/module/moreGame/moreGame.prefab

@@ -27,14 +27,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 55
       },
       {
-        "__id__": 55
+        "__id__": 56
+      },
+      {
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -58,8 +61,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        375,
+        667,
         0,
         0,
         0,
@@ -218,17 +221,17 @@
         "__id__": 19
       },
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -679,17 +682,17 @@
         "__id__": 20
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -701,8 +704,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1080
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -714,7 +717,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        508.869,
+        -26.021999999999935,
         0,
         0,
         0,
@@ -757,10 +760,13 @@
     "_components": [
       {
         "__id__": 27
+      },
+      {
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -785,7 +791,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -27.344,
+        511.352,
         0,
         0,
         0,
@@ -1057,6 +1063,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": -1.3519999999999754,
+    "_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
@@ -1076,23 +1109,23 @@
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
-      },
-      {
         "__id__": 39
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1105,7 +1138,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 1021.9999999999999
+      "height": 1010
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1117,7 +1150,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -63.495000000000005,
+        470,
         0,
         0,
         0,
@@ -1146,24 +1179,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 30
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 36
       },
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1176,7 +1209,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 1021.9999999999999
+      "height": 1010
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1188,7 +1221,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -510.99999999999994,
+        -505,
         0,
         0,
         0,
@@ -1217,20 +1250,20 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 31
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1243,7 +1276,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 169.99999999999983
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1255,7 +1288,7 @@
       "ctor": "Float64Array",
       "array": [
         -365,
-        505.9999999999999,
+        500,
         0,
         0,
         0,
@@ -1284,16 +1317,16 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
+    "_alignFlags": 5,
+    "_left": 90,
+    "_right": 90,
     "_top": 5.000000000000028,
-    "_bottom": 847,
+    "_bottom": 1005,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1311,13 +1344,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 169.99999999999983
+      "height": 0
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1354,7 +1387,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_materials": [
@@ -1374,14 +1407,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
+    "_alignFlags": 5,
+    "_left": 245,
+    "_right": 245,
     "_top": 0,
     "_bottom": 0,
     "_verticalCenter": 0,
@@ -1412,7 +1445,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "horizontal": false,
@@ -1424,10 +1457,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 31
+      "__id__": 32
     },
     "content": {
-      "__id__": 31
+      "__id__": 32
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1438,7 +1471,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "pre_item": [
@@ -1461,7 +1494,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1469,8 +1502,8 @@
     "_alignFlags": 5,
     "_left": 0,
     "_right": 0,
-    "_top": 63.495000000000005,
-    "_bottom": -1085.495,
+    "_top": 70,
+    "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1504,11 +1537,11 @@
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 1,
+    "_alignFlags": 5,
     "_left": 375,
     "_right": 375,
-    "_top": 158.13099999999997,
-    "_bottom": 1175.8690000000001,
+    "_top": 153.02199999999993,
+    "_bottom": 100.97800000000007,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1541,20 +1574,20 @@
     },
     "_children": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1608,20 +1641,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 44
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 47
       },
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1675,7 +1708,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1708,7 +1741,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 46
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1746,7 +1779,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1778,7 +1811,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1868,7 +1901,7 @@
     },
     "_enabled": true,
     "node_sv": {
-      "__id__": 29
+      "__id__": 30
     },
     "moreGameNormalNode": {
       "__uuid__": "0acc5eb1-6666-4231-8d4e-796b2a1c57e9"
@@ -1876,6 +1909,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_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": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/scene/MainScene.fire

@@ -764,6 +764,9 @@
       "__id__": 2
     },
     "_enabled": true,
+    "node_guide": {
+      "__id__": 13
+    },
     "_id": "6fbJRZsUhE4p90rFOw/XX3"
   },
   {

assets/script/Main.ts

@@ -2,7 +2,10 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class Main extends cc.Component {
+    @property(cc.Node)
+    node_guide:cc.Node = null;
     start() {
         mk.ui.openPanel("module/login/login");
+        mk.guide.ui = this.node_guide;
     }
 }

assets/script/before/GamePlay.ts

@@ -174,11 +174,19 @@ export default class GamePlay extends cc.Component {
     }
 
     private clickGuide(data: string) {
-        if (data == "1_2") {//点击即可消除哦！
-            this.cellItemDic[0][1].onClick();
+        if (data == "1_3") {//点击即可消除哦！
+            this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
+            this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
         }
-        else if (data == "1_3") {//再点击一次增加大量进度哦
-            this.cellItemDic[1][0].onClick();
+        else if (data == "1_4") {//再点击一次增加大量进度哦
+            this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
+            this.cellItemDic[0][2] && this.cellItemDic[0][2].onClick();
+            this.cellItemDic[0][3] && this.cellItemDic[0][3].onClick();
+            this.cellItemDic[0][4] && this.cellItemDic[0][4].onClick();
+        }
+        else if (data == "1_6") {//再点击一次增加大量进度哦
+            this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
+            this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
         }
     }
 

assets/script/game/data/AppData.ts

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = '5e:35:e1:12:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/GameData.ts

@@ -29,6 +29,9 @@ export class GameData {
     /** 标志位：刷新主界面头像 */
     public init_head: boolean = false;
 
+    /** 标志位：刷新主界面红点 */
+    public init_red_point: boolean = true;
+
     public props: Map<number, number> = new Map<number, number>();
 
     public pools = [
@@ -251,6 +254,7 @@ class PlayerProp {
     set isSignInToday(value: number) {
         this._isSignInToday = value;
         gData.sign.init_data = true;
+        gData.gameData.init_red_point = true;
     }
     get isSignInToday(): number {
         return this._isSignInToday;
@@ -263,6 +267,7 @@ class PlayerProp {
         this._piggyBank = value;
         gData.gameData.init_coin = true;
         gData.pigbank.init_data = true;
+        gData.gameData.init_red_point = true;
     }
     get piggyBank(): number {
         return this._piggyBank;
@@ -278,6 +283,7 @@ class PlayerProp {
         if (this._isWithdrawable != value) {
             this._isWithdrawable = value;
             gData.pigbank.init_data = true;
+            gData.gameData.init_red_point = true;
         }
     }
     get isWithdrawable(): number {
@@ -301,6 +307,7 @@ class PlayerProp {
     set redMoney(value: number) {
         this._redMoney = value;
         gData.gameData.init_coin = true;
+        gData.gameData.init_red_point = true;
     }
     get redMoney(): number {
         return this._redMoney;

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

@@ -138,6 +138,13 @@ export class BlessingBagData extends Data {
         //     AdM.onSendEvent('VideoCashBig_' + response.data.UserRedMoneyInfo.preLargeAmountCashId, ' 视频红包大额提现第' + response.data.UserRedMoneyInfo.preLargeAmountCashId + '档领取成功', 'VideoCashBig');
         // }
     }
+
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        return false;
+    }
 }
 
 

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

@@ -41,7 +41,7 @@ export class GuideData {
             guide.display_rect = o.displayRect;
             guide.click_rect = o.clickRect;
             guide.finger = o.finger;
-            guide.lag_next = parseInt(o.lagNext);
+            guide.lag_next = parseFloat(o.lagNext);
             if (id != guide.id) {
                 this.data.set(id, arr);
                 arr = [];

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

@@ -16,13 +16,14 @@ export class PigBankData extends Data {
      * 数据初始化
      */
     public init() {
+        this.cash_min_limit = gData.gameData.configs.ServerConfig.PiggyBankCashMoney;
     }
 
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = true;
 
     /** 提现最低限制 */
-    public cash_min_limit: number = 0.3;
+    public cash_min_limit: number = 30;
 
     /** 
      * 提现操作
@@ -49,4 +50,12 @@ export class PigBankData extends Data {
         gData.cashNormal.getRecord();// 请求新的提现记录
 
     }
+
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        let bool = !!gData.gameData.gameData.isWithdrawable && gData.gameData.gameData.piggyBank >= this.cash_min_limit;
+        return bool;
+    }
 }

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

@@ -35,7 +35,7 @@ export class RedBagCashData extends Data {
     /** 配置表数据 */
     public c_data: Array<CDataType> = [];
 
-    private _cash_bar: number = 0;
+    private _cash_bar: number = 1;
     /** 提现进度 */
     set cash_bar(value: number) {
         this._cash_bar = value;
@@ -59,8 +59,11 @@ export class RedBagCashData extends Data {
         let response = await mk.http.sendData('cashUsual', data);
         if (response.errcode != 0) {
             mk.tip.pop(response.errmsg);
+            mk.console.logSingle('提现index', cash_index);
+            mk.console.logSingle('提现错误内容：', response);
             return;
         }
+        cc.log('红包提现成功')
         let r_data = response.data;
         if (r_data.CashMode == 0) {//星云打款
         }
@@ -90,7 +93,7 @@ export class RedBagCashData extends Data {
         const l_count = this.c_data.length;
         let index = 0;
         for (let i = 0; i < l_count; i++) {
-            if (this.c_data[index].index <= gData.redBagCash.cash_bar) {
+            if (this.c_data[index].index < gData.redBagCash.cash_bar) {
                 let item_data = this.c_data.splice(index, 1);
                 this.c_data.push(item_data[0]);
                 index--;
@@ -136,6 +139,19 @@ export class RedBagCashData extends Data {
         }
         this.init_list = true;
     }
+
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        const redbag_count = gData.gameData.gameData.redMoney;
+        const d_count = this.c_data.length;
+        for (let i = 0; i < d_count; i++) {
+            if (this.c_data[i].index < gData.redBagCash.cash_bar) continue;// 已提现
+            if (redbag_count >= this.c_data[i].type_value) return true;// 可提现
+        }
+        return false;
+    }
 }
 /** 配置表数据内容 */
 export type CDataType = {

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

@@ -52,4 +52,11 @@ export default class RedeemData extends Data {
 
         return response;
     }
+    
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        return false;
+    }
 }

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

@@ -188,6 +188,14 @@ export class SignData extends Data {
         return index;
     }
 
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        let bool = !gData.gameData.gameData.isSignInToday && this.haveSignDay();
+        return bool;
+    }
+
 }
 
 export type CSignType = {

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

@@ -48,4 +48,11 @@ export class TurnableData extends Data {
             }
         });
     }
+    
+    /**
+     * 红点功能
+     */
+    public redPoint(): boolean {
+        return false;
+    }
 }

assets/script/game/game/Game.ts

@@ -5,6 +5,22 @@ import FunBtns from "./FunBtns";
 
 const { ccclass, property } = cc._decorator;
 
+@ccclass("RedPoinNode")
+export class RedPoinNode {
+    @property({ type: cc.Node, displayName: "签到" })
+    node_sign: cc.Node = null;
+    @property({ type: cc.Node, displayName: "存钱罐" })
+    node_pigbank: cc.Node = null;
+    @property({ type: cc.Node, displayName: "红包提现" })
+    node_redbagCash: cc.Node = null;
+    @property({ type: cc.Node, displayName: "福袋" })
+    node_blessingBag: cc.Node = null;
+    @property({ type: cc.Node, displayName: "转盘" })
+    node_turnable: cc.Node = null;
+    @property({ type: cc.Node, displayName: "福利礼包" })
+    node_redeem: cc.Node = null;
+}
+
 @ccclass
 export default class Game extends cc.Component {
 
@@ -38,6 +54,8 @@ export default class Game extends cc.Component {
 
     @property({ type: cc.Node, displayName: "顶部ui组" })
     node_top_ui: cc.Node = null;
+    @property({ type: RedPoinNode, displayName: "红点组" })
+    nodeRedPoint: RedPoinNode = null;
 
 
     onLoad() {
@@ -88,6 +106,10 @@ export default class Game extends cc.Component {
         if (gData.gameData.init_head) {
             this.initHead();
         }
+
+        if (gData.gameData.init_red_point) {
+            this.initRedPoint();
+        }
     }
     lateUpdate() {
         gData.gameData.init_head = false;
@@ -143,6 +165,20 @@ export default class Game extends cc.Component {
     }
 
     /**
+     * 初始化红点
+     */
+    private initRedPoint() {
+        this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
+        this.nodeRedPoint.node_pigbank.active = gData.pigbank.redPoint();
+        this.nodeRedPoint.node_redbagCash.active = gData.redBagCash.redPoint();
+        this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
+        this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
+        this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
+
+        gData.gameData.init_red_point = false;
+    }
+
+    /**
      * 自动打开面板
      * - isAutoOpenPanel 1自动开 2不自动开 其他不处理
      */
@@ -166,7 +202,7 @@ export default class Game extends cc.Component {
     }
 
     /** */
-    public onClickStart(a,b) {
+    public onClickStart(a, b) {
         this.node_gameplay.active = true;
     }
 

assets/script/game/module/guide/Guide.ts

@@ -37,11 +37,10 @@ export default class Guide extends cc.Component {
     private widgets: string[] = ['top', 'bottom', 'left', 'right', 'verticalCenter', 'horizontalCenter'];
 
     onLoad() {
-
+        // this.initTouch();
     }
 
     start() {
-        return;
         if (gData.guideData.crtID == null) {
             this.node.destroy();
             return;
@@ -62,31 +61,41 @@ export default class Guide extends cc.Component {
             this.close();
         }
         else {
+            this.node_bg.opacity = 180;
             this.node_finger.opacity = 255;
             this.node_dialog.opacity = 255;
             this.targetNode = null;
             this.event_data = null;
+            this.ifThrough = true;
             let [x, y, w, h] = [null, null, null, null];
 
-            //点击全屏下一步，显示区域不显示，点击区域全屏
-            if (this.crtGuide.click_rect == "all") {
-                this.node_display.width = this.node_display.height = 0;
-                this.node_click.x = 0;
-                this.node_click.y = 0;
-                this.node_click.width = this.node.width;
-                this.node_click.height = this.node.height;
-            }
-            else if (this.crtGuide.click_rect.indexOf("event") != -1) {//点击区域下一步，并发送事件，显示区域读配置，点击区域=显示区域
-                this.event_data = this.crtGuide.id + "_" + this.crtStep;
-                let arr = this.crtGuide.display_rect.split(":");
-                x = parseInt(arr[0]);
-                y = parseInt(arr[1]);
-                w = parseInt(arr[2]);
-                h = parseInt(arr[3]);
-                this.node_click.x = x;
-                this.node_click.y = y;
-                this.node_click.width = w;
-                this.node_click.height = h;
+            //点击全屏下一步，显示区域不显示 || 点击区域下一步，并发送事件，显示区域读配置   
+            if (this.crtGuide.click_rect == "all" || this.crtGuide.click_rect.indexOf("event") != -1) {
+                //显示区域： display_rect为""表示全屏
+                if (this.crtGuide.display_rect.length == 0) {
+                    this.node_display.width = this.node_display.height = 0;
+                }
+                else {
+                    let arr = this.crtGuide.display_rect.split(":");
+                    x = parseInt(arr[0]);
+                    y = parseInt(arr[1]);
+                    w = parseInt(arr[2]);
+                    h = parseInt(arr[3]);
+                }
+                if (this.crtGuide.click_rect == "all") {
+                    this.node_click.x = 0;
+                    this.node_click.y = 0;
+                    this.node_click.width = this.node.width;
+                    this.node_click.height = this.node.height;
+                    this.ifThrough = false;
+                }
+                else {
+                    this.event_data = this.crtGuide.id + "_" + (this.crtStep + 1);
+                    this.node_click.x = x;
+                    this.node_click.y = y;
+                    this.node_click.width = w;
+                    this.node_click.height = h;
+                }
             }
             else {//点击按钮下一步，显示区域为配置的node，点击区域=显示区域
                 this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
@@ -107,6 +116,11 @@ export default class Guide extends cc.Component {
 
             //显示区域由大到小动画
             if (x != null && y != null && w != null && h != null) {
+                //先重置
+                this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
+                this.node_display.width = this.node.width;
+                this.node_display.height = this.node.height;
+                //动画
                 cc.tween(this.node_display)
                     .to(0.3, { x: x, y: y, width: w, height: h }, {
                         onUpdate: () => {
@@ -160,6 +174,7 @@ export default class Guide extends cc.Component {
     }
 
     async clickNodeClick() {
+        mk.audio.playEffect("button");
         cc.Tween.stopAllByTarget(this.node_display);
         console.log("clickNodeClick");
         if (this.targetNode) {
@@ -167,7 +182,7 @@ export default class Guide extends cc.Component {
         }
         if (this.event_data) {
             //event_guide data:1_2 (1_2为新手引导的id)
-            mk.event.emit("event_guide",this.event_data);
+            mk.event.emit("event_guide", this.event_data);
         }
         this.reset();
         if (this.crtGuide.lag_next > 0) {
@@ -178,9 +193,11 @@ export default class Guide extends cc.Component {
 
     /** 等待状态 透明不可点击 */
     private reset() {
-        this.node_display.width = this.node.width;
-        this.node_display.height = this.node.height;
-        this.node_bg.x = this.node_bg.y = 0;
+        this.node_display.width = 0;
+        this.node_display.height = 0;
+        this.node_bg.x = -this.node_display.x;
+        this.node_bg.y = -this.node_display.y;
+        this.node_bg.opacity = 0;
         this.node_click.width = 0
         this.node_click.height = 0;
         this.node_finger.opacity = 0;
@@ -192,4 +209,66 @@ export default class Guide extends cc.Component {
         mk.guide.close();
         this.node.destroy();
     }
+
+
+
+    ///////////////// 自定义触摸监听 /////////////////
+    private _eventManager = cc["internal"]["eventManager"];
+    private _touchListener: any;
+    private ifThrough: boolean;
+    private initTouch() {
+        const EventListener = cc["EventListener"];
+        this._touchListener = EventListener.create({
+            event: EventListener.TOUCH_ONE_BY_ONE,
+            swallowTouches: false,//是否吞噬touch事件
+            owner: this.node_click,
+            mask: null,
+            onTouchBegan: this.onTouchStart.bind(this),
+            onTouchMoved: null,
+            onTouchEnded: this.onTouchEnded.bind(this),
+            onTouchCancelled: null,
+        });
+        this._eventManager.addListener(this._touchListener, this.node_click);
+    }
+
+    private onTouchStart(touch: cc.Touch, event: cc.Event.EventTouch): boolean {
+        // cc.log("touch start");
+        //此处必须返回true（表示接触到了节点）,否则TOUCH_MOVE,TOUCH_END,TOUCH_CANCEL不触发。
+        if (this.ifThrough) {
+            const point_world_pos = touch.getLocation();
+            let localPoint = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(point_world_pos.x, point_world_pos.y));
+            // let localPoint = mk.game.localConvertWorldPointARCenter()
+            let result = this.pointInPoly(localPoint, this.node_click);
+            return result;
+        }
+        else {
+            return false;
+        }
+    }
+    /**
+    * 点是否在节点宽高范围内
+    * @param point 点击的点
+    * @param node 
+    * @returns 
+    */
+    private pointInPoly(point: cc.Vec2 | cc.Vec3, node: cc.Node) {
+        const self_node_pos = node.getPosition();
+        if (point.x >= (self_node_pos.x - (this.node_click.width / 2)) &&
+            point.x <= (self_node_pos.x + (this.node_click.width / 2)) &&
+            point.y >= (self_node_pos.y - (this.node_click.height / 2)) &&
+            point.y <= (self_node_pos.y + (this.node_click.height / 2))) {
+            return true;
+        }
+        return false;
+    }
+
+    private onTouchEnded(touch: cc.Touch, event: cc.Event.EventTouch): void {
+        // cc.log("touch end");
+        this.clickNodeClick();
+    }
+
+    protected onDestroy(): void {
+        // super.onDestroy();
+        this._eventManager.removeListener(this._touchListener, this.node_click);
+    }
 }

assets/script/game/module/guideWeak/GuideWeak.ts

@@ -61,12 +61,32 @@ export default class GuideWeak extends cc.Component {
     private onTouchStart(touch: cc.Touch, event: cc.Event.EventTouch): boolean {
         // cc.log("touch start");
         //此处必须返回true（表示接触到了节点）,否则TOUCH_MOVE,TOUCH_END,TOUCH_CANCEL不触发。
-        return true;
+        const point_world_pos = touch.getLocation();
+        let localPoint = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(point_world_pos.x, point_world_pos.y));
+        let result = this.pointInPoly(localPoint, this.node);
+        return result;
     }
     private onTouchEnded(touch: cc.Touch, event: cc.Event.EventTouch): void {
         // cc.log("touch end");
         this.onClickCall(touch);
     }
+
+    /**
+     * 点是否在节点宽高范围内
+     * @param point 点击的点
+     * @param node 
+     * @returns 
+     */
+    private pointInPoly(point: cc.Vec2 | cc.Vec3, node: cc.Node) {
+        const self_node_pos = node.getPosition();
+        if (point.x >= (self_node_pos.x - (this.node.width / 2)) &&
+            point.x <= (self_node_pos.x + (this.node.width / 2)) &&
+            point.y >= (self_node_pos.y - (this.node.height / 2)) &&
+            point.y <= (self_node_pos.y + (this.node.height / 2))) {
+            return true;
+        }
+        return false;
+    }
     protected onDestroy(): void {
         // super.onDestroy();
         this._eventManager.removeListener(this._touchListener, this.node);

assets/script/game/module/login/Login.ts

@@ -50,7 +50,7 @@ export default class Login extends cc.Component {
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
                 if (gData.gameData.isNewPlayer()) {
-                    mk.ui.openPanel("module/agreementTip/agreementTip");
+                    mk.ui.openPanel("module/login/agreementTip");
                 }
                 else {
                     mk.ui.openPanel("game/prefab/game");
@@ -84,6 +84,7 @@ export default class Login extends cc.Component {
         gData.loginData.init();
         await this.checkForceUpate();
         await this.checkHotUpdate();
+        mk.audio.init();
     }
 
     //整包更新和新流程--------------------------------------------------------

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

@@ -30,6 +30,7 @@ export default class MoreGameNormalItem extends cc.Component {
     @property(cc.Node)
     spRed: cc.Node = null;
 
+    private bData = null;
     private data = null
 
     /**
@@ -37,20 +38,23 @@ export default class MoreGameNormalItem extends cc.Component {
      * @param data item数据
      */
     public async setItemData(bData) {
-        this.data = bData.item_data;
-        if (cc.sys.os != cc.sys.OS_WINDOWS) {
-            cc.loader.load(this.data.icon, (err, res) => {
-                if (err) {
-                    console.log('err:', err);
-                    return;
-                }
-                if (cc.isValid(this.iconNode)) {
-                    let tex: cc.Texture2D = res as cc.Texture2D;
-                    this.iconNode.spriteFrame = new cc.SpriteFrame(tex);
-                }
-            })
+        if (!CC_JSB) {
+            return;
         }
 
+        this.bData = bData;
+        this.data = bData.item_data;
+        cc.loader.load(this.data.icon, (err, res) => {
+            if (err) {
+                console.log('err:', err);
+                return;
+            }
+            if (cc.isValid(this.iconNode)) {
+                let tex: cc.Texture2D = res as cc.Texture2D;
+                this.iconNode.spriteFrame = new cc.SpriteFrame(tex);
+            }
+        })
+
         this.labName.string = this.data.title
         this.labDes.string = this.data.introduction
         this.spRed.active = false
@@ -88,6 +92,11 @@ export default class MoreGameNormalItem extends cc.Component {
     cool = false
     creatorDownLoadTask() {
         mk.audio.playEffect('button');
+
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }
@@ -120,10 +129,10 @@ export default class MoreGameNormalItem extends cc.Component {
                 // LogUtil.logV("showDownloadProgress", "three")
                 this.progressLabel.string = ((info.progress / info.totalBytesReceives) * 100).toFixed(1) + "%"
             } else {
-                this.setItemData(this.data)
+                this.setItemData(this.bData)
             }
         } else {
-            this.setItemData(this.data)
+            this.setItemData(this.bData)
         }
     }
 }

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

@@ -28,43 +28,52 @@ export default class MoreGamePicItem extends cc.Component {
     cool = false
 
     init(data) {
-        this.data = data
-
-        //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);
-                }
-            })
+        if (!CC_JSB) {
+            return;
         }
 
+        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);
+            }
+        })
+
         this.spPro.node.active = false
         this.btnStart.active = false
         this.labPro.string = ''
         //打开
-        if (JsbSystem.ifCanStartGame(data.packageName, false)) {
-            this.spRed.active = false
-            this.btnStart.active = true
-        } else {
-            if (JsbSystem.isFileExist(data.nebulaAppId + ".apk")) {
-                //安装
+        if (data.appType == 1) {
+            if (JsbSystem.ifCanStartGame(data.packageName, false)) {
                 this.spRed.active = false
                 this.btnStart.active = true
             } else {
-                //下载
-                this.spRed.active = true
+                if (JsbSystem.isFileExist(data.nebulaAppId + ".apk")) {
+                    //安装
+                    this.spRed.active = false
+                    this.btnStart.active = true
+                } else {
+                    //下载
+                    this.spRed.active = true
+                }
             }
         }
+        else if (data.appType == 2) {
+            this.spRed.active = false
+            this.btnStart.active = true
+        }
     }
 
     creatorDownLoadTask() {
-        // UiM.Instance.moreGameNode.getComponent(MoreGameNode).hasClick = true
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }
@@ -74,11 +83,16 @@ export default class MoreGamePicItem extends cc.Component {
             this.cool = false
         }, 3)
 
-        let result = gData.moreGame.createNewTask(this.data)
-        if (result != null) {
-            this.schedule(() => {
-                this.showDownloadProgress()
-            }, 0.5)
+        if (this.data.appType == 1) {
+            let result = gData.moreGame.createNewTask(this.data)
+            if (result != null) {
+                this.schedule(() => {
+                    this.showDownloadProgress()
+                }, 0.5)
+            }
+        }
+        else if (this.data.appType == 2) {
+            cc.sys.openURL(this.data.recommendLink);
         }
     }
 

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

@@ -4,7 +4,6 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
-import { RewardType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -35,19 +34,20 @@ export default class MoreGamePopNode extends cc.Component {
     }
 
     init() {
+        if (!CC_JSB) {
+            return;
+        }
+
         this.data = gData.moreGame.getRandomNormal();
         if (this.data) {
-            //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);
-                })
-            }
+            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
         }
@@ -57,14 +57,23 @@ export default class MoreGamePopNode extends cc.Component {
     creatorDownLoadTask() {
         mk.audio.playEffect('button');
 
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }
 
         this.cool = true
 
-        if (cc.sys.isNative && !JsbSystem.ifCanStartGame(this.data.packageName, true)) {
-            gData.moreGame.createNewTask(this.data)
+        if (this.data.appType == 1) {
+            if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
+                gData.moreGame.createNewTask(this.data)
+            }
+        }
+        else if (this.data.appType == 2) {
+            cc.sys.openURL(this.data.recommendLink);
         }
 
         gData.moreGame.popNodeGetRedBag();

assets/script/game/module/pigBank/PigBank.ts

@@ -60,7 +60,7 @@ export default class PigBank extends cc.Component {
             if (gData.gameData.gameData.piggyBank >= gData.pigbank.cash_min_limit) {
                 this.lbl_get_desc.string = '明日可提现';
             } else {
-                this.lbl_get_desc.string = '满' + gData.pigbank.cash_min_limit + '元可提';
+                this.lbl_get_desc.string = '满' + (gData.pigbank.cash_min_limit / 100).toFixed(2) + '元可提';
             }
             this.node_tip_anim.active = true;
             this.anim_btn_cash.stop();

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

@@ -48,7 +48,7 @@ export default class RedBagCashItem extends cc.Component {
         rmb_value = rmb_value > 1 ? rmb_value : parseFloat(rmb_value.toFixed(2))
         this.lbl_rmb_value.string = rmb_value + '元';
 
-        if (this.item_data.index <= gData.redBagCash.cash_bar) {
+        if (this.item_data.index < gData.redBagCash.cash_bar) {
             // 已提现
             this.node_none.active = true;
             this.node_lock.active = false;
@@ -78,7 +78,6 @@ export default class RedBagCashItem extends cc.Component {
             return;
         }
         gData.redBagCash.cashOP();
-        cc.log('红包现成功')
     }
 
 }

assets/script/mk/system/GuideSystem.ts

@@ -1,4 +1,5 @@
 import { GameProp } from "../../game/data/GameData";
+import { OpenActionType } from "./UISystem";
 
 
 /**
@@ -7,11 +8,14 @@ import { GameProp } from "../../game/data/GameData";
 export default class GuideSystem {
 
     private crtGuideID: number;
+    public ui:cc.Node;
 
     public open(id) {
         this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
-        if(!cc.sys.isNative){
-            this.crtGuideID = 0;//测试无限新手引导
+        //测试永远新手引导，永远第一关
+        if (!cc.sys.isNative) {
+            this.crtGuideID = 0;
+            gData.gameData.setProp(GameProp.levelNum, 0);
         }
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");
@@ -23,7 +27,7 @@ export default class GuideSystem {
         }
         gData.guideData.crtID = id;
         this.crtGuideID = id;
-        mk.ui.openPanel("module/guide/guide");
+        mk.ui.openPanel("module/guide/guide",OpenActionType.normal,this.ui);
         this.setGuideID(this.crtGuideID++);
     }
 

assets/script/mk/system/UISystem.ts

@@ -33,7 +33,7 @@ export default class UISystem extends cc.Component {
      * @param panelUrl  界面名称全路径
      * @param openAction 打开之后的操(需不需要关闭其他界面)
      */
-    openPanel(panelUrl: string, openAction: OpenActionType = OpenActionType.normal): Promise<any> {
+    openPanel(panelUrl: string, openAction: OpenActionType = OpenActionType.normal, parent: cc.Node = null): Promise<any> {
         let arr = panelUrl.split("/");
         let panelName = arr[arr.length - 1];
 
@@ -63,7 +63,12 @@ export default class UISystem extends cc.Component {
                         return;
                     }
 
-                    self.panelParent.addChild(node_panel);
+                    if(parent){
+                        node_panel.parent = parent;
+                    }
+                    else{
+                        self.panelParent.addChild(node_panel);
+                    }
 
                     switch (openAction) {
                         case OpenActionType.normal:

assets/script/mk/utils/GameUtil.ts

@@ -49,4 +49,13 @@ export default class GameUtil {
         }
         return new cc.Vec2(originX, originY);
     }
+
+    /** node的坐标改为全局坐标 中间为原点 */
+    public localConvertWorldPointARCenter(node: cc.Node) {
+        let o1 = cc.view.getVisibleSize();
+        let o2 = node.convertToWorldSpaceAR(cc.v2(0, 0));
+        o2.x = o2.x - o1.width / 2;
+        o2.y = o2.y - o1.height / 2;
+        return o2;
+    }
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml

@@ -10,9 +10,9 @@
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
+            <option value="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml

@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/EasyEliminate.iml" filepath="$PROJECT_DIR$/.idea/modules/app/EasyEliminate.iml" group="proj.android-studio/EasyEliminate" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1746423203/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1746423203/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1786486690/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/1786486690/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1746423203/libcocos2dx.iml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":libcocos2dx" external.linked.project.path="D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
-  </component>
-</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/android-libcocos2dx.iml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="PROJECT_TYPE" value="1" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+  </component>
+</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -33,23 +33,170 @@
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
-    <content url="file://D:/Android/SDK/ndk/21.3.6528147/sources/android/cpufeatures">
-      <sourceFolder url="file://D:/Android/SDK/ndk/21.3.6528147/sources/android/cpufeatures" isTestSource="false" />
+    <content url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures">
+      <sourceFolder url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../Classes">
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -117,153 +264,6 @@
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
-    </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.multidex:multidex-instrumentation:2.0.0@aar" level="project" />
@@ -271,9 +271,9 @@
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-game-9.2.0+G.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/utdid4all-1.5.2.1-proguard.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
@@ -333,6 +333,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="libcocos2dx" />
+    <orderEntry type="module" module-name="android-libcocos2dx" />
   </component>
 </module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -95,6 +95,16 @@
         </provider>
         <!-- source file: china/network_sdk/baidu/AndroidManifest.xml -->
 
+        <!-- 安装apk -->
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.com.testDownLoad.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/download_path" />
+        </provider>
     </application>
     
 </manifest>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -30,12 +30,18 @@ import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.util.Log;
 
+import androidx.core.content.FileProvider;
+
+import java.io.File;
+
 public class AppActivity extends Cocos2dxActivity {
 
     @Override
@@ -217,4 +223,43 @@ public class AppActivity extends Cocos2dxActivity {
             // permissions this app might request
         }
     }
+
+
+    //安装apk相关 ----------------------------------------------------------------------------------
+    /**
+     * fileName：String apk完整路径
+     * */
+    public void installApk(String fileName){
+        Log.v("installApk","start");
+        File apk = new File(fileName);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            Uri uri = FileProvider.getUriForFile(this, getPackageName()+".com.testDownLoad.fileprovider", apk);
+            intent.setDataAndType(uri, "application/vnd.android.package-archive");
+        }else{
+            intent.setDataAndType(Uri.fromFile(apk),"application/vnd.android.package-archive");
+        }
+        try {
+            startActivity(intent);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    public boolean checkStartApp(String pkg, boolean start){
+        PackageManager packageManager = getPackageManager();
+        Intent intent=new Intent();
+        intent.setPackage(null); // 加上这句代码
+        intent =packageManager.getLaunchIntentForPackage(pkg);
+        if(intent==null){
+            return false;
+        }else{
+            if(start){
+                startActivity(intent);
+            }
+            return true;
+        }
+    }
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -128,4 +128,17 @@ public class ThirdSdkMgr {
     }
 
     //埋点相关---------------------------------------------------------------------------------------
+
+
+    //安装apk相关 ----------------------------------------------------------------------------------
+    /** 安装apk*/
+    public static void installApk(String fileName){
+        appActivity.installApk(fileName);
+    }
+
+    /** 启动apk*/
+    public static boolean isStartGame(String pkg,boolean start){
+        boolean isExist =  appActivity.checkStartApp(pkg,start);
+        return isExist;
+    }
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,9 +36,9 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-RELEASE_STORE_FILE=D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
-RELEASE_STORE_PASSWORD=123456
-RELEASE_KEY_ALIAS=debug_keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/mk_framework/keystore/eliminate.keystore
+RELEASE_STORE_PASSWORD=666888
+RELEASE_KEY_ALIAS=eliminate_1
 RELEASE_KEY_PASSWORD=123456
 
 android.injected.testOnly=false

build/jsb-link/frameworks/runtime-src/proj.android-studio/res/xml/download_path.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <paths>
+        <files-path name="files" path="." />
+        <root-path name="root_path" path="."/>
+    </paths>
+</resources>

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2104,7 +2104,7 @@ this.appId = "wxcf31f0e54f7fefda";
 this.umengChannel = "";
 this.deviceType = "";
 this.androidVersion = "";
-this.mac = "5e:35:e1:12:b3:23,f6:60:e4:1a:b7:27";
+this.mac = "1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27";
 this.machineInfo = {
 android_id: "",
 idfa: "",
@@ -2801,6 +2801,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.BlessingBagData = c;
@@ -7198,6 +7201,7 @@ this.funOpenData = [];
 this.gameData = null;
 this.init_coin = !1;
 this.init_head = !1;
+this.init_red_point = !0;
 this.props = new Map();
 this.pools = [ {
 url: "game/prefab/tips",
@@ -7410,6 +7414,7 @@ return this._isSignInToday;
 set: function(t) {
 this._isSignInToday = t;
 gData.sign.init_data = !0;
+gData.gameData.init_red_point = !0;
 },
 enumerable: !1,
 configurable: !0
@@ -7423,6 +7428,7 @@ if (this._piggyBank !== t) {
 this._piggyBank = t;
 gData.gameData.init_coin = !0;
 gData.pigbank.init_data = !0;
+gData.gameData.init_red_point = !0;
 }
 },
 enumerable: !1,
@@ -7436,6 +7442,7 @@ set: function(t) {
 if (this._isWithdrawable != t) {
 this._isWithdrawable = t;
 gData.pigbank.init_data = !0;
+gData.gameData.init_red_point = !0;
 }
 },
 enumerable: !1,
@@ -7448,6 +7455,7 @@ return this._redMoney;
 set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
+gData.gameData.init_red_point = !0;
 },
 enumerable: !1,
 configurable: !0
@@ -8524,6 +8532,12 @@ o = i;
 }
 return new cc.Vec2(e, n);
 };
+t.prototype.localConvertWorldPointARCenter = function(t) {
+var e = cc.view.getVisibleSize(), n = t.convertToWorldSpaceAR(cc.v2(0, 0));
+n.x = n.x - e.width / 2;
+n.y = n.y - e.height / 2;
+return n;
+};
 return t;
 }();
 n.default = o;
@@ -8666,7 +8680,44 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../mk/system/JsbSystem"), l = t("../component/NumberAnim"), u = t("../data/GameData"), p = t("./FunBtns"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
+n.RedPoinNode = void 0;
+var s = t("../../mk/system/JsbSystem"), l = t("../component/NumberAnim"), u = t("../data/GameData"), p = t("./FunBtns"), d = cc._decorator, h = d.ccclass, f = d.property, y = function() {
+function t() {
+this.node_sign = null;
+this.node_pigbank = null;
+this.node_redbagCash = null;
+this.node_blessingBag = null;
+this.node_turnable = null;
+this.node_redeem = null;
+}
+a([ f({
+type: cc.Node,
+displayName: "签到"
+}) ], t.prototype, "node_sign", void 0);
+a([ f({
+type: cc.Node,
+displayName: "存钱罐"
+}) ], t.prototype, "node_pigbank", void 0);
+a([ f({
+type: cc.Node,
+displayName: "红包提现"
+}) ], t.prototype, "node_redbagCash", void 0);
+a([ f({
+type: cc.Node,
+displayName: "福袋"
+}) ], t.prototype, "node_blessingBag", void 0);
+a([ f({
+type: cc.Node,
+displayName: "转盘"
+}) ], t.prototype, "node_turnable", void 0);
+a([ f({
+type: cc.Node,
+displayName: "福利礼包"
+}) ], t.prototype, "node_redeem", void 0);
+return a([ h("RedPoinNode") ], t);
+}();
+n.RedPoinNode = y;
+var g = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -8684,6 +8735,7 @@ e.btn_start = null;
 e.icon_hb = null;
 e.icon_zb = null;
 e.node_top_ui = null;
+e.nodeRedPoint = null;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -8702,6 +8754,7 @@ mk.guide.open(1);
 e.prototype.update = function() {
 gData.gameData.init_coin && this.changeInfo();
 gData.gameData.init_head && this.initHead();
+gData.gameData.init_red_point && this.initRedPoint();
 };
 e.prototype.lateUpdate = function() {
 gData.gameData.init_head = !1;
@@ -8772,6 +8825,15 @@ return [ 2 ];
 });
 });
 };
+e.prototype.initRedPoint = function() {
+this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
+this.nodeRedPoint.node_pigbank.active = gData.pigbank.redPoint();
+this.nodeRedPoint.node_redbagCash.active = gData.redBagCash.redPoint();
+this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
+this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
+this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
+gData.gameData.init_red_point = !1;
+};
 e.prototype.autoOpenPanel = function() {
 if (!gData.gameData.isNewPlayer()) {
 mk.ui.openPanel("module/pigBank/pigBank");
@@ -8846,9 +8908,13 @@ a([ f({
 type: cc.Node,
 displayName: "顶部ui组"
 }) ], e.prototype, "node_top_ui", void 0);
+a([ f({
+type: y,
+displayName: "红点组"
+}) ], e.prototype, "nodeRedPoint", void 0);
 return a([ h ], e);
 }(cc.Component);
-n.default = y;
+n.default = g;
 cc._RF.pop();
 }, {
 "../../mk/system/JsbSystem": "JsbSystem",
@@ -9306,7 +9372,7 @@ r.dialog_alignment = c.dialogAlignment;
 r.display_rect = c.displayRect;
 r.click_rect = c.clickRect;
 r.finger = c.finger;
-r.lag_next = parseInt(c.lagNext);
+r.lag_next = parseFloat(c.lagNext);
 if (o != r.id) {
 this.data.set(o, n);
 n = [];
@@ -9334,7 +9400,7 @@ cc._RF.push(e, "ccad7HVXppOw6s55udVONoH", "GuideSystem");
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var o = t("../../game/data/GameData"), i = function() {
+var o = t("../../game/data/GameData"), i = t("./UISystem"), a = function() {
 function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
@@ -9342,7 +9408,7 @@ cc.sys.isNative || (this.crtGuideID = 0);
 if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t >= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
-mk.ui.openPanel("module/guide/guide");
+mk.ui.openPanel("module/guide/guide", i.OpenActionType.normal, this.ui);
 this.setGuideID(this.crtGuideID++);
 }
 };
@@ -9358,10 +9424,11 @@ return !this.crtGuideID || 999 === this.crtGuideID;
 };
 return t;
 }();
-n.default = i;
+n.default = a;
 cc._RF.pop();
 }, {
-"../../game/data/GameData": "GameData"
+"../../game/data/GameData": "GameData",
+"./UISystem": "UISystem"
 } ],
 GuideVO: [ function(t, e, n) {
 "use strict";
@@ -9496,12 +9563,17 @@ onTouchCancelled: null
 });
 this._eventManager.addListener(this._touchListener, this.node);
 };
-e.prototype.onTouchStart = function() {
-return !0;
+e.prototype.onTouchStart = function(t) {
+var e = t.getLocation(), n = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(e.x, e.y));
+return this.pointInPoly(n, this.node);
 };
 e.prototype.onTouchEnded = function(t) {
 this.onClickCall(t);
 };
+e.prototype.pointInPoly = function(t, e) {
+var n = e.getPosition();
+return t.x >= n.x - this.node.width / 2 && t.x <= n.x + this.node.width / 2 && t.y >= n.y - this.node.height / 2 && t.y <= n.y + this.node.height / 2;
+};
 e.prototype.onDestroy = function() {
 this._eventManager.removeListener(this._touchListener, this.node);
 mk.event.remove("close-panel", this.onClosePanel, this);
@@ -9661,10 +9733,17 @@ e.node_head = null;
 e.node_person = null;
 e.rich_dialog = null;
 e.widgets = [ "top", "bottom", "left", "right", "verticalCenter", "horizontalCenter" ];
+e._eventManager = cc.internal.eventManager;
 return e;
 }
 e.prototype.onLoad = function() {};
-e.prototype.start = function() {};
+e.prototype.start = function() {
+if (null != gData.guideData.crtID) {
+this.guides = gData.guideData.getGuidesByID(gData.guideData.crtID);
+this.crtStep = -1;
+this.nextStep();
+} else this.node.destroy();
+};
 e.prototype.nextStep = function() {
 this.crtStep++;
 this.crtGuide = this.guides[this.crtStep];
@@ -9673,6 +9752,7 @@ this.updateGuide();
 e.prototype.updateGuide = function() {
 var t = this;
 if (null == this.crtGuide) this.close(); else {
+this.node_bg.opacity = 180;
 this.node_finger.opacity = 255;
 this.node_dialog.opacity = 255;
 this.targetNode = null;
@@ -9691,10 +9771,20 @@ n = parseInt(r[0]);
 o = parseInt(r[1]);
 i = parseInt(r[2]);
 a = parseInt(r[3]);
+}
+if ("all" == this.crtGuide.click_rect) {
+this.node_click.x = 0;
+this.node_click.y = 0;
+this.node_click.width = this.node.width;
+this.node_click.height = this.node.height;
+this.ifThrough = !1;
+} else {
+this.event_data = this.crtGuide.id + "_" + (this.crtStep + 1);
 this.node_click.x = n;
 this.node_click.y = o;
 this.node_click.width = i;
 this.node_click.height = a;
+}
 } else {
 this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
 i = this.targetNode.width;
@@ -9709,7 +9799,11 @@ s.component = "Guide";
 s.handler = "clickNodeClick";
 this.targetNode.getComponent(cc.Button).clickEvents.push(s);
 }
-null != n && null != o && null != i && null != a && cc.tween(this.node_display).to(.3, {
+if (null != n && null != o && null != i && null != a) {
+this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
+this.node_display.width = this.node.width;
+this.node_display.height = this.node.height;
+cc.tween(this.node_display).to(.3, {
 x: n,
 y: o,
 width: i,
@@ -9720,6 +9814,7 @@ t.node_bg.x = -t.node_display.x;
 t.node_bg.y = -t.node_display.y;
 }
 }).start();
+}
 if (null != this.crtGuide.dialog_pos && this.crtGuide.dialog_pos.length > 0) {
 r = this.crtGuide.dialog_pos.split(":");
 for (var l = this.node_dialog.getComponent(cc.Widget), u = 0; u < this.widgets.length; u++) l[this.widgets[u]] = "" == r[u] ? null : parseInt(r[u]);
@@ -9751,6 +9846,7 @@ return r(this, void 0, void 0, function() {
 return c(this, function(t) {
 switch (t.label) {
 case 0:
+mk.audio.playEffect("button");
 cc.Tween.stopAllByTarget(this.node_display);
 console.log("clickNodeClick");
 this.targetNode && this.targetNode.getComponent(cc.Button).clickEvents.pop();
@@ -9770,9 +9866,11 @@ return [ 2 ];
 });
 };
 e.prototype.reset = function() {
-this.node_display.width = this.node.width;
-this.node_display.height = this.node.height;
-this.node_bg.x = this.node_bg.y = 0;
+this.node_display.width = 0;
+this.node_display.height = 0;
+this.node_bg.x = -this.node_display.x;
+this.node_bg.y = -this.node_display.y;
+this.node_bg.opacity = 0;
 this.node_click.width = 0;
 this.node_click.height = 0;
 this.node_finger.opacity = 0;
@@ -9782,6 +9880,37 @@ e.prototype.close = function() {
 mk.guide.close();
 this.node.destroy();
 };
+e.prototype.initTouch = function() {
+var t = cc.EventListener;
+this._touchListener = t.create({
+event: t.TOUCH_ONE_BY_ONE,
+swallowTouches: !1,
+owner: this.node_click,
+mask: null,
+onTouchBegan: this.onTouchStart.bind(this),
+onTouchMoved: null,
+onTouchEnded: this.onTouchEnded.bind(this),
+onTouchCancelled: null
+});
+this._eventManager.addListener(this._touchListener, this.node_click);
+};
+e.prototype.onTouchStart = function(t) {
+if (this.ifThrough) {
+var e = t.getLocation(), n = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(e.x, e.y));
+return this.pointInPoly(n, this.node_click);
+}
+return !1;
+};
+e.prototype.pointInPoly = function(t, e) {
+var n = e.getPosition();
+return t.x >= n.x - this.node_click.width / 2 && t.x <= n.x + this.node_click.width / 2 && t.y >= n.y - this.node_click.height / 2 && t.y <= n.y + this.node_click.height / 2;
+};
+e.prototype.onTouchEnded = function() {
+this.clickNodeClick();
+};
+e.prototype.onDestroy = function() {
+this._eventManager.removeListener(this._touchListener, this.node_click);
+};
 a([ u({
 type: cc.Node,
 displayName: "显示区域"
@@ -11292,7 +11421,7 @@ if (gData.appData.getDeviceInfoCompelete) {
 this.login();
 gData.appData.getDeviceInfoCompelete = !1;
 } else if (gData.gameData.dataFinish) {
-gData.gameData.isNewPlayer() ? mk.ui.openPanel("module/agreementTip/agreementTip") : mk.ui.openPanel("game/prefab/game");
+gData.gameData.isNewPlayer() ? mk.ui.openPanel("module/login/agreementTip") : mk.ui.openPanel("game/prefab/game");
 gData.gameData.dataFinish = !1;
 }
 } else gData.loginData.loadLocalRes();
@@ -11319,6 +11448,7 @@ return [ 4, this.checkHotUpdate() ];
 
 case 2:
 e.sent();
+mk.audio.init();
 return [ 2 ];
 }
 });
@@ -11695,17 +11825,21 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = (r.property, function(t) {
+var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
 i(e, t);
 function e() {
-return null !== t && t.apply(this, arguments) || this;
+var e = null !== t && t.apply(this, arguments) || this;
+e.node_guide = null;
+return e;
 }
 e.prototype.start = function() {
 mk.ui.openPanel("module/login/login");
+mk.guide.ui = this.node_guide;
 };
+a([ s(cc.Node) ], e.prototype, "node_guide", void 0);
 return a([ c ], e);
-}(cc.Component));
-n.default = s;
+}(cc.Component);
+n.default = l;
 cc._RF.pop();
 }, {} ],
 MathUtil: [ function(t, e, n) {
@@ -12655,6 +12789,7 @@ e.btnOpen = null;
 e.labName = null;
 e.labDes = null;
 e.spRed = null;
+e.bData = null;
 e.data = null;
 e.cool = !1;
 return e;
@@ -12663,8 +12798,9 @@ e.prototype.setItemData = function(t) {
 return r(this, void 0, void 0, function() {
 var e = this;
 return c(this, function() {
+this.bData = t;
 this.data = t.item_data;
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(this.data.icon, function(t, n) {
+cc.loader.load(this.data.icon, function(t, n) {
 if (t) console.log("err:", t); else if (cc.isValid(e.iconNode)) {
 var o = n;
 e.iconNode.spriteFrame = new cc.SpriteFrame(o);
@@ -12708,7 +12844,7 @@ t.showDownloadProgress();
 };
 e.prototype.showDownloadProgress = function() {
 var t = gData.moreGame.getTaskInfo(this.data.nebulaAppId);
-null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setItemData(this.data);
+null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setItemData(this.bData);
 };
 a([ p(cc.Sprite) ], e.prototype, "iconNode", void 0);
 a([ p(cc.Label) ], e.prototype, "progressLabel", void 0);
@@ -12765,7 +12901,7 @@ return e;
 e.prototype.init = function(t) {
 var e = this;
 this.data = t;
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(t.banner2, function(t, n) {
+cc.loader.load(t.banner2, function(t, n) {
 if (t) console.log("err:", t); else if (e.banner) {
 var o = n;
 e.banner.spriteFrame = new cc.SpriteFrame(o);
@@ -12774,13 +12910,16 @@ e.banner.spriteFrame = new cc.SpriteFrame(o);
 this.spPro.node.active = !1;
 this.btnStart.active = !1;
 this.labPro.string = "";
-if (r.default.ifCanStartGame(t.packageName, !1)) {
+if (1 == t.appType) if (r.default.ifCanStartGame(t.packageName, !1)) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
 } else if (r.default.isFileExist(t.nebulaAppId + ".apk")) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
-} else this.spRed.active = !0;
+} else this.spRed.active = !0; else if (2 == t.appType) {
+this.spRed.active = !1;
+this.btnStart.active = !0;
+}
 };
 e.prototype.creatorDownLoadTask = function() {
 var t = this;
@@ -12789,9 +12928,9 @@ this.cool = !0;
 this.scheduleOnce(function() {
 t.cool = !1;
 }, 3);
-null != gData.moreGame.createNewTask(this.data) && this.schedule(function() {
+1 == this.data.appType ? null != gData.moreGame.createNewTask(this.data) && this.schedule(function() {
 t.showDownloadProgress();
-}, .5);
+}, .5) : 2 == this.data.appType && cc.sys.openURL(this.data.recommendLink);
 }
 };
 e.prototype.showDownloadProgress = function() {
@@ -12863,7 +13002,7 @@ e.prototype.init = function() {
 var t = this;
 this.data = gData.moreGame.getRandomNormal();
 if (this.data) {
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(this.data.icon, function(e, n) {
+cc.loader.load(this.data.icon, function(e, n) {
 if (e) console.log("err:", e); else {
 var o = n;
 t.icon.spriteFrame = new cc.SpriteFrame(o);
@@ -12876,7 +13015,7 @@ e.prototype.creatorDownLoadTask = function() {
 mk.audio.playEffect("button");
 if (!this.cool) {
 this.cool = !0;
-cc.sys.isNative && !r.default.ifCanStartGame(this.data.packageName, !0) && gData.moreGame.createNewTask(this.data);
+1 == this.data.appType ? r.default.ifCanStartGame(this.data.packageName, !0) || gData.moreGame.createNewTask(this.data) : 2 == this.data.appType && cc.sys.openURL(this.data.recommendLink);
 gData.moreGame.popNodeGetRedBag();
 }
 };
@@ -13407,7 +13546,9 @@ e.init_data = !0;
 e.cash_min_limit = .3;
 return e;
 }
-e.prototype.init = function() {};
+e.prototype.init = function() {
+this.cash_min_limit = gData.gameData.configs.ServerConfig.PiggyBankCashMoney;
+};
 e.prototype.cashOP = function() {
 return a(this, void 0, void 0, function() {
 var t;
@@ -13433,6 +13574,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !!gData.gameData.gameData.isWithdrawable && gData.gameData.gameData.piggyBank >= this.cash_min_limit;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.PigBankData = c;
@@ -14393,7 +14537,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.init_list = !1;
 e.c_data = [];
-e._cash_bar = 0;
+e._cash_bar = 1;
 return e;
 }
 e.prototype.init = function() {
@@ -14437,8 +14581,11 @@ return [ 4, mk.http.sendData("cashUsual", e) ];
 case 1:
 if (0 != (n = a.sent()).errcode) {
 mk.tip.pop(n.errmsg);
+mk.console.logSingle("提现index", t);
+mk.console.logSingle("提现错误内容：", n);
 return [ 2 ];
 }
+cc.log("红包提现成功");
 0 == (o = n.data).CashMode || o.CashMode;
 this.cash_bar++;
 gData.gameData.gameData.cashIndex++;
@@ -14456,7 +14603,7 @@ return [ 2 ];
 };
 e.prototype.sortList = function() {
 for (var t = this.c_data.length, e = 0, n = 0; n < t; n++) {
-if (this.c_data[e].index <= gData.redBagCash.cash_bar) {
+if (this.c_data[e].index < gData.redBagCash.cash_bar) {
 var o = this.c_data.splice(e, 1);
 this.c_data.push(o[0]);
 e--;
@@ -14485,6 +14632,10 @@ this.c_data.push(n);
 }
 this.init_list = !0;
 };
+e.prototype.redPoint = function() {
+for (var t = gData.gameData.gameData.redMoney, e = this.c_data.length, n = 0; n < e; n++) if (!(this.c_data[n].index < gData.redBagCash.cash_bar) && t >= this.c_data[n].type_value) return !0;
+return !1;
+};
 return e;
 }(c.Data);
 n.RedBagCashData = l;
@@ -14664,7 +14815,7 @@ this.lbl_red_value.string = "" + this.item_data.type_value;
 var e = this.item_data.money / 100;
 e = e > 1 ? e : parseFloat(e.toFixed(2));
 this.lbl_rmb_value.string = e + "元";
-if (this.item_data.index <= gData.redBagCash.cash_bar) {
+if (this.item_data.index < gData.redBagCash.cash_bar) {
 this.node_none.active = !0;
 this.node_lock.active = !1;
 this.node_unlock.active = !1;
@@ -14679,10 +14830,7 @@ this.node_unlock.active = !1;
 }
 };
 e.prototype.clickCashOP = function() {
-if (this.item_data.index > gData.redBagCash.cash_bar + 1) mk.tip.pop("请按顺序提现"); else {
-gData.redBagCash.cashOP();
-cc.log("红包现成功");
-}
+this.item_data.index > gData.redBagCash.cash_bar + 1 ? mk.tip.pop("请按顺序提现") : gData.redBagCash.cashOP();
 };
 a([ u({
 displayName: "已领取",
@@ -15428,6 +15576,9 @@ return [ 2, e ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.default = c;
@@ -17286,6 +17437,9 @@ if (a === s.RewardState.unlock) return n;
 }
 return t;
 };
+e.prototype.redPoint = function() {
+return !gData.gameData.gameData.isSignInToday && this.haveSignDay();
+};
 return e;
 }(c.Data);
 n.SignData = l;
@@ -19251,6 +19405,9 @@ mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(s.AdFun.turntable);
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(c.Data);
 n.TurnableData = u;
@@ -20091,39 +20248,40 @@ mk.ui = this;
 e.prototype.start = function() {
 this.panelParent || (this.panelParent = this.node);
 };
-e.prototype.openPanel = function(t, e) {
+e.prototype.openPanel = function(t, e, n) {
 void 0 === e && (e = r.normal);
-var n = t.split("/"), o = n[n.length - 1], i = this;
-if (!i.isPanelOpening && !i.getCurOnPanel(o)) {
-i.isPanelOpening = !0;
-return new Promise(function(n, a) {
+void 0 === n && (n = null);
+var o = t.split("/"), i = o[o.length - 1], a = this;
+if (!a.isPanelOpening && !a.getCurOnPanel(i)) {
+a.isPanelOpening = !0;
+return new Promise(function(o, c) {
 mk.loader.load("" + t, cc.Prefab).then(function(t) {
-i.isPanelOpening = !1;
-var a = cc.instantiate(t);
-i.curOnPanelDic[o] = a;
-i.panelParent && (i.panelParent = i.node);
-if (i.panelParent) {
-i.panelParent.addChild(a);
+a.isPanelOpening = !1;
+var c = cc.instantiate(t);
+a.curOnPanelDic[i] = c;
+a.panelParent && (a.panelParent = a.node);
+if (a.panelParent) {
+n ? c.parent = n : a.panelParent.addChild(c);
 switch (e) {
 case r.normal:
 break;
 
 case r.closeLast:
-i.lastOpenPanelName && i.closePanel(i.lastOpenPanelName);
+a.lastOpenPanelName && a.closePanel(a.lastOpenPanelName);
 break;
 
 case r.closeOther:
-for (var c = Object.keys(i.curOnPanelDic).filter(function() {}), s = 0; s < c.length; s++) {
-var l = c[s];
-i.closePanel(l);
+for (var s = Object.keys(a.curOnPanelDic).filter(function() {}), l = 0; l < s.length; l++) {
+var u = s[l];
+a.closePanel(u);
 }
 }
-i.lastOpenPanelName = o;
-n(a);
+a.lastOpenPanelName = i;
+o(c);
 } else console.error("[UISystem] UI的父节点panelParent为null,请检查脚本挂载情况");
 }).catch(function(t) {
-i.isPanelOpening = !1;
-a(t);
+a.isPanelOpening = !1;
+c(t);
 });
 });
 }