新手引导修改

assets/resources/data/guide_data.json

@@ -6,12 +6,12 @@
 		"trForm": "2",
 		"dialogPos": ":0::::",
 		"dialogPos1": "",
-		"dialogAlignment": "1",
+		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "",
-		"lagNext": "0"
+		"lagNext": "1"
 	},
 	{
 		"id": "1_2",
@@ -34,7 +34,7 @@
 		"trForm": "1",
 		"dialogPos": ":300::::",
 		"dialogPos1": "",
-		"dialogAlignment": "1",
+		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>",
 		"displayRect": "0:200:500:300",
 		"clickRect": "all",
@@ -48,7 +48,7 @@
 		"trForm": "1",
 		"dialogPos": ":200::::",
 		"dialogPos1": "",
-		"dialogAlignment": "1",
+		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
@@ -59,14 +59,14 @@
 		"id": "4_1",
 		"trigger": "1",
 		"trNum": "0",
-		"trForm": "1",
+		"trForm": "3",
 		"dialogPos": ":0::::",
 		"dialogPos1": "",
-		"dialogAlignment": "1",
-		"dialog": "<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>",
-		"displayRect": "0:107:588:850",
-		"clickRect": "event",
-		"finger": "100:-350",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>",
+		"displayRect": "",
+		"clickRect": "all",
+		"finger": "100:-250",
 		"lagNext": "1"
 	},
 	{
@@ -76,7 +76,7 @@
 		"trForm": "1",
 		"dialogPos": "300:::::",
 		"dialogPos1": "",
-		"dialogAlignment": "1",
+		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",

assets/resources/module/guide/guide.prefab

@@ -768,7 +768,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -227.732,
+        -181.396,
         -4.247,
         0,
         0,
@@ -824,7 +824,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 486,
+      "width": 395,
       "height": 129
     },
     "_anchorPoint": {
@@ -836,8 +836,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        342.592,
-        85.709,
+        297,
+        86,
         0,
         0,
         0,
@@ -895,7 +895,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 330,
       "height": 112.99999999999999
     },
     "_anchorPoint": {
@@ -907,8 +907,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        18.340000000000003,
-        4.12,
+        18.928,
+        4,
         0,
         0,
         0,
@@ -959,7 +959,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 330,
+      "width": 240,
       "height": 63
     },
     "_anchorPoint": {
@@ -971,7 +971,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -200,
+        -165,
         -6.499999999999993,
         0,
         0,
@@ -1012,8 +1012,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "欢迎来到《开心农乐园》",
-    "_N$string": "欢迎来到《开心农乐园》",
+    "_string": "“任务红包”开启",
+    "_N$string": "“任务红包”开启",
     "_fontSize": 30,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -1040,7 +1040,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "b5XgciLExLfq5O7/lsnfnG",
+    "fileId": "bajmhQRVdNwpwZzYUe70Ce",
     "sync": false
   },
   {
@@ -1070,7 +1070,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 377.93,
+      "width": 270,
       "height": 63
     },
     "_anchorPoint": {
@@ -1082,7 +1082,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -200,
+        -165,
         -56.49999999999999,
         0,
         0,
@@ -1123,8 +1123,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "让我带你了解农场的玩法吧~",
-    "_N$string": "让我带你了解农场的玩法吧~",
+    "_string": "完成任务可立即提现",
+    "_N$string": "完成任务可立即提现",
     "_fontSize": 30,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -1151,7 +1151,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f0IOWo9XJF3KmKahIq9GMq",
+    "fileId": "88nZN95FREM4qFNWKakt8/",
     "sync": false
   },
   {
@@ -1164,14 +1164,14 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": false,
-    "_N$string": "<color=#000000>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
+    "_N$string": "<color=#000000>“任务红包”开启\n完成任务可立即提现</color>",
     "_N$horizontalAlign": 0,
     "_N$fontSize": 30,
     "_N$font": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
     },
     "_N$cacheMode": 0,
-    "_N$maxWidth": 400,
+    "_N$maxWidth": 330,
     "_N$lineHeight": 50,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": false,
