Merge branch 'dev'

.gitignore

@@ -14,7 +14,7 @@ profiles/
 extensions/
 settings/
 preview-template/
-native
+native/
 #//////////////////////////
 # NPM
 #//////////////////////////

assets/bundle/gui/eliminate/texture/bg/bg11.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb@6c48a",
+      "displayName": "bg11",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb@f9941",
+      "displayName": "bg11",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 568,
+        "height": 300,
+        "rawWidth": 568,
+        "rawHeight": 300,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -284,
+            -150,
+            0,
+            284,
+            -150,
+            0,
+            -284,
+            150,
+            0,
+            284,
+            150,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            300,
+            568,
+            300,
+            0,
+            0,
+            568,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -284,
+            -150,
+            0
+          ],
+          "maxPos": [
+            284,
+            150,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "9d1882a5-d3d5-4c72-bbaa-2b26efe16beb@6c48a"
+  }
+}

assets/bundle/gui/eliminate/texture/icon_qsnbh.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "51d80e39-2819-4b51-9d32-03744ae3281f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "51d80e39-2819-4b51-9d32-03744ae3281f@6c48a",
+      "displayName": "icon_qsnbh",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "51d80e39-2819-4b51-9d32-03744ae3281f",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "51d80e39-2819-4b51-9d32-03744ae3281f@f9941",
+      "displayName": "icon_qsnbh",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -0.5,
+        "offsetY": -9.5,
+        "trimX": 2,
+        "trimY": 20,
+        "width": 235,
+        "height": 203,
+        "rawWidth": 240,
+        "rawHeight": 224,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -117.5,
+            -101.5,
+            0,
+            117.5,
+            -101.5,
+            0,
+            -117.5,
+            101.5,
+            0,
+            117.5,
+            101.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            204,
+            237,
+            204,
+            2,
+            1,
+            237,
+            1
+          ],
+          "nuv": [
+            0.008333333333333333,
+            0.004464285714285714,
+            0.9875,
+            0.004464285714285714,
+            0.008333333333333333,
+            0.9107142857142857,
+            0.9875,
+            0.9107142857142857
+          ],
+          "minPos": [
+            -117.5,
+            -101.5,
+            0
+          ],
+          "maxPos": [
+            117.5,
+            101.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "51d80e39-2819-4b51-9d32-03744ae3281f@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "51d80e39-2819-4b51-9d32-03744ae3281f@6c48a"
+  }
+}

assets/bundle/gui/eliminate/texture/icon_sltx.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "575dd6b1-b8c6-4131-a61c-2fc2019cc256",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "575dd6b1-b8c6-4131-a61c-2fc2019cc256@6c48a",
+      "displayName": "icon_sltx",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "575dd6b1-b8c6-4131-a61c-2fc2019cc256",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "575dd6b1-b8c6-4131-a61c-2fc2019cc256@f9941",
+      "displayName": "icon_sltx",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 66,
+        "height": 84,
+        "rawWidth": 66,
+        "rawHeight": 84,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -33,
+            -42,
+            0,
+            33,
+            -42,
+            0,
+            -33,
+            42,
+            0,
+            33,
+            42,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            84,
+            66,
+            84,
+            0,
+            0,
+            66,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -33,
+            -42,
+            0
+          ],
+          "maxPos": [
+            33,
+            42,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "575dd6b1-b8c6-4131-a61c-2fc2019cc256@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "575dd6b1-b8c6-4131-a61c-2fc2019cc256@6c48a"
+  }
+}

