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

assets/resources/data/guide_data.json

@@ -7,7 +7,7 @@
 		"dialogPos": ":0::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
+		"dialog": "<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "",
@@ -21,7 +21,7 @@
 		"dialogPos": "300:::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>“任务红包”开启\n完成任务可立即提现</color>",
+		"dialog": "<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
 		"finger": "100:20",
@@ -35,7 +35,7 @@
 		"dialogPos": ":300::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>完成任务必得现金，最\n高可以提现100元哦！</color>",
+		"dialog": "<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>",
 		"displayRect": "0:200:500:300",
 		"clickRect": "all",
 		"finger": "100:-100",
@@ -49,7 +49,7 @@
 		"dialogPos": ":200::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>点击生产，即可种植农\n作物，获得红包币哦</color>",
+		"dialog": "<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
@@ -63,7 +63,7 @@
 		"dialogPos": ":0::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>点击生产，即可种植农\n作物，获得红包币哦</color>",
+		"dialog": "<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>",
 		"displayRect": "0:107:588:850",
 		"clickRect": "event",
 		"finger": "100:-350",
@@ -77,7 +77,7 @@
 		"dialogPos": "300:::::",
 		"dialogPos1": "",
 		"dialogAlignment": "1",
-		"dialog": "<color=476175>太棒啦！你完成了任务！\n快点击提现吧~</color>",
+		"dialog": "<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
 		"finger": "100:20",

assets/resources/module/guide/guide.prefab

@@ -969,7 +969,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "66bBW5QxRGtr9rdfCeGS8j",
+    "fileId": "addpYT/TBG5LL/d9tohWg6",
     "sync": false
   },
   {
@@ -1080,7 +1080,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "17Y+/D9KhAuI9URZowezWk",
+    "fileId": "22WOK1W4dNFawHZkQfwM9O",
     "sync": false
   },
   {
@@ -1628,7 +1628,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "1bJQaSv6BM6aV66VBVuqHB",
+    "fileId": "48S3PF6pxIhKAFa2Lzd34b",
     "sync": false
   },
   {
@@ -1739,7 +1739,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "5bbnoLtd1NLKv2XWy8M6jd",
+    "fileId": "9dp6C2l9JHVYtA5gXO1Mox",
     "sync": false
   },
   {
@@ -1936,8 +1936,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 177,
+      "height": 56
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1948,15 +1948,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        284.819,
-        609.038,
+        266.009,
+        614.638,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        0.8,
+        0.8,
         1
       ]
     },
@@ -2007,8 +2007,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 177,
+      "height": 56
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2168,10 +2168,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+      "__uuid__": "e321eb57-ae0f-430b-b6e7-6838cc0fbc50"
     },
-    "_type": 1,
-    "_sizeMode": 0,
+    "_type": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2331,7 +2331,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": 37.96199999999999,
+    "_top": 29.96199999999999,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,

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

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "7c2d0a53-975f-4c53-a156-b7aa17e4cb33",
+  "uuid": "aacede80-180e-48f6-ab8a-009c9f626349",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 128,
-  "height": 127,
+  "width": 177,
+  "height": 56,
   "platformSettings": {},
   "subMetas": {
-    "head": {
+    "btnSkip": {
       "ver": "1.0.4",
-      "uuid": "c534a35a-73aa-40ef-92eb-f7d632dde418",
-      "rawTextureUuid": "7c2d0a53-975f-4c53-a156-b7aa17e4cb33",
+      "uuid": "e321eb57-ae0f-430b-b6e7-6838cc0fbc50",
+      "rawTextureUuid": "aacede80-180e-48f6-ab8a-009c9f626349",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 128,
-      "height": 127,
-      "rawWidth": 128,
-      "rawHeight": 127,
+      "width": 177,
+      "height": 56,
+      "rawWidth": 177,
+      "rawHeight": 56,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/login/agreementTip.prefab

@@ -1225,7 +1225,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -176.418,
+        -63.879,
         0,
         0,
         0,
@@ -1640,7 +1640,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -1895,22 +1895,75 @@
     "sync": false
   },
   {
-    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 44
     },
     "_enabled": true,
-    "panel_name": "game/prefab/game",
-    "bool_Auth": false,
-    "open_type": 0,
-    "transition_type": 3,
-    "onComplete": [
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
       {
         "__id__": 53
       }
     ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_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": null,
     "_id": ""
   },
   {
@@ -1920,7 +1973,7 @@
     },
     "component": "",
     "_componentId": "27e8eZbIM9ApIU8LRLiALwU",
-    "handler": "clickClose",
+    "handler": "clickAgree",
     "customEventData": ""
   },
   {
@@ -2021,8 +2074,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/script/game/module/agreementTip/agreementTip.ts

@@ -1,3 +1,4 @@
+import { OpenActionType } from "../../../mk/system/UISystem";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -29,5 +30,11 @@ export default class agreementTip extends cc.Component {
     private clickClose() {
         mk.ui.closePanel(this.node.name);
     }
+
+    private clickAgree() {
+        mk.ui.closePanel(this.node.name);
+        let node = cc.find('Canvas/主界面层');
+        mk.ui.openPanel("game/prefab/game", OpenActionType.normal, node);
+    }
     // update (dt) {}
 }

assets/script/mk/system/GuideSystem.ts

@@ -12,12 +12,13 @@ export default class GuideSystem {
 
     public open(id) {
         this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
+        if (this.crtGuideID == undefined) {
+            this.crtGuideID = 0;
+        }
         // //测试永远新手引导，永远第一关
         // if (!cc.sys.isNative) {
         //     this.crtGuideID = 1;
         // }
-        // //test
-        // this.crtGuideID = 0;
 
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");