future 1 ano atrás
pai
commit
89dbbf09ff

+ 55 - 67
assets/resources/prefabs/setting.prefab

@@ -317,8 +317,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 0.4,
+      "y": 0.4,
       "z": 1
     },
     "_mobility": 0,
@@ -565,7 +565,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 124.19,
+      "y": 63,
       "z": 0
     },
     "_lrot": {
@@ -614,7 +614,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -250.66,
+      "x": -240,
       "y": 0,
       "z": 0
     },
@@ -655,8 +655,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
-      "height": 90
+      "width": 80,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -692,12 +692,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74@f9941",
+      "__uuid__": "ed13c82c-cf63-4da6-aa8c-18f853ca346f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -750,7 +750,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -41.05,
+      "x": -45,
       "y": 0,
       "z": 0
     },
@@ -791,8 +791,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 25.2
+      "width": 49.99622205573121,
+      "height": 25.200000000000003
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -822,16 +822,16 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 83,
-      "b": 88,
+      "r": 124,
+      "g": 69,
+      "b": 54,
       "a": 255
     },
     "_string": "音效",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 31.342364532019708,
+    "_fontSize": 25,
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_overflow": 0,
@@ -893,7 +893,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 235.733,
+      "x": 210,
       "y": 0,
       "z": 0
     },
@@ -984,8 +984,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 156,
-      "height": 69
+      "width": 135,
+      "height": 65
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1021,12 +1021,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "ea5da13d-72d9-4c40-a299-8f642afcaed9@f9941",
+      "__uuid__": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1070,8 +1070,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 159,
-      "height": 69
+      "width": 135,
+      "height": 65
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1107,12 +1107,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
+      "__uuid__": "c92df56f-050e-448b-a815-e3aaeeea5e35@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1172,10 +1172,7 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
@@ -1258,10 +1255,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 2,
@@ -1328,7 +1322,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -99.007,
+      "y": -93,
       "z": 0
     },
     "_lrot": {
@@ -1377,7 +1371,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -250.66000000000008,
+      "x": -240,
       "y": 0,
       "z": 0
     },
@@ -1418,8 +1412,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
-      "height": 90
+      "width": 80,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1455,12 +1449,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "a60fd9ac-765a-4567-8463-b659d4ea0094@f9941",
+      "__uuid__": "a4377eb4-f5cd-4967-b65e-06cc0419e078@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1513,7 +1507,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -41.050000000000075,
+      "x": -45,
       "y": 0,
       "z": 0
     },
@@ -1554,8 +1548,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 25.2
+      "width": 49.99622205573121,
+      "height": 25.200000000000003
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1585,16 +1579,16 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 83,
-      "b": 88,
+      "r": 124,
+      "g": 69,
+      "b": 54,
       "a": 255
     },
     "_string": "音乐",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 31.342364532019708,
+    "_fontSize": 25,
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_overflow": 0,
@@ -1656,7 +1650,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 235.733,
+      "x": 210,
       "y": 0,
       "z": 0
     },
@@ -1747,8 +1741,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 156,
-      "height": 69
+      "width": 135,
+      "height": 65
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1784,12 +1778,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "ea5da13d-72d9-4c40-a299-8f642afcaed9@f9941",
+      "__uuid__": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1833,8 +1827,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 159,
-      "height": 69
+      "width": 135,
+      "height": 65
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1870,12 +1864,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
+      "__uuid__": "c92df56f-050e-448b-a815-e3aaeeea5e35@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1935,10 +1929,7 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
@@ -2021,10 +2012,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 2,
@@ -2207,8 +2195,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 783,
-      "height": 618
+      "width": 740,
+      "height": 654
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2244,7 +2232,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@f9941",
+      "__uuid__": "84a208ca-7d38-44d0-83db-b210c9d07ce7@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

BIN
assets/textrue/home/img_popup_window.png