assets/bundle/gui/eliminate/texture/title/title_qsnbh.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "559772ec-0fe6-4004-8bba-bc2c3c745b24",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "559772ec-0fe6-4004-8bba-bc2c3c745b24@6c48a",
+      "displayName": "title_qsnbh",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "559772ec-0fe6-4004-8bba-bc2c3c745b24",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "559772ec-0fe6-4004-8bba-bc2c3c745b24@f9941",
+      "displayName": "title_qsnbh",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 4,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 548,
+        "height": 116,
+        "rawWidth": 548,
+        "rawHeight": 124,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -274,
+            -58,
+            0,
+            274,
+            -58,
+            0,
+            -274,
+            58,
+            0,
+            274,
+            58,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            124,
+            548,
+            124,
+            0,
+            8,
+            548,
+            8
+          ],
+          "nuv": [
+            0,
+            0.06451612903225806,
+            1,
+            0.06451612903225806,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -274,
+            -58,
+            0
+          ],
+          "maxPos": [
+            274,
+            58,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "559772ec-0fe6-4004-8bba-bc2c3c745b24@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "559772ec-0fe6-4004-8bba-bc2c3c745b24@6c48a"
+  }
+}

assets/bundle/gui/loading/loading.prefab

@@ -31,17 +31,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 103
       },
       {
-        "__id__": 89
+        "__id__": 105
       },
       {
-        "__id__": 91
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 109
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -140,7 +140,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -290,7 +290,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -527.1500000000001,
+      "y": -610.037,
       "z": 0
     },
     "_lrot": {
@@ -346,7 +346,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 74.13,
+      "y": 55.25,
       "z": 0
     },
     "_lrot": {
@@ -386,8 +386,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 164,
-      "height": 54.4
+      "width": 84,
+      "height": 29.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -425,10 +425,10 @@
     "_string": "状态提示",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 20,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -988,7 +988,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 238.85000000000008,
+    "_bottom": 155.9629999999999,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1033,22 +1033,25 @@
         "__id__": 47
       },
       {
-        "__id__": 55
+        "__id__": 63
+      },
+      {
+        "__id__": 71
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -540.647,
+      "y": -458.546,
       "z": 0
     },
     "_lrot": {
@@ -1076,28 +1079,418 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_wxlogin",
+    "_name": "tipsNode",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 46
     },
+    "_children": [
+      {
+        "__id__": 48
+      },
+      {
+        "__id__": 54
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 60
+      }
+    ],
+    "_prefab": {
+      "__id__": 62
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -176.671,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon_sltx",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 47
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       },
       {
-        "__id__": 50
+        "__id__": 51
+      }
+    ],
+    "_prefab": {
+      "__id__": 53
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 247.961,
+      "y": 29.244,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 50
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 66,
+      "height": 84
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "530wamw/REwoRvS+B8IjMZ"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 52
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "575dd6b1-b8c6-4131-a61c-2fc2019cc256@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "07r/zjONNMY5XaURDU7j6h"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "418uAmfUxFcb9ZhCJ4NZAp",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 47
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 55
       },
       {
-        "__id__": 52
+        "__id__": 57
       }
     ],
     "_prefab": {
+      "__id__": 59
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -30.052,
+      "y": 26.974,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 54
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 56
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 470,
+      "height": 97.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a2Tv1an/tJepq+1lE2hXX4"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
       "__id__": 54
     },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 58
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 160,
+      "g": 160,
+      "b": 160,
+      "a": 255
+    },
+    "_string": "健康游戏忠告，抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 30,
+    "_overflow": 3,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8aZNE6ocBAXafyaoPepdkN"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "058aOWzOpP/Zdp+Zc3Ih47",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 47
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 61
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 200
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4fkksrIbFIx4VmYou2uBfx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "804zwwZwtCVIjDO6o0IbP+",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_wxlogin",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 46
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 68
+      }
+    ],
+    "_prefab": {
+      "__id__": 70
+    },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -1133,11 +1526,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1161,11 +1554,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 67
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1206,11 +1599,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 69
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1250,7 +1643,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 47
+      "__id__": 63
     },
     "_id": ""
   },
