1，隐私协议换皮肤

2，新手引导优化

assets/resources/module/hotUpdate.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "27ca9321-290b-4769-b0e6-bd95cdf80996",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/agreementTip/agreementTip.prefab → assets/resources/module/login/agreementTip.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 56
       },
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -107,20 +107,17 @@
         "__id__": 36
       },
       {
-        "__id__": 39
-      },
-      {
         "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -196,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 671,
-      "height": 422
+      "width": 630,
+      "height": 608
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -249,7 +246,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "429a1d4b-5117-4390-af51-840edb26f400"
+      "__uuid__": "00220b88-1f47-4efe-b465-ebd263bb4e31"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -316,7 +313,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        277.38800000000003,
+        356,
         0,
         0,
         0,
@@ -474,14 +471,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 630,
+      "width": 550,
       "height": 130.39999999999998
     },
     "_anchorPoint": {
@@ -493,8 +490,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.203,
-        -33.31,
+        0,
+        -33.195,
         0,
         0,
         0,
@@ -612,7 +609,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -153.761,
+        -178,
         0,
         0,
         0,
@@ -745,6 +742,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -795,9 +793,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
@@ -992,6 +990,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -1085,14 +1084,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 630,
+      "width": 550,
       "height": 90.39999999999999
     },
     "_anchorPoint": {
@@ -1104,8 +1103,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.203,
-        -193.633,
+        0,
+        -240,
         0,
         0,
         0,
@@ -1186,7 +1185,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "line",
+    "_name": "fenge",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -1201,18 +1200,18 @@
     "_prefab": {
       "__id__": 35
     },
-    "_opacity": 80,
+    "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 667.38,
-      "height": 50.4
+      "width": 630,
+      "height": 1
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1224,7 +1223,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        13,
+        -84,
         0,
         0,
         0,
@@ -1249,7 +1248,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1263,22 +1262,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "______________________________",
-    "_N$string": "______________________________",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 0,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
+    "_spriteFrame": {
+      "__uuid__": "522750f7-15e0-4c9e-a6de-de36ba71c076"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -1289,55 +1287,58 @@
     "asset": {
       "__uuid__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
     },
-    "fileId": "04JPmIPsdO243oj5GdKa9H",
+    "fileId": "09800PjsZIfIxhYdvrqEkz",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "line",
+    "_name": "btnDisAgree",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 37
+      },
+      {
+        "__id__": 40
       }
     ],
+    "_active": true,
+    "_components": [],
     "_prefab": {
-      "__id__": 38
+      "__id__": 43
     },
-    "_opacity": 80,
+    "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 196,
+      "g": 164,
+      "b": 164,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 88.98,
-      "height": 50.4
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
+        -157.5,
+        -140,
         0,
-        -53.137,
         0,
         0,
         0,
-        0.7071067811865475,
-        0.7071067811865476,
+        1,
         1,
         1,
         1
@@ -1347,7 +1348,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 90
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1357,78 +1358,34 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 36
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "____",
-    "_N$string": "____",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 0,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
-    },
-    "fileId": "5arLCWl/ZF3ZY6D/39f6iz",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "btnDisAgree",
+    "_name": "button1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 36
     },
-    "_children": [
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
-        "__id__": 40
+        "__id__": 38
       }
     ],
-    "_active": true,
-    "_components": [],
     "_prefab": {
-      "__id__": 43
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 239,
+      "g": 243,
+      "b": 246,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 100
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1439,14 +1396,14 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -149.556,
-        -48,
+        0,
+        0,
         0,
         0,
         0,
         0,
         1,
-        1,
+        -1,
         1,
         1
       ]
@@ -1465,11 +1422,54 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 37
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "449b7886-bda3-4585-a330-1c59d7691e85"
+    },
+    "_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__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
+    },
+    "fileId": "03y8p3FClCbaTaUzM0GvOl",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
     "_name": "btnDisAgree",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
@@ -1484,9 +1484,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 119,
+      "g": 119,
+      "b": 119,
       "a": 255
     },
     "_contentSize": {
@@ -1593,29 +1593,32 @@
     "_children": [
       {
         "__id__": 45
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 5,
-      "g": 149,
-      "b": 173,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 250,
-      "height": 100
+      "width": 315,
+      "height": 111
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1626,8 +1629,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        158.76,
-        -48,
+        157.5,
+        -140,
         0,
         0,
         0,
@@ -1653,7 +1656,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btnAgree",
+    "_name": "button",
     "_objFlags": 0,
     "_parent": {
       "__id__": 44
@@ -1671,9 +1674,116 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 5,
-      "g": 149,
-      "b": 173,
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 315,
+      "height": 111
+    },
+    "_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__": 45
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "545c017d-33f6-443b-9531-f6613e179357"
+    },
+    "_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__": "4956c4bd-97ee-4fc4-95a3-ab26cc89cc8e"
+    },
+    "fileId": "c5KvYbSSpJMKTHAS19bV3b",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnAgree",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 44
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
@@ -1720,7 +1830,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1768,11 +1878,12 @@
     },
     "_enabled": true,
     "panel_name": "game/prefab/game",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_id": ""

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

@@ -107,6 +107,11 @@ export default class Guide extends cc.Component {
 
             //显示区域由大到小动画
             if (x != null && y != null && w != null && h != null) {
+                //先重置
+                this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
+                this.node_display.width = this.node.width;
+                this.node_display.height = this.node.height;
+                //动画
                 cc.tween(this.node_display)
                     .to(0.3, { x: x, y: y, width: w, height: h }, {
                         onUpdate: () => {

assets/script/game/module/login/Login.ts

@@ -50,7 +50,7 @@ export default class Login extends cc.Component {
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
                 if (gData.gameData.isNewPlayer()) {
-                    mk.ui.openPanel("module/agreementTip/agreementTip");
+                    mk.ui.openPanel("module/login/agreementTip");
                 }
                 else {
                     mk.ui.openPanel("game/prefab/game");

assets/script/mk/system/GuideSystem.ts

@@ -10,8 +10,9 @@ export default class GuideSystem {
 
     public open(id) {
         this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
-        if(!cc.sys.isNative){
+        if (!cc.sys.isNative) {
             this.crtGuideID = 0;//测试无限新手引导
+            gData.gameData.setProp(GameProp.levelNum, 0);
         }
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");