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

assets/resources/data/guide_data.json

@@ -6,63 +6,63 @@
 		"tr_form": 2,
 		"dialog": "欢迎来到轻松连连消",
 		"display_rect": "",
-		"click_node": "",
+		"click_rect": "all",
 		"finger": "",
 		"lag_next": 0
 	},
 	{
 		"id": "1_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 2,
 		"dialog": "点击“开始游戏”，让我来介绍一下",
 		"display_rect": "",
-		"click_node": "btn_start",
-		"finger": "100:0",
+		"click_rect": "界面层/game/开始按钮",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "1_3",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击这两个动物即可消除哦",
 		"display_rect": "-300:100:100:500",
-		"click_node": "",
-		"finger": "",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 1
 	},
 	{
 		"id": "1_4",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "消除可获得大量进度哦",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 2
 	},
 	{
 		"id": "1_5",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "进度攒满即可通关",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "100:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "1_6",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "继续点击消除吧",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "200:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
@@ -71,20 +71,20 @@
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击领取红包币",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "2_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "红包币可用于提现",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "200:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
@@ -93,20 +93,20 @@
 		"tr_num": null,
 		"tr_form": 2,
 		"dialog": "达到提现条件啦！",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "100:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	},
 	{
 		"id": "3_2",
-		"trigger": null,
+		"trigger": 1,
 		"tr_num": null,
 		"tr_form": 1,
 		"dialog": "点击即可提现",
-		"display_rect": "",
-		"click_node": "",
-		"finger": "",
+		"display_rect": "300:100:100:500",
+		"click_rect": "event",
+		"finger": "50:20",
 		"lag_next": 0
 	}
 ]

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

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 217,
-  "height": 60,
+  "width": 185,
+  "height": 52,
   "platformSettings": {},
   "subMetas": {
     "tixian_bg": {

assets/resources/module/guide/guide.prefab

@@ -21,29 +21,26 @@
         "__id__": 2
       },
       {
-        "__id__": 11
+        "__id__": 9
       },
       {
         "__id__": 14
       },
       {
         "__id__": 17
-      },
-      {
-        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 35
       },
       {
-        "__id__": 24
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -107,11 +104,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -175,13 +172,10 @@
       },
       {
         "__id__": 5
-      },
-      {
-        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 6
     },
     "_opacity": 120,
     "_color": {
@@ -292,11 +286,152 @@
     "_id": ""
   },
   {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "46PGyVrkVNE4PKNVed+BPO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_spriteFrame": null,
+    "_type": 0,
+    "_segments": 64,
+    "_N$alphaThreshold": 0.1,
+    "_N$inverted": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "af2wWWnb1LsrA0wok8WpNl",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "点击区域",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 0,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 247,
+      "g": 193,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 200
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -69.034,
+        137.01,
+        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__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 9
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -305,7 +440,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 7
+        "__id__": 12
       }
     ],
     "_N$interactable": true,
@@ -361,7 +496,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 3
+      "__id__": 1
     },
     "_id": ""
   },
@@ -372,7 +507,7 @@
     },
     "component": "",
     "_componentId": "cc77atmGeBM4bPWFiQFl7H6",
-    "handler": "clickBg",
+    "handler": "clickNodeClick",
     "customEventData": ""
   },
   {
@@ -383,15 +518,79 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "46PGyVrkVNE4PKNVed+BPO",
+    "fileId": "60Q2zcsidNuakhBvwjcngt",
     "sync": false
   },
   {
-    "__type__": "cc.Mask",
+    "__type__": "cc.Node",
+    "_name": "hand",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 94,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -399,11 +598,23 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_spriteFrame": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e374d43a-3f16-493f-a5c9-af57ec3d09cb"
+    },
     "_type": 0,
-    "_segments": 64,
-    "_N$alphaThreshold": 0.1,
-    "_N$inverted": true,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -414,25 +625,38 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "af2wWWnb1LsrA0wok8WpNl",
+    "fileId": "14BeehV6RGZ63hNNH505Ak",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "block",
+    "_name": "描述",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": false,
+    "_children": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -445,7 +669,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1334
+      "height": 180
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -457,7 +681,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -541,
         0,
         0,
         0,