@@ -1281,28 +1674,28 @@
     },
     "_children": [
       {
-        "__id__": 56
+        "__id__": 72
       },
       {
-        "__id__": 71
+        "__id__": 87
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 95
       },
       {
-        "__id__": 81
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -26.723,
+      "x": -22.533,
+      "y": -21.802,
       "z": 0
     },
     "_lrot": {
@@ -1334,27 +1727,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 55
+      "__id__": 71
     },
     "_children": [
       {
-        "__id__": 57
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 79
       },
       {
-        "__id__": 65
+        "__id__": 81
       },
       {
-        "__id__": 67
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1391,20 +1784,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 56
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 74
       },
       {
-        "__id__": 60
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1441,11 +1834,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1469,11 +1862,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1527,11 +1920,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1555,11 +1948,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 82
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1600,11 +1993,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 84
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1644,16 +2037,16 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 56
+      "__id__": 72
     },
     "checkEvents": [
       {
-        "__id__": 69
+        "__id__": 85
       }
     ],
     "_isChecked": true,
     "_checkMark": {
-      "__id__": 60
+      "__id__": 76
     },
     "_id": ""
   },
@@ -1690,27 +2083,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 55
+      "__id__": 71
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 88
       },
       {
-        "__id__": 74
+        "__id__": 90
       },
       {
-        "__id__": 76
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 24.818,
+      "x": 37,
       "y": -0.65,
       "z": 0
     },
@@ -1743,15 +2136,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 552,
+      "width": 576,
       "height": 30.240000000000002
     },
     "_anchorPoint": {
@@ -1771,14 +2164,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 91
     },
     "_lineHeight": 24,
-    "_string": "登录代表同意连赚方块<on click=\"onClicked\" param=\"User Agreement\"><color=#5C9CE9>《用户协议》</color></on>和<on click=\"onClicked\" param=\"Privacy Policy\"><color=#5C9CE9>《隐私政策》</color></on>",
+    "_string": "登录即代表同意连赚方块<on click=\"onClicked\" param=\"User Agreement\"><color=#5C9CE9>《用户协议》</color></on>和<on click=\"onClicked\" param=\"Privacy Policy\"><color=#5C9CE9>《隐私政策》</color></on>",
     "_horizontalAlign": 0,
     "_verticalAlign": 0,
     "_fontSize": 24,
@@ -1809,11 +2202,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 93
     },
     "_id": ""
   },
@@ -1840,11 +2233,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1868,11 +2261,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 98
     },
     "_resizeMode": 0,
     "_layoutType": 1,
@@ -1886,7 +2279,7 @@
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": 20,
+    "_spacingX": 10,
     "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
@@ -1923,7 +2316,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 101
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1964,12 +2357,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 104
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1992,7 +2385,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 106
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2028,7 +2421,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 108
     },
     "_id": ""
   },

assets/script/game/common/config/GameUIConfig.ts

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-08-12 09:33:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-28 17:09:35
+ * @LastEditTime: 2025-05-06 15:29:23
  */
 import { LayerType, UIConfig } from "../../../../../extensions/oops-plugin-framework/assets/core/gui/layer/LayerManager";
 
@@ -106,5 +106,4 @@ export var UIConfigData: { [key: number]: UIConfig } = {
 
 
 
-
 }

assets/script/game/common/manager/ADHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:14:44
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-30 17:36:00
+ * @LastEditTime: 2025-05-06 15:20:55
  * @Description: 
  */
 // ADHandler.ts
@@ -81,6 +81,7 @@ export class ADHandler {
         if (oops.gui.has(UIID.KindTips)) oops.gui.remove(UIID.KindTips);
         if (oops.gui.has(UIID.Retention)) oops.gui.remove(UIID.Retention);
         ServerHandler.inst.getAccountInfo();
+        LoginHandler.inst.openChildProtection();
     };
 
     adSplashLoadFailed = () => {
@@ -88,6 +89,7 @@ export class ADHandler {
         console.log('[广告] 启屏广告加载失败');
         ServerHandler.inst.getAccountInfo();
         //加载实名认证
+        LoginHandler.inst.openChildProtection();
     };
 
     //插屏广告展示的时候也要暂停

assets/script/game/common/manager/LoginHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:15:45
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-30 18:32:37
+ * @LastEditTime: 2025-05-06 10:32:01
  * @Description: 登录管理
  */
 // LoginHandler.ts
@@ -99,6 +99,27 @@ export class LoginHandler {
         DCHandler.inst.reportData(3000004, 1002);
     }
 
+
+    /**打开防沉迷*/
+    openChildProtection() {
+        const param = {
+            callback: {
+                onSuccess: 'LoginHandler.inst.openChildProtectionSuccess',
+                onFail: 'LoginHandler.inst.openChildProtectionFail'
+            }
+        }
+        const data = { method: 'sdk.realname.start', param: JSON.stringify(param) };
+        CocosHandler.inst.sendMessageToAndroid(data, '打开防沉迷');
+    }
+
+    openChildProtectionSuccess(str: string) {
+        console.log('[防沉迷] 打开成功', str);
+    }
+
+    openChildProtectionFail(str: number) {
+        console.log('[防沉迷] 打开失败', str);
+    }
+
 }
 
 window["LoginHandler"] = LoginHandler;

