Browse Source

修复引导相关bug

kaka 4 years ago
parent
commit
45f9a57fea

+ 12 - 0
assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4e4c7e27-6fce-4142-bde1-d4e0cea5b72e",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 4 - 4
assets/resources/data/guide_data.json

@@ -28,7 +28,7 @@
 		"lagNext": "1"
 	},
 	{
-		"id": "1_3",
+		"id": "2_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "1",
@@ -42,7 +42,7 @@
 		"lagNext": "1"
 	},
 	{
-		"id": "2_1",
+		"id": "3_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "1",
@@ -56,7 +56,7 @@
 		"lagNext": "1"
 	},
 	{
-		"id": "3_1",
+		"id": "4_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "1",
@@ -70,7 +70,7 @@
 		"lagNext": "1"
 	},
 	{
-		"id": "4_1",
+		"id": "5_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "1",

+ 225 - 108
assets/resources/module/guide/guide.prefab

@@ -28,22 +28,19 @@
       },
       {
         "__id__": 17
-      },
-      {
-        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 69
       },
       {
-        "__id__": 66
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -585,7 +582,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "描述",
+    "_name": "BangsFit",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -595,17 +592,20 @@
         "__id__": 18
       },
       {
-        "__id__": 33
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 66
+      },
+      {
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -618,7 +618,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 300
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -656,7 +656,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "head",
+    "_name": "描述",
     "_objFlags": 0,
     "_parent": {
       "__id__": 17
@@ -664,16 +664,87 @@
     "_children": [
       {
         "__id__": 19
+      },
+      {
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 53
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 300
+    },
+    "_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": "head",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -727,21 +798,21 @@
     "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -795,24 +866,24 @@
     "_name": "文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 20
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -866,17 +937,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -931,7 +1002,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -969,7 +1040,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "addpYT/TBG5LL/d9tohWg6",
+    "fileId": "b5XgciLExLfq5O7/lsnfnG",
     "sync": false
   },
   {
@@ -977,17 +1048,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -1042,7 +1113,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1080,7 +1151,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "22WOK1W4dNFawHZkQfwM9O",
+    "fileId": "f0IOWo9XJF3KmKahIq9GMq",
     "sync": false
   },
   {
@@ -1088,7 +1159,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -1114,7 +1185,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "09JumGE8BEAKKx/5ouDcX8",
+    "fileId": "15q9Rpp1ROjb+ZQ9k0fkjE",
     "sync": false
   },
   {
@@ -1122,7 +1193,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -1157,7 +1228,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "08abMjqh1Nu4nWcxjLrdK2",
+    "fileId": "67ObwmneNMaYaGuh9Bhn7F",
     "sync": false
   },
   {
@@ -1165,7 +1236,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -1200,7 +1271,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "9dNDd0PytJdpl2jR0QvaxY",
+    "fileId": "80fzk6YflEpJD4GIpJNkAY",
     "sync": false
   },
   {
@@ -1208,24 +1279,24 @@
     "_name": "bg1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 37
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1279,17 +1350,17 @@
     "_name": "panda",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 33
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1343,7 +1414,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1378,7 +1449,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "c8p94YnYpKb7fTsBB6qxqN",
+    "fileId": "51gKwfEjFEhY+h6SHCIaDw",
     "sync": false
   },
   {
@@ -1386,21 +1457,21 @@
     "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 33
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1454,24 +1525,24 @@
     "_name": "文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 37
+      "__id__": 38
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 40
       },
       {
-        "__id__": 42
+        "__id__": 43
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1525,17 +1596,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 38
+      "__id__": 39
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1590,7 +1661,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1628,7 +1699,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "48S3PF6pxIhKAFa2Lzd34b",
+    "fileId": "5bDVwIQppCi7rPW8XOa9uC",
     "sync": false
   },
   {
@@ -1636,17 +1707,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 38
+      "__id__": 39
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1701,7 +1772,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1739,7 +1810,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "9dp6C2l9JHVYtA5gXO1Mox",
+    "fileId": "f2hm9vEmVLN5wgkCQm0n8u",
     "sync": false
   },
   {
@@ -1747,7 +1818,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 39
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -1773,7 +1844,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "23tJogTCpCOKmc0JPuDaWG",
+    "fileId": "d69IRoSWNAQJeow5ayqyP+",
     "sync": false
   },
   {
@@ -1781,7 +1852,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1816,7 +1887,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "59dLIVYOpMU517e9Era7dk",
+    "fileId": "20rWQ0h5FDE7n0KDZTi3PL",
     "sync": false
   },
   {
@@ -1824,7 +1895,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1859,7 +1930,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "cddITh6LlKJoTyxRVW7Eb4",
+    "fileId": "0e1tlVQRRCJKr4sqlbAXal",
     "sync": false
   },
   {
@@ -1867,13 +1938,11 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": false,
     "alignMode": 1,
-    "_target": {
-      "__id__": 1
-    },
+    "_target": null,
     "_alignFlags": 0,
     "_left": 0,
     "_right": 0,
@@ -1899,7 +1968,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "b0tx8+nQpDRYgh40cIHHL+",
+    "fileId": "43AlZIeCVO/ra2dqis6MDr",
     "sync": false
   },
   {
@@ -1907,24 +1976,24 @@
     "_name": "跳过",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 17
     },
     "_children": [
       {
-        "__id__": 54
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 62
       },
       {
-        "__id__": 63
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -1957,7 +2026,7 @@
         1,
         0.8,
         0.8,
-        1
+        0.8
       ]
     },
     "_eulerAngles": {
@@ -1978,24 +2047,24 @@
     "_name": "Background",
     "_objFlags": 512,
     "_parent": {
-      "__id__": 53
+      "__id__": 54
     },
     "_children": [
       {
-        "__id__": 55
+        "__id__": 56
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 59
       },
       {
-        "__id__": 59
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -2049,17 +2118,17 @@
     "_name": "Label",
     "_objFlags": 512,
     "_parent": {
-      "__id__": 54
+      "__id__": 55
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -2113,7 +2182,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2149,7 +2218,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "fdn5JCp4VAP5XmtDlWaG2y",
+    "fileId": "6ed3VCRr5CN6DDhR/HZ4xA",
     "sync": false
   },
   {
@@ -2157,7 +2226,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2189,7 +2258,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "alignMode": 0,
@@ -2219,7 +2288,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f2+TauPz1KQJYlmjaA3eMr",
+    "fileId": "acnU8a8QRGdogC46w0yFJK",
     "sync": false
   },
   {
@@ -2227,7 +2296,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 54
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2236,7 +2305,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "_N$interactable": true,
@@ -2304,7 +2373,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 54
+      "__id__": 55
     },
     "_id": ""
   },
@@ -2323,7 +2392,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 54
     },
     "_enabled": true,
     "alignMode": 1,
@@ -2353,7 +2422,55 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "a5vec554VDH7hB+xx+vlnw",
+    "fileId": "feOaa+u4xJlbkIM8/mRYqN",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_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__": "173866Ll/lFN6TBCxDmQuqC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "aelHMayG1IwpRHKpp4sW3F",
     "sync": false
   },
   {
@@ -2374,22 +2491,22 @@
       "__id__": 3
     },
     "node_dialog": {
-      "__id__": 17
+      "__id__": 18
     },
     "node_finger": {
       "__id__": 15
     },
     "node_head": {
-      "__id__": 31
+      "__id__": 32
     },
     "node_person": {
-      "__id__": 33
+      "__id__": 34
     },
     "rich_dialog": {
-      "__id__": 45
+      "__id__": 46
     },
     "rich_dialog1": {
-      "__id__": 27
+      "__id__": 28
     },
     "_id": ""
   },

+ 7 - 4
assets/resources/module/speedUpUI/productReward.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "completeImmediately",
+    "_name": "productReward",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -758,7 +758,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -1168,8 +1168,8 @@
     ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -1698,6 +1698,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lbl_times": {
+      "__id__": 34
+    },
     "_id": ""
   },
   {

+ 0 - 1
assets/script/game/game/Game.ts

@@ -236,7 +236,6 @@ export default class Game extends cc.Component {
 
         if (this.nodeRedPoint.node_redbagCash.active) {
             //mk.ui.closeAllUI();
-            mk.guide.open(2);
         }
     }
 

+ 3 - 2
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -71,7 +71,7 @@ export default class RedBagTask extends cc.Component {
 
     onDisable() {
         mk.ad.destoryBanner();
-        mk.guide.open(2);
+        mk.guide.open(3);
     }
 
     update(dt) {
@@ -109,8 +109,9 @@ export default class RedBagTask extends cc.Component {
 
                             this.node_value.active = true;
                             this.node_value.scale = 0;
-                            cc.tween(this.node_value).to(0.76, { scale: 1.3 }, cc.easeSineOut()).to(0.1, { scale: 1 }).call(()=>{
+                            cc.tween(this.node_value).to(0.76, { scale: 1.3 }, cc.easeSineOut()).to(0.1, { scale: 1 }).call(() => {
                                 this.openBtn_ani.node.active = true;
+                                mk.guide.open(2);
                             }).start();
                         }).start();
                     }

+ 3 - 3
assets/script/game/module/speedUpUI/ProductReward.ts

@@ -9,10 +9,10 @@ export default class ProductReward extends cc.Component {
 
     onEnable() {
         this.scheduleOnce(() => {
-            mk.guide.open(3);
+            mk.guide.open(4);
         }, 0.5)
 
-        this.lbl_times.string = `生产次数x${gData.gameData.configs.ProductionAd}`;
+        this.lbl_times.string = `生产次数x${gData.gameData.configs.ServerConfig.ProductionAd}`;
     }
 
     private clickVideoBtn() {
@@ -20,7 +20,7 @@ export default class ProductReward extends cc.Component {
         mk.ui.closePanel(this.node.name);
         mk.ad.watchAd((success: boolean) => {
             if (success) {
-                gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ProductionAd));
+                gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
             }
         })
     }

+ 2 - 0
assets/script/mk/system/GuideSystem.ts

@@ -19,6 +19,8 @@ export default class GuideSystem {
         // if (!cc.sys.isNative) {
         //     this.crtGuideID = 1;
         // }
+        //test
+        this.crtGuideID = 0
 
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");