feat: 优化关卡内 UI

assets/prefabs/PageHome.prefab

@@ -615,9 +615,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
+      "r": 255,
-      "g": 0,
+      "g": 255,
-      "b": 0,
+      "b": 255,
       "a": 255
     },
     "_string": "好友挑战",
@@ -730,7 +730,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__uuid__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -796,7 +796,7 @@
       "a": 255
     },
     "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__uuid__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_hoverSprite": {

assets/prefabs/PassModal.prefab

@@ -524,8 +524,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 169,
+      "width": 183,
-      "height": 155
+      "height": 183
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -561,7 +561,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@f9941",
+      "__uuid__": "1007bacb-29be-45cf-8dca-916a1fe37ed0@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/anims.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "09b6d346-4801-4fc1-98b2-263d09391750",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/anims/pagelevel.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "3eb4650d-3194-4beb-87e4-2556f561cf1d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/anims/pagelevel/skeleton.atlas

@@ -0,0 +1,34 @@
+
+skeleton.png
+size: 242,137
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+分针
+  rotate: false
+  xy: 151, 14
+  size: 37, 30
+  orig: 37, 34
+  offset: 0, 1
+  index: -1
+时针
+  rotate: true
+  xy: 190, 29
+  size: 15, 35
+  orig: 16, 35
+  offset: 0, 0
+  index: -1
+表盘
+  rotate: false
+  xy: 151, 46
+  size: 89, 89
+  orig: 89, 89
+  offset: 0, 0
+  index: -1
+钟1
+  rotate: false
+  xy: 2, 2
+  size: 147, 133
+  orig: 150, 133
+  offset: 0, 0
+  index: -1

assets/resources/anims/pagelevel/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "c769260a-0357-4bdb-b9ca-d5b4ef7662bd",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/anims/pagelevel/skeleton.json

@@ -0,0 +1,78 @@
+{
+"skeleton": {
+	"hash": "neT0krrJvEJNvDau6sqQ0GLqqto=",
+	"spine": "3.8.75",
+	"x": -65.99,
+	"y": -56.23,
+	"width": 126.84,
+	"height": 112.46,
+	"images": "",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root" },
+	{ "name": "bone3", "parent": "root" },
+	{ "name": "bone", "parent": "bone3", "x": 1.64 },
+	{ "name": "bone2", "parent": "bone3", "x": 1.4 },
+	{ "name": "bone4", "parent": "bone3" },
+	{ "name": "bone5", "parent": "bone3" }
+],
+"slots": [
+	{ "name": "表盘", "bone": "bone4", "attachment": "表盘" },
+	{ "name": "时针", "bone": "bone", "attachment": "时针" },
+	{ "name": "分针", "bone": "bone2", "attachment": "分针" },
+	{ "name": "钟1", "bone": "bone5", "attachment": "钟1" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"分针": {
+				"分针": { "x": 10.48, "y": -7.18, "width": 37, "height": 34 }
+			},
+			"时针": {
+				"时针": { "x": 0.53, "y": 10.75, "width": 16, "height": 35 }
+			},
+			"表盘": {
+				"表盘": { "width": 89, "height": 89 }
+			},
+			"钟1": {
+				"钟1": { "x": -2.58, "scaleX": 0.8456, "scaleY": 0.8456, "width": 150, "height": 133 }
+			}
+		}
+	}
+],
+"animations": {
+	"animation": {
+		"bones": {
+			"bone2": {
+				"rotate": [
+					{},
+					{ "time": 0.3333, "angle": 179 },
+					{ "time": 0.5, "angle": -90 },
+					{ "time": 0.6667 },
+					{ "time": 1, "angle": 179 },
+					{ "time": 1.2, "angle": -90 },
+					{ "time": 1.3333 }
+				]
+			},
+			"bone": {
+				"rotate": [
+					{},
+					{ "time": 0.6667, "angle": 179 },
+					{ "time": 1, "angle": -90 },
+					{ "time": 1.3333 }
+				]
+			},
+			"bone5": {
+				"rotate": [
+					{},
+					{ "time": 0.2667, "angle": 179 },
+					{ "time": 0.5333, "angle": -90 },
+					{ "time": 1 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/anims/pagelevel/skeleton.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "7ac2ecce-920d-4642-8388-2fb52bdaae74",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "c769260a-0357-4bdb-b9ca-d5b4ef7662bd"
+  }
+}

assets/resources/anims/pagelevel/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "933bb319-f065-47d9-93c4-e22ad7179ebb",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "933bb319-f065-47d9-93c4-e22ad7179ebb",
+        "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": "933bb319-f065-47d9-93c4-e22ad7179ebb@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 238,
+        "height": 133,
+        "rawWidth": 242,
+        "rawHeight": 137,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -119,
+            -66.5,
+            0,
+            119,
+            -66.5,
+            0,
+            -119,
+            66.5,
+            0,
+            119,
+            66.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            135,
+            240,
+            135,
+            2,
+            2,
+            240,
+            2
+          ],
+          "nuv": [
+            0.008264462809917356,
+            0.014598540145985401,
+            0.9917355371900827,
+            0.014598540145985401,
+            0.008264462809917356,
+            0.9854014598540146,
+            0.9917355371900827,
+            0.9854014598540146
+          ],
+          "minPos": [
+            -119,
+            -66.5,
+            0
+          ],
+          "maxPos": [
+            119,
+            66.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a"
+  }
+}

assets/resources/images/IconBack.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "91a0341c-75c1-4481-b294-09bd429ac2e2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a",
+      "displayName": "IconBack",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "91a0341c-75c1-4481-b294-09bd429ac2e2",
+        "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": "91a0341c-75c1-4481-b294-09bd429ac2e2@f9941",
+      "displayName": "IconBack",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 126,
+        "height": 77,
+        "rawWidth": 126,
+        "rawHeight": 77,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -63,
+            -38.5,
+            0,
+            63,
+            -38.5,
+            0,
+            -63,
+            38.5,
+            0,
+            63,
+            38.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            77,
+            126,
+            77,
+            0,
+            0,
+            126,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -63,
+            -38.5,
+            0
+          ],
+          "maxPos": [
+            63,
+            38.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a"
+  }
+}

assets/resources/images/pageLevel/IconTips.png.meta

@@ -42,10 +42,10 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0.5,
-        "offsetY": 0,
+        "offsetY": -1,
-        "trimX": 31,
+        "trimX": 24,
-        "trimY": 12,
+        "trimY": 13,
-        "width": 139,
+        "width": 153,
         "height": 176,
         "rawWidth": 200,
         "rawHeight": 200,
@@ -60,16 +60,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -69.5,
+            -76.5,
             -88,
             0,
-            69.5,
+            76.5,
             -88,
             0,
-            -69.5,
+            -76.5,
             88,
             0,
-            69.5,
+            76.5,
             88,
             0
           ],