+ 44 - 44
assets/textrue/home/img_setting_bg.png.meta → assets/textrue/home/img_popup_window.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9",
+  "uuid": "84a208ca-7d38-44d0-83db-b210c9d07ce7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@6c48a",
-      "displayName": "img_setting_bg",
+      "uuid": "84a208ca-7d38-44d0-83db-b210c9d07ce7@6c48a",
+      "displayName": "img_popup_window",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9",
+        "imageUuidOrDatabaseUri": "84a208ca-7d38-44d0-83db-b210c9d07ce7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,22 +34,22 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@f9941",
-      "displayName": "img_setting_bg",
+      "uuid": "84a208ca-7d38-44d0-83db-b210c9d07ce7@f9941",
+      "displayName": "img_popup_window",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 783,
-        "height": 618,
-        "rawWidth": 783,
-        "rawHeight": 618,
+        "offsetX": 3.5,
+        "offsetY": 14.5,
+        "trimX": 54,
+        "trimY": 55,
+        "width": 639,
+        "height": 515,
+        "rawWidth": 740,
+        "rawHeight": 654,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -391.5,
-            -309,
+            -319.5,
+            -257.5,
             0,
-            391.5,
-            -309,
+            319.5,
+            -257.5,
             0,
-            -391.5,
-            309,
+            -319.5,
+            257.5,
             0,
-            391.5,
-            309,
+            319.5,
+            257.5,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            0,
-            618,
-            783,
-            618,
-            0,
-            0,
-            783,
-            0
+            54,
+            599,
+            693,
+            599,
+            54,
+            84,
+            693,
+            84
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.07297297297297298,
+            0.12844036697247707,
+            0.9364864864864865,
+            0.12844036697247707,
+            0.07297297297297298,
+            0.9159021406727829,
+            0.9364864864864865,
+            0.9159021406727829
           ],
           "minPos": [
-            -391.5,
-            -309,
+            -319.5,
+            -257.5,
             0
           ],
           "maxPos": [
-            391.5,
-            309,
+            319.5,
+            257.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@6c48a",
+        "imageUuidOrDatabaseUri": "84a208ca-7d38-44d0-83db-b210c9d07ce7@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@f9941"
+    "redirect": "84a208ca-7d38-44d0-83db-b210c9d07ce7@f9941"
   }
 }

BIN
assets/textrue/home/img_setting_bg.png


BIN
assets/textrue/home/img_setting_music.png


+ 40 - 40
assets/textrue/home/img_setting_music.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "a60fd9ac-765a-4567-8463-b659d4ea0094",
+  "uuid": "a4377eb4-f5cd-4967-b65e-06cc0419e078",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a60fd9ac-765a-4567-8463-b659d4ea0094@6c48a",
+      "uuid": "a4377eb4-f5cd-4967-b65e-06cc0419e078@6c48a",
       "displayName": "img_setting_music",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a60fd9ac-765a-4567-8463-b659d4ea0094",
+        "imageUuidOrDatabaseUri": "a4377eb4-f5cd-4967-b65e-06cc0419e078",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a60fd9ac-765a-4567-8463-b659d4ea0094@f9941",
+      "uuid": "a4377eb4-f5cd-4967-b65e-06cc0419e078@f9941",
       "displayName": "img_setting_music",
       "id": "f9941",
       "name": "spriteFrame",
@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 2,
-        "offsetY": 3,
-        "trimX": 13,
-        "trimY": 0,
-        "width": 68,
-        "height": 84,
-        "rawWidth": 90,
-        "rawHeight": 90,
+        "offsetX": 1.5,
+        "offsetY": 1.5,
+        "trimX": 10,
+        "trimY": 1,
+        "width": 53,
+        "height": 65,
+        "rawWidth": 70,
+        "rawHeight": 70,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -34,
-            -42,
+            -26.5,
+            -32.5,
             0,
-            34,
-            -42,
+            26.5,
+            -32.5,
             0,
-            -34,
-            42,
+            -26.5,
+            32.5,
             0,