@@ -482,42 +706,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.BlockInputEvents",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
-    },
-    "fileId": "f7UFOYdFFDHpdFu3DllFXp",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "hand",
+    "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -529,8 +732,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
-      "height": 100
+      "width": 718,
+      "height": 176
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -571,7 +774,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -582,7 +785,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e374d43a-3f16-493f-a5c9-af57ec3d09cb"
+      "__uuid__": "83b7eeb0-b60b-4e20-82d4-42a63882d451"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -606,7 +809,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "14BeehV6RGZ63hNNH505Ak",
+    "fileId": "f4RgKyMztI74KS85gXMxFG",
     "sync": false
   },
   {
@@ -614,17 +817,17 @@
     "_name": "panda",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -648,8 +851,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        248.359,
+        50,
         0,
         0,
         0,
@@ -678,7 +881,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -713,7 +916,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "3cRKT5DgZB8pBFgouS+/15",
+    "fileId": "36vBBjdHRDnbPFi6zydrK7",
     "sync": false
   },
   {
@@ -721,17 +924,17 @@
     "_name": "head",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -755,8 +958,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        289.752,
+        269.056,
         0,
         0,
         0,
@@ -785,7 +988,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -820,7 +1023,260 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "d2aUUUlOJOUKUrYxLZQ314",
+    "fileId": "9dNDd0PytJdpl2jR0QvaxY",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "文本",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 17
+    },
+    "_children": [
+      {
+        "__id__": 28
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 400,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -100,
+        -10,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 27
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 342.81,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -200,
+        -31.5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "点击2个或者更多来",
+    "_N$string": "点击2个或者更多来",
+    "_fontSize": 40,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "f9mlOp3ChKlY+khHxIF6IF",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": false,
+    "_N$string": "<color=#00ff00>点击2个或者更多来</color>",
+    "_N$horizontalAlign": 0,
+    "_N$fontSize": 40,
+    "_N$font": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 400,
+    "_N$lineHeight": 50,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "809f6J/xJK4q9BbJwTkArE",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 36,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "b0tx8+nQpDRYgh40cIHHL+",
     "sync": false
   },
   {
@@ -834,21 +1290,23 @@
     "node_display": {
       "__id__": 2
     },
-    "node_click": null,
+    "node_click": {
+      "__id__": 9
+    },
     "node_bg": {
       "__id__": 3
     },
-    "node_block": {
-      "__id__": 11
-    },
     "node_finger": {
       "__id__": 15
     },
     "node_head": {
-      "__id__": 15
+      "__id__": 25
     },
     "node_person": {
-      "__id__": 18
+      "__id__": 22
+    },
+    "rich_dialog": {
+      "__id__": 31
     },
     "_id": ""
   },

assets/script/game/data/LoginData.ts

@@ -252,6 +252,7 @@ export class LoginData {
             if (this.isAuth) {
                 gData.wechatData.nickName = data.nickname;
                 gData.wechatData.avatar = data.headimgurl;
+                gData.wechatData.unionid = this.uin;
                 gData.gameData.init_head = true;
                 mk.storage.setStorage(StorageKey.isAuth, 1);
                 mk.storage.setStorage(StorageKey.nickname, gData.wechatData.nickName, false);

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

@@ -8,7 +8,7 @@ export class GuideData {
     public data: Map<number, GuideVO[]>;
 
     /** 当前引导id */
-    public crtID:number = null;
+    public crtID: number = null;
 
     public init(config) {
         this.data = new Map<number, GuideVO[]>();
@@ -25,7 +25,7 @@ export class GuideData {
             guide.tr_form = o.tr_form;
             guide.dialog = o.dialog;
             guide.display_rect = o.display_rect;
-            guide.click_node = o.click_node;
+            guide.click_rect = o.click_rect;
             guide.finger = o.finger;
             guide.lag_next = o.lag_next;
             if (id != guide.id) {
@@ -59,7 +59,7 @@ export class GuideVO {
     /** 透明点击区域（与click_node不共存） */
     display_rect: string;
     /** 点击组件名字（必须在代码中预先设置） */
-    click_node: string;
+    click_rect: string;
     /** 手指位置 */
     finger: string;
     /** 下个时间 */

assets/script/game/game/Game.ts

@@ -50,10 +50,10 @@ export default class Game extends cc.Component {
         this.initQiPaos();
         this.initInfo();
 
-        if (gData.gameData.isNewPlayer()) {
-            // this.initGuide();
-            // gData.gameData.setProp(GameProp.newPlayer,1);
-        }
+        // if(gData.gameData.isNewPlayer()){
+        //     this.initGuide();
+        //     gData.gameData.setProp(GameProp.newPlayer,0);
+        // }
     }
 
     private initGuide() {
@@ -126,7 +126,6 @@ export default class Game extends cc.Component {
     /** */
     public onClickStart() {
         this.node_gameplay.active = true;
-
     }
 
     /**点击分享 */

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

@@ -15,19 +15,21 @@ export default class Guide extends cc.Component {
     node_click: cc.Node = null;
     @property({ type: cc.Node, displayName: "背景" })
     node_bg: cc.Node = null;
-    @property(cc.Node)
-    node_block: cc.Node = null;
     @property({ type: cc.Sprite, displayName: "手指" })
     node_finger: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "头像" })
     node_head: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "形象" })
     node_person: cc.Sprite = null;
+    @property({ type: cc.RichText, displayName: "对话内容" })
+    rich_dialog: cc.RichText = null;
 
 
     private guides: GuideVO[];
     private crtStep: number;
     private crtGuide: GuideVO;
+    private targetNode: cc.Node;
+    private event_name: string;
 
     onLoad() {
 
@@ -50,41 +52,80 @@ export default class Guide extends cc.Component {
     }
 
     private updateGuide() {
-        if(this.crtGuide == null){
+        if (this.crtGuide == null) {
             this.close();
         }
-        else{
-            this.reset();
-            if(this.crtGuide.display_rect != ""){
+        else {
+            this.targetNode = null;
+            this.event_name = null;
+
+            //点击全屏下一步，显示区域不显示，点击区域全屏
+            if (this.crtGuide.click_rect == "all") {
+                this.node_display.width = 0;
+                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_name = "event_guide_" + this.crtGuide.id + "_" + this.crtStep;
                 let arr = this.crtGuide.display_rect.split(":");
-                this.node_display.x = parseInt(arr[0]);
-                this.node_display.y = parseInt(arr[1]);
-                this.node_display.width = parseInt(arr[2]);
-                this.node_display.height = parseInt(arr[3]);
+                this.node_display.x = this.node_click.x = parseInt(arr[0]);
+                this.node_display.y = this.node_click.y = parseInt(arr[1]);
+                this.node_display.width = this.node_click.width = parseInt(arr[2]);
+                this.node_display.height = this.node_click.height = parseInt(arr[3]);
             }
-            else if(this.crtGuide.click_node != ""){
-                
+            else {//点击按钮下一步，显示区域为配置的node，点击区域=显示区域
+                this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
+                this.node_display.width = this.targetNode.width;
+                this.node_display.height = this.targetNode.height;
+                let pos = mk.game.getWorldPos(this.targetNode);
+                this.node_display.setPosition(pos);
             }
-            if(this.crtGuide.finger != ""){
-                
+
+            if (this.crtGuide.finger == "") {
+                this.node_finger.node.active = false;
             }
-        }
-    }
+            else {
+                this.node_finger.node.active = true;
+                let arr = this.crtGuide.finger.split(":");
+                this.node_finger.node.x = this.node_display.x + parseInt(arr[0]);
+                this.node_finger.node.y = this.node_display.y + parseInt(arr[1]);
+            }
+
+            if (this.crtGuide.tr_form == 1) {
+                this.node_head.node.active = true;
+                this.node_person.node.active = false;
+            }
+            else {
+                this.node_head.node.active = false;
+                this.node_person.node.active = true;
+            }
+
+            this.node_bg.x = -this.node_display.x;
+            this.node_bg.y = -this.node_display.y;
 
-    clickBg() {
-        console.log("clickBg");
-        if (this.crtGuide && this.crtGuide.click_node == "" && this.crtGuide.display_rect == "") {
-            this.nextStep();
+            this.rich_dialog.string = `<color=#000000>${this.crtGuide.dialog}</color>`;
         }
     }
 
-    clickNodeClick() {
+    async clickNodeClick() {
         console.log("clickNodeClick");
-
+        if (this.targetNode) {
+            this.targetNode.getComponent(cc.Button).clickEvents[0].emit([]);
+        }
+        if (this.event_name) {
+            mk.event.emit(this.event_name);
+        }
+        if (this.crtGuide.lag_next > 0) {
+            await mk.time.WaitForSeconds(this.crtGuide.lag_next);
+        }
+        this.nextStep();
     }
 
 
-    private close(){
+    private close() {
         mk.guide.close();
         this.node.destroy();
     }

assets/script/mk/system/GuideSystem.ts

@@ -1,5 +1,4 @@
 import { GameProp } from "../../game/data/GameData";
-import { Guide } from "../../game/data/module/GuideData";
 
 
 /**

assets/script/mk/system/TipSystem.ts

@@ -7,23 +7,23 @@ const { ccclass, property } = cc._decorator;
  */
 export default class TipSystem extends cc.Component {
     @property({ type: cc.Integer, displayName: "飘动时间" })
-    private tween_time: number = 1;
+     tween_time: number = 1;
     @property({ type: cc.Integer, displayName: "开始坐标x" })
-    private src_x: number = 0;
+     src_x: number = 0;
     @property({ type: cc.Integer, displayName: "开始坐标y" })
-    private src_y: number = 0;
+     src_y: number = 0;
     @property({ type: cc.Integer, displayName: "目标坐标x" })
-    private tar_x: number = 0;
+     tar_x: number = 0;
     @property({ type: cc.Integer, displayName: "目标坐标y" })
-    private tar_y: number = 200;
+     tar_y: number = 200;
     @property({ type: cc.Integer, displayName: "背景透明度" })
-    private bg_opacity: number = 40;
+     bg_opacity: number = 40;
     @property({ displayName: "背景颜色" })
-    private bg_color = new cc.Color(200, 200, 200);
+     bg_color = new cc.Color(200, 200, 200);
     @property({ displayName: "文本颜色" })
-    private tip_color = new cc.Color(255, 255, 255);
+     tip_color = new cc.Color(255, 255, 255);
     @property({ type: cc.Integer, displayName: "文本字体" })
-    private tip_size: number = 40;
+     tip_size: number = 40;
 
     onLoad() {
         mk.tip = this;

assets/script/mk/utils/GameUtil.ts

@@ -33,7 +33,7 @@ export default class GameUtil {
      * 获取世界坐标
      * @param 需要获取的节点
      */
-    public static getWorldPos(node: cc.Node): cc.Vec2 {
+    public getWorldPos(node: cc.Node): cc.Vec2 {
         let originX = node.x;
         let originY = node.y;
         let curNode = node;