zouyong 5 éve
szülő
commit
2d57f98500

+ 428 - 100
assets/resources/module/guide/guide.prefab

@@ -21,20 +21,29 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 23
       },
       {
-        "__id__": 16
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -98,79 +107,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 11
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "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": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "点击区域",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [
-      {
-        "__id__": 4
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 8
-      }
-    ],
-    "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -224,12 +165,15 @@
     "_name": "背景",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 3
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
+        "__id__": 4
+      },
+      {
         "__id__": 5
       },
       {
@@ -237,7 +181,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 8
     },
     "_opacity": 120,
     "_color": {
@@ -291,7 +235,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 4
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -323,7 +267,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 4
+      "__id__": 3
     },
     "_enabled": true,
     "alignMode": 1,
@@ -348,6 +292,90 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 3
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "cc77atmGeBM4bPWFiQFl7H6",
+    "handler": "clickBg",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -355,7 +383,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "754SPbB1hNiYs77Q05nGQ/",
+    "fileId": "46PGyVrkVNE4PKNVed+BPO",
     "sync": false
   },
   {
@@ -363,9 +391,9 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 2
     },
-    "_enabled": false,
+    "_enabled": true,
     "_materials": [
       {
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
@@ -386,15 +414,164 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "20o3KHyBJBb59Tg77KA/TD",
+    "fileId": "af2wWWnb1LsrA0wok8WpNl",
     "sync": false
   },
   {
-    "__type__": "cc.Mask",
+    "__type__": "cc.Node",
+    "_name": "block",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_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.BlockInputEvents",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__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",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_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__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -402,11 +579,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": ""
   },
   {
@@ -417,25 +606,25 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "af2wWWnb1LsrA0wok8WpNl",
+    "fileId": "14BeehV6RGZ63hNNH505Ak",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "block",
+    "_name": "panda",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -447,8 +636,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 190,
+      "height": 264
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -485,13 +674,35 @@
     "_id": ""
   },
   {
-    "__type__": "cc.BlockInputEvents",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 17
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "cff81677-0727-4cd3-869c-39b593e999f2"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -502,7 +713,114 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f7UFOYdFFDHpdFu3DllFXp",
+    "fileId": "3cRKT5DgZB8pBFgouS+/15",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "head",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 128,
+      "height": 127
+    },
+    "_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__": 20
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c534a35a-73aa-40ef-92eb-f7d632dde418"
+    },
+    "_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__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "d2aUUUlOJOUKUrYxLZQ314",
     "sync": false
   },
   {
@@ -516,11 +834,21 @@
     "node_display": {
       "__id__": 2
     },
-    "node_click": {
+    "node_click": null,
+    "node_bg": {
       "__id__": 3
     },
     "node_block": {
-      "__id__": 12
+      "__id__": 11
+    },
+    "node_finger": {
+      "__id__": 15
+    },
+    "node_head": {
+      "__id__": 15
+    },
+    "node_person": {
+      "__id__": 18
     },
     "_id": ""
   },

+ 12 - 0
assets/resources/module/guide/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "94383adf-e416-4b40-b00f-5ed0514d77b0",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/resources/module/guide/texture/bg.png


+ 36 - 0
assets/resources/module/guide/texture/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "2d8d30f7-2b72-4c9b-acca-caf29009fdca",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 718,
+  "height": 176,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "83b7eeb0-b60b-4e20-82d4-42a63882d451",
+      "rawTextureUuid": "2d8d30f7-2b72-4c9b-acca-caf29009fdca",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 718,
+      "height": 176,
+      "rawWidth": 718,
+      "rawHeight": 176,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/hand.png


+ 36 - 0
assets/resources/module/guide/texture/hand.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d207d466-fe93-44b4-937d-fc7ed63c87f4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 94,
+  "height": 100,
+  "platformSettings": {},
+  "subMetas": {
+    "hand": {
+      "ver": "1.0.4",
+      "uuid": "e374d43a-3f16-493f-a5c9-af57ec3d09cb",
+      "rawTextureUuid": "d207d466-fe93-44b4-937d-fc7ed63c87f4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 94,
+      "height": 100,
+      "rawWidth": 94,
+      "rawHeight": 100,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/hand1.png


+ 36 - 0
assets/resources/module/guide/texture/hand1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "916066c2-3e89-434e-beb4-7c191a8ec9bd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 93,
+  "height": 111,
+  "platformSettings": {},
+  "subMetas": {
+    "hand1": {
+      "ver": "1.0.4",
+      "uuid": "7703cd1c-b1a7-4207-8d63-ca26e03de71b",
+      "rawTextureUuid": "916066c2-3e89-434e-beb4-7c191a8ec9bd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 93,
+      "height": 111,
+      "rawWidth": 93,
+      "rawHeight": 111,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/head.png


+ 36 - 0
assets/resources/module/guide/texture/head.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "7c2d0a53-975f-4c53-a156-b7aa17e4cb33",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 127,
+  "platformSettings": {},
+  "subMetas": {
+    "head": {
+      "ver": "1.0.4",
+      "uuid": "c534a35a-73aa-40ef-92eb-f7d632dde418",
+      "rawTextureUuid": "7c2d0a53-975f-4c53-a156-b7aa17e4cb33",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 127,
+      "rawWidth": 128,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/panda.png


+ 36 - 0
assets/resources/module/guide/texture/panda.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "579168fe-bc7b-483b-86ba-51a7b4498f84",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 190,
+  "height": 264,
+  "platformSettings": {},
+  "subMetas": {
+    "panda": {
+      "ver": "1.0.4",
+      "uuid": "cff81677-0727-4cd3-869c-39b593e999f2",
+      "rawTextureUuid": "579168fe-bc7b-483b-86ba-51a7b4498f84",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 190,
+      "height": 264,
+      "rawWidth": 190,
+      "rawHeight": 264,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/yuan.png


+ 36 - 0
assets/resources/module/guide/texture/yuan.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6127500f-6203-4eb8-897a-b8e3ad18bbb7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 59,
+  "height": 59,
+  "platformSettings": {},
+  "subMetas": {
+    "yuan": {
+      "ver": "1.0.4",
+      "uuid": "de7bda9d-5d6d-457b-a243-7a85d92d4128",
+      "rawTextureUuid": "6127500f-6203-4eb8-897a-b8e3ad18bbb7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 59,
+      "height": 59,
+      "rawWidth": 59,
+      "rawHeight": 59,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guide/texture/yuan1.png


+ 36 - 0
assets/resources/module/guide/texture/yuan1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6558b6b3-3c9b-47e8-bbb5-5e3d500e668e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 39,
+  "height": 39,
+  "platformSettings": {},
+  "subMetas": {
+    "yuan1": {
+      "ver": "1.0.4",
+      "uuid": "dd5e7777-cf96-4eb5-a924-278846615c7d",
+      "rawTextureUuid": "6558b6b3-3c9b-47e8-bbb5-5e3d500e668e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 39,
+      "height": 39,
+      "rawWidth": 39,
+      "rawHeight": 39,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 1 - 1
assets/script/game/data/AppData.ts

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = 'c9:24:e2:1c:b2:23,f6:60:e4:1a:b7:27';
+    public mac: string = 'c9:24:e2:12:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

+ 3 - 0
assets/script/game/data/GameData.ts

@@ -192,7 +192,10 @@ export class GameData {
  */
 export enum GameProp {
     /** -------------------- 通用玩家数据 ------------------------- */
+    /** 是否新手 */
     newPlayer = 1,
+    /** 当前新手引导步骤 */
+    guideID = 2,
 
     /** ------------------ 游戏核心数据 --------------------------- */
     /** 关卡数 */

+ 4 - 4
assets/script/game/data/module/GuideData.ts

@@ -11,11 +11,11 @@ export class GuideData {
     public crtID:number = null;
 
     public init(config) {
-        this.data = new Map<number, Guide[]>();
+        this.data = new Map<number, GuideVO[]>();
         let arr = [];
         let id = 1;
         for (let i = 0; i < config.length; i++) {
-            let guide = {} as Guide;
+            let guide = {} as GuideVO;
             let o = config[i];
             let a = o.id.split("_");
             guide.id = parseInt(a[0]);
@@ -24,7 +24,7 @@ export class GuideData {
             guide.tr_num = o.tr_num;
             guide.tr_form = o.tr_form;
             guide.dialog = o.dialog;
-            guide.click_rect = o.click_rect;
+            guide.display_rect = o.display_rect;
             guide.click_node = o.click_node;
             guide.finger = o.finger;
             guide.lag_next = o.lag_next;
@@ -57,7 +57,7 @@ export class GuideVO {
     /** 对话内容 */
     dialog: string;
     /** 透明点击区域(与click_node不共存) */
-    click_rect: string;
+    display_rect: string;
     /** 点击组件名字(必须在代码中预先设置) */
     click_node: string;
     /** 手指位置 */

+ 3 - 4
assets/script/game/game/Game.ts

@@ -51,14 +51,13 @@ export default class Game extends cc.Component {
         this.initInfo();
 
         if(gData.gameData.isNewPlayer()){
-            this.initGuide();
-            gData.gameData.setProp(GameProp.newPlayer,1);
+            // this.initGuide();
+            // gData.gameData.setProp(GameProp.newPlayer,1);
         }
     }
 
     private initGuide(){
-        gData.guideData.crtID = 1;
-        mk.ui.openPanel("module/guide/guide");
+        mk.guide.open(1);
     }
 
     update() {

+ 49 - 5
assets/script/game/module/guide/Guide.ts

@@ -13,19 +13,28 @@ export default class Guide extends cc.Component {
     node_display: cc.Node = null;
     @property({ type: cc.Node, displayName: "点击区域" })
     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;
+
 
     private guides: GuideVO[];
     private crtStep: number;
     private crtGuide: GuideVO;
 
     onLoad() {
-        
+
     }
 
-    start(){
-        if(gData.guideData.crtID == null){
+    start() {
+        if (gData.guideData.crtID == null) {
             this.node.destroy();
             return;
         }
@@ -40,9 +49,44 @@ export default class Guide extends cc.Component {
         this.updateGuide();
     }
 
-    private updateGuide(){
-        
+    private updateGuide() {
+        if(this.crtGuide == null){
+            this.close();
+        }
+        else{
+            this.reset();
+            if(this.crtGuide.display_rect != ""){
+                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]);
+            }
+            else if(this.crtGuide.click_node != ""){
+                
+            }
+            if(this.crtGuide.finger != ""){
+                
+            }
+        }
+    }
+
+    clickBg() {
+        console.log("clickBg");
+        if (this.crtGuide && this.crtGuide.click_node == "" && this.crtGuide.display_rect == "") {
+            this.nextStep();
+        }
+    }
+
+    clickNodeClick() {
+        console.log("clickNodeClick");
+
     }
 
 
+    private close(){
+        mk.guide.close();
+        this.node.destroy();
+    }
+
 }

+ 21 - 15
assets/script/mk/system/GuideSystem.ts

@@ -1,3 +1,4 @@
+import { GameProp } from "../../game/data/GameData";
 import { Guide } from "../../game/data/module/GuideData";
 
 
@@ -6,24 +7,29 @@ import { Guide } from "../../game/data/module/GuideData";
  */
 export default class GuideSystem {
 
-    private guides: Guide[];
-    private crtStep: number;
-    private crtGuide: Guide;
+    private crtGuideID: number;
 
-    public open(id: number) {
+    public open(id) {
+        this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
+        if (id == 9999) {
+            mk.console.log("新手引导已做完");
+            return;
+        }
+        if (id >= this.crtGuideID && this.crtGuideID > 0) {
+            mk.console.log("当前引导已做过:" + id);
+            return;
+        }
+        gData.guideData.crtID = id;
+        this.crtGuideID = id;
         mk.ui.openPanel("module/guide/guide");
-        this.guides = gData.guideData.getGuidesByID(id);
-        this.crtStep = -1;
-        this.nextStep();
     }
 
-    private nextStep() {
-        this.crtStep++;
-        this.crtGuide = this.guides[this.crtStep];
-        this.updateGuide();
-    }
-
-    private updateGuide(){
-        
+    public close() {
+        this.crtGuideID++;
+        let guide = gData.guideData.getGuidesByID(this.crtGuideID);
+        if (guide == null) {
+            this.crtGuideID = 9999;
+        }
+        gData.gameData.setProp(GameProp.guideID, this.crtGuideID);
     }
 }