@@ -1289,7 +1289,7 @@
         "__id__": 38
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 50
@@ -1599,7 +1599,7 @@
       "__id__": 39
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 41
@@ -1618,7 +1618,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 330,
+      "width": 311.02,
       "height": 63
     },
     "_anchorPoint": {
@@ -1671,8 +1671,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "欢迎来到《开心农乐园》",
-    "_N$string": "欢迎来到《开心农乐园》",
+    "_string": "再生产1次，即可获得任",
+    "_N$string": "再生产1次，即可获得任",
     "_fontSize": 30,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -1699,7 +1699,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "5bDVwIQppCi7rPW8XOa9uC",
+    "fileId": "94Qnh/35lGDo9G2jagnGcA",
     "sync": false
   },
   {
@@ -1710,7 +1710,7 @@
       "__id__": 39
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 44
@@ -1729,7 +1729,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 377.93,
+      "width": 330,
       "height": 63
     },
     "_anchorPoint": {
@@ -1782,8 +1782,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "让我带你了解农场的玩法吧~",
-    "_N$string": "让我带你了解农场的玩法吧~",
+    "_string": "务红包，快领取次数吧！",
+    "_N$string": "务红包，快领取次数吧！",
     "_fontSize": 30,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -1810,7 +1810,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f2hm9vEmVLN5wgkCQm0n8u",
+    "fileId": "07SKCTn4xPA6WdM4cg4luw",
     "sync": false
   },
   {
@@ -1823,8 +1823,8 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": false,
-    "_N$string": "<color=#000000>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
-    "_N$horizontalAlign": 0,
+    "_N$string": "<color=#000000>再生产1次，即可获得任\n务红包，快领取次数吧！</color>",
+    "_N$horizontalAlign": 1,
     "_N$fontSize": 30,
     "_N$font": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
@@ -2192,8 +2192,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "跳过",
-    "_N$string": "跳过",
+    "_string": "",
+    "_N$string": "",
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": false,

assets/resources/module/guide/texture/btnSkip.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 177,
-  "height": 56,
+  "width": 142,
+  "height": 46,
   "platformSettings": {},
   "subMetas": {
     "btnSkip": {

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

@@ -205,6 +205,7 @@ export default class Guide extends cc.Component {
 
             //对话文字对齐方式
             let a = this.crtGuide.dialog_alignment;
+            this.rich_dialog.horizontalAlign = a == '0' ? cc.macro.TextAlignment.LEFT : (a == '1' ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT);
             this.rich_dialog1.horizontalAlign = a == '0' ? cc.macro.TextAlignment.LEFT : (a == '1' ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT);
 
             if (this.crtGuide.finger == "") {
@@ -217,11 +218,17 @@ export default class Guide extends cc.Component {
                 this.node_finger.y = y + parseInt(arr[1]);
             }
 
-            if (this.crtGuide.tr_form == 1) {
+            if (this.crtGuide.tr_form == 3 || this.crtGuide.tr_form == 4) {
+                this.node_bg.opacity = 0;
+                this.node_click['_touchListener'].swallowTouches = false;
+                this.node_bg['_touchListener'].swallowTouches = false;
+            }
+
+            if (this.crtGuide.tr_form == 1 || this.crtGuide.tr_form == 3) {
                 this.node_head.node.active = true;
                 this.node_person.active = false;
             }
-            else {
+            else if (this.crtGuide.tr_form == 2 || this.crtGuide.tr_form == 4) {
                 this.node_head.node.active = false;
                 this.node_person.active = true;
             }
@@ -262,6 +269,8 @@ export default class Guide extends cc.Component {
         this.node_click.height = 0;
         this.node_finger.opacity = 0;
         this.node_dialog.opacity = 0;
+        this.node_click['_touchListener'].swallowTouches = true;
+        this.node_bg['_touchListener'].swallowTouches = true;
     }
 
 

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

@@ -7,7 +7,7 @@ export default class GuideVO {
     trigger: number;
     /** 触发条件的数据 如当trigger是关卡时关卡时，为触发关卡 */
     tr_num: number;
-    /** 1头像 2形象 */
+    /** 1头像 2形象 3头像加透明底 4形象加透明底 */
     tr_form: number;
     /** 对话内容 */
     dialog: string;

assets/script/mk/system/GuideSystem.ts

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