@@ -82,32 +82,32 @@
             3
           ],
           "uv": [
-            31,
+            24,
-            188,
+            187,
-            170,
+            177,
-            188,
+            187,
-            31,
+            24,
-            12,
+            11,
-            170,
+            177,
-            12
+            11
           ],
           "nuv": [
-            0.155,
+            0.12,
-            0.06,
+            0.055,
-            0.85,
+            0.885,
-            0.06,
+            0.055,
-            0.155,
+            0.12,
-            0.94,
+            0.935,
-            0.85,
+            0.885,
-            0.94
+            0.935
           ],
           "minPos": [
-            -69.5,
+            -76.5,
             -88,
             0
           ],
           "maxPos": [
-            69.5,
+            76.5,
             88,
             0
           ]

assets/resources/images/pageLevel/确认 (1).png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6",
+  "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a",
+      "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a",
-      "displayName": "IconClock",
+      "displayName": "确认 (1)",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4c8c7576-d69c-4524-8add-07ad36a958c6",
+        "imageUuidOrDatabaseUri": "643e0054-884b-41cd-a3e1-7e638e0cb7be",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6@f9941",
+      "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be@f9941",
-      "displayName": "IconClock",
+      "displayName": "确认 (1)",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a",
+        "imageUuidOrDatabaseUri": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": true,
-    "redirect": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a"
+    "redirect": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a"
   }
 }

assets/resources/images/pageLevel/积分 (1).png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff",
+  "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a",
+      "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a",
-      "displayName": "IconLive",
+      "displayName": "积分 (1)",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff",
+        "imageUuidOrDatabaseUri": "1007bacb-29be-45cf-8dca-916a1fe37ed0",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,19 +34,19 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@f9941",
+      "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0@f9941",
-      "displayName": "IconLive",
+      "displayName": "积分 (1)",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": -0.5,
-        "offsetY": -2.5,
+        "offsetY": -0.5,
-        "trimX": 16,
+        "trimX": 8,
-        "trimY": 25,
+        "trimY": 9,
-        "width": 169,
+        "width": 183,
-        "height": 155,
+        "height": 183,
         "rawWidth": 200,
         "rawHeight": 200,
         "borderTop": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -84.5,
+            -91.5,
-            -77.5,
+            -91.5,
             0,
-            84.5,
+            91.5,
-            -77.5,
+            -91.5,
             0,
-            -84.5,
+            -91.5,
-            77.5,
+            91.5,
             0,
-            84.5,
+            91.5,
-            77.5,
+            91.5,
             0
           ],
           "indexes": [
@@ -82,38 +82,38 @@
             3
           ],
           "uv": [
-            16,
+            8,
-            175,
+            191,
-            185,
+            191,
-            175,
+            191,
-            16,
+            8,
-            20,
+            8,
-            185,
+            191,
-            20
+            8
           ],
           "nuv": [
-            0.08,
+            0.04,
-            0.1,
+            0.04,
-            0.925,
+            0.955,
-            0.1,
+            0.04,
-            0.08,
+            0.04,
-            0.875,
+            0.955,
-            0.925,
+            0.955,
-            0.875
+            0.955
           ],
           "minPos": [
-            -84.5,
+            -91.5,
-            -77.5,
+            -91.5,
             0
           ],
           "maxPos": [
-            84.5,
+            91.5,
-            77.5,
+            91.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a",
+        "imageUuidOrDatabaseUri": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": true,
-    "redirect": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a"
+    "redirect": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a"
   }
 }