assets/script/game/common/tips/KindTipsView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 18:02:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-27 16:51:29
+ * @LastEditTime: 2025-05-06 10:52:05
  * @Description: 温馨提示弹窗
  */
 import { _decorator } from 'cc';
@@ -27,10 +27,9 @@ export class KindTipsView extends GameComponent {
         DCHandler.inst.reportData(3000000)
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
             LoginHandler.inst.savePrivacyStatus(true);
+            //加载实名制保护
             this.scheduleOnce(() => {
                 ADHandler.inst.showAd(AD_TYPE.Start);
-                //先关闭，同意直接进游戏
-                // ServerHandler.inst.getAccountInfo();
                 oops.gui.remove(UIID.KindTips);
             }, 0.2)
         }

assets/script/game/common/tips/RetentionView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 18:02:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-27 09:53:39
+ * @LastEditTime: 2025-05-06 14:31:15
  * @Description: 隐私挽留弹窗
  */
 import { _decorator, game } from 'cc';

assets/script/game/initialize/view/LoadingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 16:23:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-30 18:33:30
+ * @LastEditTime: 2025-05-06 16:46:56
  * @Description: loading界面
  */
 import { _decorator, Toggle } from "cc";
@@ -126,7 +126,6 @@ export class LoadingViewComp extends CCVMParentComp {
     private onProgressCallback(finished: number, total: number, item: any) {
         this.data.finished = finished;
         this.data.total = total;
-
         var progress = finished / total;
         if (progress > this.progress) {
             this.progress = progress;
@@ -139,7 +138,6 @@ export class LoadingViewComp extends CCVMParentComp {
         // 获取用户信息的多语言提示文本
         this.data.prompt = oops.language.getLangByID("loading_load_player");
         await ModuleUtil.addViewUiAsync(smc.account, EliminateViewComp, UIID.Eliminate);
-        // await ModuleUtil.addViewUiAsync(smc.account, EliminateView, UIID.Eliminate);
         ModuleUtil.removeViewUi(this.ent, LoadingViewComp, UIID.Loading);
     }
 
@@ -167,12 +165,11 @@ export class LoadingViewComp extends CCVMParentComp {
         if (wxNode) {
             wxNode.active = state;
         }
-
-        //load条相反
         const loadNode = this.node.getChildByName("pro_progress");
         if (loadNode) {
             loadNode.active = !state;
         }
+
     }
 
 
@@ -201,11 +198,4 @@ export class LoadingViewComp extends CCVMParentComp {
     }
 
     reset(): void { }
-
-
-    /**
-     * 保存关卡，分数，目标分数
-     * 
-     * 
-    */
 }

native/engine/android/app/src/main/assets/ysdkconf.ini

@@ -1,9 +1,9 @@
 ;**************游戏相关配置, 游戏需要根据各自情况修改 START **********
 ;游戏的QQAPPID
-QQ_APP_ID=11122180511
+QQ_APP_ID=11122180522
 
 ;游戏的OFFER_ID
-OFFER_ID=11122180511
+OFFER_ID=11122180522
 ;***************游戏配置项, 游戏需要根据各自情况修改 END **************
 
 ;************* YSDK相关配置项,游戏需要根据各自情况修改 START **********