-            34,
-            42,
+            26.5,
+            32.5,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            13,
-            90,
-            81,
-            90,
-            13,
-            6,
-            81,
-            6
+            10,
+            69,
+            63,
+            69,
+            10,
+            4,
+            63,
+            4
           ],
           "nuv": [
-            0.14444444444444443,
-            0.06666666666666667,
+            0.14285714285714285,
+            0.05714285714285714,
             0.9,
-            0.06666666666666667,
-            0.14444444444444443,
-            1,
+            0.05714285714285714,
+            0.14285714285714285,
+            0.9857142857142858,
             0.9,
-            1
+            0.9857142857142858
           ],
           "minPos": [
-            -34,
-            -42,
+            -26.5,
+            -32.5,
             0
           ],
           "maxPos": [
-            34,
-            42,
+            26.5,
+            32.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a60fd9ac-765a-4567-8463-b659d4ea0094@6c48a",
+        "imageUuidOrDatabaseUri": "a4377eb4-f5cd-4967-b65e-06cc0419e078@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "a60fd9ac-765a-4567-8463-b659d4ea0094@f9941"
+    "redirect": "a4377eb4-f5cd-4967-b65e-06cc0419e078@f9941"
   }
 }

BIN
assets/textrue/home/img_setting_off.png


+ 30 - 30
assets/textrue/home/img_setting_off.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf",
+  "uuid": "c92df56f-050e-448b-a815-e3aaeeea5e35",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@6c48a",
+      "uuid": "c92df56f-050e-448b-a815-e3aaeeea5e35@6c48a",
       "displayName": "img_setting_off",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf",
+        "imageUuidOrDatabaseUri": "c92df56f-050e-448b-a815-e3aaeeea5e35",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
+      "uuid": "c92df56f-050e-448b-a815-e3aaeeea5e35@f9941",
       "displayName": "img_setting_off",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -3.5,
+        "offsetY": 0,
         "trimX": 0,
-        "trimY": 7,
-        "width": 159,
-        "height": 62,
-        "rawWidth": 159,
-        "rawHeight": 69,
+        "trimY": 0,
+        "width": 125,
+        "height": 56,
+        "rawWidth": 125,
+        "rawHeight": 56,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -79.5,
-            -31,
+            -62.5,
+            -28,
             0,
-            79.5,
-            -31,
+            62.5,
+            -28,
             0,
-            -79.5,
-            31,
+            -62.5,
+            28,
             0,
-            79.5,
-            31,
+            62.5,
+            28,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            62,
-            159,
-            62,
+            56,
+            125,
+            56,
             0,
             0,
-            159,
+            125,
             0
           ],
           "nuv": [
@@ -98,23 +98,23 @@
             1,
             0,
             0,
-            0.8985507246376812,
             1,
-            0.8985507246376812
+            1,
+            1
           ],
           "minPos": [
-            -79.5,
-            -31,
+            -62.5,
+            -28,
             0
           ],
           "maxPos": [
-            79.5,
-            31,
+            62.5,
+            28,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@6c48a",
+        "imageUuidOrDatabaseUri": "c92df56f-050e-448b-a815-e3aaeeea5e35@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941"
+    "redirect": "c92df56f-050e-448b-a815-e3aaeeea5e35@f9941"
   }
 }

BIN
assets/textrue/home/img_setting_on.png


+ 30 - 30
assets/textrue/home/img_setting_on.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "ea5da13d-72d9-4c40-a299-8f642afcaed9",
+  "uuid": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "ea5da13d-72d9-4c40-a299-8f642afcaed9@6c48a",
+      "uuid": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@6c48a",
       "displayName": "img_setting_on",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ea5da13d-72d9-4c40-a299-8f642afcaed9",
+        "imageUuidOrDatabaseUri": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "ea5da13d-72d9-4c40-a299-8f642afcaed9@f9941",
+      "uuid": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@f9941",
       "displayName": "img_setting_on",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -4.5,
+        "offsetY": 0,
         "trimX": 0,
-        "trimY": 9,
-        "width": 156,
-        "height": 60,
-        "rawWidth": 156,
-        "rawHeight": 69,
+        "trimY": 0,
+        "width": 125,
+        "height": 56,
+        "rawWidth": 125,
+        "rawHeight": 56,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -78,
-            -30,
+            -62.5,
+            -28,
             0,
-            78,
-            -30,
+            62.5,
+            -28,
             0,
-            -78,
-            30,
+            -62.5,
+            28,
             0,
-            78,
-            30,
+            62.5,
+            28,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            60,
-            156,
-            60,
+            56,
+            125,
+            56,
             0,
             0,
-            156,
+            125,
             0
           ],
           "nuv": [
@@ -98,23 +98,23 @@
             1,
             0,
             0,
-            0.8695652173913043,
             1,
-            0.8695652173913043
+            1,
+            1
           ],
           "minPos": [
-            -78,
-            -30,
+            -62.5,
+            -28,
             0
           ],
           "maxPos": [
-            78,
-            30,
+            62.5,
+            28,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "ea5da13d-72d9-4c40-a299-8f642afcaed9@6c48a",
+        "imageUuidOrDatabaseUri": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "ea5da13d-72d9-4c40-a299-8f642afcaed9@f9941"
+    "redirect": "7b4dc1f8-99c3-46b9-b92b-39f4d5962b6b@f9941"
   }
 }

BIN
assets/textrue/home/img_setting_sound.png


+ 34 - 34
assets/textrue/home/img_setting_sound.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74",
+  "uuid": "ed13c82c-cf63-4da6-aa8c-18f853ca346f",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74@6c48a",
+      "uuid": "ed13c82c-cf63-4da6-aa8c-18f853ca346f@6c48a",
       "displayName": "img_setting_sound",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74",
+        "imageUuidOrDatabaseUri": "ed13c82c-cf63-4da6-aa8c-18f853ca346f",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74@f9941",
+      "uuid": "ed13c82c-cf63-4da6-aa8c-18f853ca346f@f9941",
       "displayName": "img_setting_sound",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -2,
+        "offsetY": -1,
         "trimX": 1,
-        "trimY": 4,
-        "width": 88,
-        "height": 86,
-        "rawWidth": 90,
-        "rawHeight": 90,
+        "trimY": 2,
+        "width": 58,
+        "height": 58,
+        "rawWidth": 60,
+        "rawHeight": 60,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -44,
-            -43,
+            -29,
+            -29,
             0,
-            44,
-            -43,
+            29,
+            -29,
             0,
-            -44,
-            43,
+            -29,
+            29,
             0,
-            44,
-            43,
+            29,
+            29,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             1,
-            86,
-            89,
-            86,
+            58,
+            59,
+            58,
             1,
             0,
-            89,
+            59,
             0
           ],
           "nuv": [
-            0.011111111111111112,
+            0.016666666666666666,
             0,
-            0.9888888888888889,
+            0.9833333333333333,
             0,
-            0.011111111111111112,
-            0.9555555555555556,
-            0.9888888888888889,
-            0.9555555555555556
+            0.016666666666666666,
+            0.9666666666666667,
+            0.9833333333333333,
+            0.9666666666666667
           ],
           "minPos": [
-            -44,
-            -43,
+            -29,
+            -29,
             0
           ],
           "maxPos": [
-            44,
-            43,
+            29,
+            29,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74@6c48a",
+        "imageUuidOrDatabaseUri": "ed13c82c-cf63-4da6-aa8c-18f853ca346f@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "d2adf40c-beb7-4e85-96e0-3af4a87f8f74@f9941"
+    "redirect": "ed13c82c-cf63-4da6-aa8c-18f853ca346f@f9941"
   }
 }

BIN
assets/textrue/home/img_settingdb_bg.png


+ 0 - 134
assets/textrue/home/img_settingdb_bg.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@6c48a",
-      "displayName": "img_settingdb_bg",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2",
-        "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": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
-      "displayName": "img_settingdb_bg",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 654,
-        "height": 150,
-        "rawWidth": 654,
-        "rawHeight": 150,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -327,
-            -75,
-            0,
-            327,
-            -75,
-            0,
-            -327,
-            75,
-            0,
-            327,
-            75,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            150,
-            654,
-            150,
-            0,
-            0,
-            654,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -327,
-            -75,
-            0
-          ],
-          "maxPos": [
-            327,
-            75,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": true,
-    "hasAlpha": true,
-    "redirect": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941"
-  }
-}