Browse Source

【功能】完善设置功能,替换新UI

mojunshou 1 year ago
parent
commit
caeb4993dc
40 changed files with 3799 additions and 4108 deletions
  1. 1700 4032
      assets/bundle/common/prefab/setting.prefab
  2. 75 37
      assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab
  3. 0 0
      assets/bundle/gui/eliminate/texture/bg/common_frame_1.png
  4. 2 2
      assets/bundle/gui/eliminate/texture/bg/common_frame.png.meta
  5. BIN
      assets/bundle/gui/eliminate/texture/bg/common_frame_2.png
  6. 134 0
      assets/bundle/gui/eliminate/texture/bg/common_frame_2.png.meta
  7. BIN
      assets/bundle/gui/eliminate/texture/bg/common_frame_3.png
  8. 134 0
      assets/bundle/gui/eliminate/texture/bg/common_frame_3.png.meta
  9. BIN
      assets/bundle/gui/eliminate/texture/bg/setting_bg.png
  10. 134 0
      assets/bundle/gui/eliminate/texture/bg/setting_bg.png.meta
  11. BIN
      assets/bundle/gui/eliminate/texture/btn_bg_2.png
  12. 134 0
      assets/bundle/gui/eliminate/texture/btn_bg_2.png.meta
  13. BIN
      assets/bundle/gui/eliminate/texture/btn_close.png
  14. 134 0
      assets/bundle/gui/eliminate/texture/btn_close.png.meta
  15. 9 0
      assets/bundle/gui/eliminate/texture/setting.meta
  16. 3 0
      assets/bundle/gui/eliminate/texture/setting/auto-atlas.pac
  17. 36 0
      assets/bundle/gui/eliminate/texture/setting/auto-atlas.pac.meta
  18. BIN
      assets/bundle/gui/eliminate/texture/setting/btn_off.png
  19. 134 0
      assets/bundle/gui/eliminate/texture/setting/btn_off.png.meta
  20. BIN
      assets/bundle/gui/eliminate/texture/setting/btn_on.png
  21. 134 0
      assets/bundle/gui/eliminate/texture/setting/btn_on.png.meta
  22. BIN
      assets/bundle/gui/eliminate/texture/setting/head_bg.png
  23. 134 0
      assets/bundle/gui/eliminate/texture/setting/head_bg.png.meta
  24. BIN
      assets/bundle/gui/eliminate/texture/setting/head_frame_1.png
  25. 134 0
      assets/bundle/gui/eliminate/texture/setting/head_frame_1.png.meta
  26. BIN
      assets/bundle/gui/eliminate/texture/setting/head_frame_2.png
  27. 134 0
      assets/bundle/gui/eliminate/texture/setting/head_frame_2.png.meta
  28. BIN
      assets/bundle/gui/eliminate/texture/setting/icon_effect.png
  29. 134 0
      assets/bundle/gui/eliminate/texture/setting/icon_effect.png.meta
  30. BIN
      assets/bundle/gui/eliminate/texture/setting/iocn_music.png
  31. 134 0
      assets/bundle/gui/eliminate/texture/setting/iocn_music.png.meta
  32. 9 0
      assets/bundle/gui/eliminate/texture/title.meta
  33. 0 0
      assets/bundle/gui/eliminate/texture/title/title_record.png
  34. 0 0
      assets/bundle/gui/eliminate/texture/title/title_record.png.meta
  35. BIN
      assets/bundle/gui/eliminate/texture/title/title_setting.png
  36. 134 0
      assets/bundle/gui/eliminate/texture/title/title_setting.png.meta
  37. BIN
      assets/bundle/gui/eliminate/texture/设置.png
  38. 134 0
      assets/bundle/gui/eliminate/texture/设置.png.meta
  39. 86 35
      assets/script/game/common/setting/SettingViewComp.ts
  40. 3 2
      assets/script/game/eliminate/view/WithdrawalRecordViewComp.ts

File diff suppressed because it is too large
+ 1700 - 4032
assets/bundle/common/prefab/setting.prefab


+ 75 - 37
assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 75
       },
       {
-        "__id__": 73
+        "__id__": 77
       },
       {
-        "__id__": 75
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 81
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -266,14 +266,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 70
       },
       {
-        "__id__": 68
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -656,20 +656,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 58
       },
       {
-        "__id__": 56
+        "__id__": 60
       },
       {
-        "__id__": 58
+        "__id__": 62
       },
       {
-        "__id__": 60
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -716,17 +716,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 53
       },
       {
-        "__id__": 51
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -773,14 +773,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 46
       },
       {
-        "__id__": 44
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -864,6 +864,12 @@
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 44
       }
     ],
     "removedComponents": []
@@ -996,6 +1002,38 @@
     ]
   },
   {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 43
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "652hl5LaNK2o6yuh+4xoly"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 45
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "d2z2XZX5lHMI2b7oCpAlOO"
+    ]
+  },
+  {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
@@ -1005,7 +1043,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1033,7 +1071,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 49
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -1084,7 +1122,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 52
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1112,7 +1150,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 54
     },
     "_type": 0,
     "_inverted": false,
@@ -1134,7 +1172,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 56
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1193,7 +1231,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1221,7 +1259,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1266,7 +1304,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 63
     },
     "bounceDuration": 0.23,
     "brake": 0.75,
@@ -1297,7 +1335,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 65
     },
     "templateType": 1,
     "tmpNode": {
@@ -1307,7 +1345,7 @@
     "_slideMode": 1,
     "pageDistance": 0.3,
     "pageChangeEvent": {
-      "__id__": 62
+      "__id__": 66
     },
     "_virtual": true,
     "cyclic": false,
@@ -1316,11 +1354,11 @@
     "_updateRate": 0,
     "frameByFrameRenderNum": 0,
     "renderEvent": {
-      "__id__": 63
+      "__id__": 67
     },
     "selectedMode": 0,
     "selectedEvent": {
-      "__id__": 64
+      "__id__": 68
     },
     "repeatEventSingle": false,
     "_id": ""
@@ -1378,7 +1416,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1406,7 +1444,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 73
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1455,7 +1493,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 76
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1483,10 +1521,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 78
     },
     "recordList": {
-      "__id__": 60
+      "__id__": 64
     },
     "_id": ""
   },
@@ -1504,7 +1542,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 80
     },
     "_alignFlags": 45,
     "_target": null,

assets/bundle/gui/eliminate/texture/bg/common_frame.png → assets/bundle/gui/eliminate/texture/bg/common_frame_1.png


+ 2 - 2
assets/bundle/gui/eliminate/texture/bg/common_frame.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "c16253bb-8991-4fe6-b268-fc79251cec65@6c48a",
-      "displayName": "common_frame",
+      "displayName": "common_frame_1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "c16253bb-8991-4fe6-b268-fc79251cec65@f9941",
-      "displayName": "common_frame",
+      "displayName": "common_frame_1",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

BIN
assets/bundle/gui/eliminate/texture/bg/common_frame_2.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/bg/common_frame_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "df588c8a-0b2f-4c06-92f3-f76d94e9307b",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "df588c8a-0b2f-4c06-92f3-f76d94e9307b@6c48a",
+      "displayName": "common_frame_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "df588c8a-0b2f-4c06-92f3-f76d94e9307b",
+        "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": "df588c8a-0b2f-4c06-92f3-f76d94e9307b@f9941",
+      "displayName": "common_frame_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 98,
+        "height": 60,
+        "rawWidth": 98,
+        "rawHeight": 60,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 39,
+        "borderRight": 41,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -49,
+            -30,
+            0,
+            49,
+            -30,
+            0,
+            -49,
+            30,
+            0,
+            49,
+            30,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            60,
+            98,
+            60,
+            0,
+            0,
+            98,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -49,
+            -30,
+            0
+          ],
+          "maxPos": [
+            49,
+            30,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "df588c8a-0b2f-4c06-92f3-f76d94e9307b@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "df588c8a-0b2f-4c06-92f3-f76d94e9307b@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/bg/common_frame_3.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/bg/common_frame_3.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d0ffc6b0-013c-4913-a578-b4c4a3d70892",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d0ffc6b0-013c-4913-a578-b4c4a3d70892@6c48a",
+      "displayName": "common_frame_3",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "d0ffc6b0-013c-4913-a578-b4c4a3d70892",
+        "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": "d0ffc6b0-013c-4913-a578-b4c4a3d70892@f9941",
+      "displayName": "common_frame_3",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 188,
+        "height": 142,
+        "rawWidth": 188,
+        "rawHeight": 142,
+        "borderTop": 53,
+        "borderBottom": 49,
+        "borderLeft": 60,
+        "borderRight": 69,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -94,
+            -71,
+            0,
+            94,
+            -71,
+            0,
+            -94,
+            71,
+            0,
+            94,
+            71,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            142,
+            188,
+            142,
+            0,
+            0,
+            188,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -94,
+            -71,
+            0
+          ],
+          "maxPos": [
+            94,
+            71,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d0ffc6b0-013c-4913-a578-b4c4a3d70892@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "d0ffc6b0-013c-4913-a578-b4c4a3d70892@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/bg/setting_bg.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/bg/setting_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "8d1f4852-9eb2-4333-9516-32bf2999ff64",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "8d1f4852-9eb2-4333-9516-32bf2999ff64@6c48a",
+      "displayName": "setting_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "8d1f4852-9eb2-4333-9516-32bf2999ff64",
+        "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": "8d1f4852-9eb2-4333-9516-32bf2999ff64@f9941",
+      "displayName": "setting_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 624,
+        "height": 328,
+        "rawWidth": 624,
+        "rawHeight": 328,
+        "borderTop": 145,
+        "borderBottom": 140,
+        "borderLeft": 141,
+        "borderRight": 143,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -312,
+            -164,
+            0,
+            312,
+            -164,
+            0,
+            -312,
+            164,
+            0,
+            312,
+            164,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            328,
+            624,
+            328,
+            0,
+            0,
+            624,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -312,
+            -164,
+            0
+          ],
+          "maxPos": [
+            312,
+            164,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8d1f4852-9eb2-4333-9516-32bf2999ff64@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "8d1f4852-9eb2-4333-9516-32bf2999ff64@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/btn_bg_2.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/btn_bg_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "23729a95-b11c-4aaf-ba33-fa309c0cf506",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "23729a95-b11c-4aaf-ba33-fa309c0cf506@6c48a",
+      "displayName": "btn_bg_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "23729a95-b11c-4aaf-ba33-fa309c0cf506",
+        "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": "23729a95-b11c-4aaf-ba33-fa309c0cf506@f9941",
+      "displayName": "btn_bg_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 154,
+        "height": 76,
+        "rawWidth": 154,
+        "rawHeight": 76,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -77,
+            -38,
+            0,
+            77,
+            -38,
+            0,
+            -77,
+            38,
+            0,
+            77,
+            38,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            76,
+            154,
+            76,
+            0,
+            0,
+            154,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -77,
+            -38,
+            0
+          ],
+          "maxPos": [
+            77,
+            38,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "23729a95-b11c-4aaf-ba33-fa309c0cf506@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "23729a95-b11c-4aaf-ba33-fa309c0cf506@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/btn_close.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/btn_close.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "54138f51-a62d-48d9-8dd2-b01485086792",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "54138f51-a62d-48d9-8dd2-b01485086792@6c48a",
+      "displayName": "btn_close",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "54138f51-a62d-48d9-8dd2-b01485086792",
+        "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": "54138f51-a62d-48d9-8dd2-b01485086792@f9941",
+      "displayName": "btn_close",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 80,
+        "height": 80,
+        "rawWidth": 80,
+        "rawHeight": 80,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -40,
+            -40,
+            0,
+            40,
+            -40,
+            0,
+            -40,
+            40,
+            0,
+            40,
+            40,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            80,
+            80,
+            80,
+            0,
+            0,
+            80,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -40,
+            -40,
+            0
+          ],
+          "maxPos": [
+            40,
+            40,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "54138f51-a62d-48d9-8dd2-b01485086792@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "54138f51-a62d-48d9-8dd2-b01485086792@6c48a"
+  }
+}

+ 9 - 0
assets/bundle/gui/eliminate/texture/setting.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "80d1e13f-8765-4878-8274-7bc3e48c3661",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 3 - 0
assets/bundle/gui/eliminate/texture/setting/auto-atlas.pac

@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}

+ 36 - 0
assets/bundle/gui/eliminate/texture/setting/auto-atlas.pac.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "03da7774-9333-49cb-a9ab-9e9357b8e194",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/btn_off.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/btn_off.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "aa97d677-79b3-4717-a8a1-470b0892a400",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "aa97d677-79b3-4717-a8a1-470b0892a400@6c48a",
+      "displayName": "btn_off",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "aa97d677-79b3-4717-a8a1-470b0892a400",
+        "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": "aa97d677-79b3-4717-a8a1-470b0892a400@f9941",
+      "displayName": "btn_off",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": 0.5,
+        "trimX": 1,
+        "trimY": 0,
+        "width": 139,
+        "height": 63,
+        "rawWidth": 140,
+        "rawHeight": 64,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -69.5,
+            -31.5,
+            0,
+            69.5,
+            -31.5,
+            0,
+            -69.5,
+            31.5,
+            0,
+            69.5,
+            31.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            64,
+            140,
+            64,
+            1,
+            1,
+            140,
+            1
+          ],
+          "nuv": [
+            0.007142857142857143,
+            0.015625,
+            1,
+            0.015625,
+            0.007142857142857143,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -69.5,
+            -31.5,
+            0
+          ],
+          "maxPos": [
+            69.5,
+            31.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "aa97d677-79b3-4717-a8a1-470b0892a400@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "aa97d677-79b3-4717-a8a1-470b0892a400@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/btn_on.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/btn_on.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2@6c48a",
+      "displayName": "btn_on",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2",
+        "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": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2@f9941",
+      "displayName": "btn_on",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -2,
+        "offsetY": 0.5,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 136,
+        "height": 63,
+        "rawWidth": 140,
+        "rawHeight": 64,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -68,
+            -31.5,
+            0,
+            68,
+            -31.5,
+            0,
+            -68,
+            31.5,
+            0,
+            68,
+            31.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            64,
+            136,
+            64,
+            0,
+            1,
+            136,
+            1
+          ],
+          "nuv": [
+            0,
+            0.015625,
+            0.9714285714285714,
+            0.015625,
+            0,
+            1,
+            0.9714285714285714,
+            1
+          ],
+          "minPos": [
+            -68,
+            -31.5,
+            0
+          ],
+          "maxPos": [
+            68,
+            31.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "71c09097-3bfd-4433-ba6a-3cb7c6acb5d2@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/head_bg.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/head_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0a3c9435-3320-42a6-9424-af1d619b9dc5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0a3c9435-3320-42a6-9424-af1d619b9dc5@6c48a",
+      "displayName": "head_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0a3c9435-3320-42a6-9424-af1d619b9dc5",
+        "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": "0a3c9435-3320-42a6-9424-af1d619b9dc5@f9941",
+      "displayName": "head_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 1,
+        "offsetY": -0.5,
+        "trimX": 2,
+        "trimY": 1,
+        "width": 122,
+        "height": 119,
+        "rawWidth": 124,
+        "rawHeight": 120,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -61,
+            -59.5,
+            0,
+            61,
+            -59.5,
+            0,
+            -61,
+            59.5,
+            0,
+            61,
+            59.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            119,
+            124,
+            119,
+            2,
+            0,
+            124,
+            0
+          ],
+          "nuv": [
+            0.016129032258064516,
+            0,
+            1,
+            0,
+            0.016129032258064516,
+            0.9916666666666667,
+            1,
+            0.9916666666666667
+          ],
+          "minPos": [
+            -61,
+            -59.5,
+            0
+          ],
+          "maxPos": [
+            61,
+            59.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0a3c9435-3320-42a6-9424-af1d619b9dc5@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "0a3c9435-3320-42a6-9424-af1d619b9dc5@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/head_frame_1.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/head_frame_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "06f2eb6f-e151-4a7e-887b-170ece8f9dae",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "06f2eb6f-e151-4a7e-887b-170ece8f9dae@6c48a",
+      "displayName": "head_frame_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "06f2eb6f-e151-4a7e-887b-170ece8f9dae",
+        "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": "06f2eb6f-e151-4a7e-887b-170ece8f9dae@f9941",
+      "displayName": "head_frame_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 114,
+        "height": 110,
+        "rawWidth": 114,
+        "rawHeight": 110,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -57,
+            -55,
+            0,
+            57,
+            -55,
+            0,
+            -57,
+            55,
+            0,
+            57,
+            55,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            110,
+            114,
+            110,
+            0,
+            0,
+            114,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -57,
+            -55,
+            0
+          ],
+          "maxPos": [
+            57,
+            55,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "06f2eb6f-e151-4a7e-887b-170ece8f9dae@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "06f2eb6f-e151-4a7e-887b-170ece8f9dae@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/head_frame_2.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/head_frame_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6@6c48a",
+      "displayName": "head_frame_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6",
+        "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": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6@f9941",
+      "displayName": "head_frame_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": -0.5,
+        "trimX": 1,
+        "trimY": 1,
+        "width": 123,
+        "height": 119,
+        "rawWidth": 124,
+        "rawHeight": 120,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -61.5,
+            -59.5,
+            0,
+            61.5,
+            -59.5,
+            0,
+            -61.5,
+            59.5,
+            0,
+            61.5,
+            59.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            119,
+            124,
+            119,
+            1,
+            0,
+            124,
+            0
+          ],
+          "nuv": [
+            0.008064516129032258,
+            0,
+            1,
+            0,
+            0.008064516129032258,
+            0.9916666666666667,
+            1,
+            0.9916666666666667
+          ],
+          "minPos": [
+            -61.5,
+            -59.5,
+            0
+          ],
+          "maxPos": [
+            61.5,
+            59.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "f8ed9dcf-2438-4a9c-b843-ff1d67e4cfc6@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/icon_effect.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/icon_effect.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "735e4bf6-66a0-4449-8647-b1c487fc54f8",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "735e4bf6-66a0-4449-8647-b1c487fc54f8@6c48a",
+      "displayName": "icon_effect",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "735e4bf6-66a0-4449-8647-b1c487fc54f8",
+        "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": "735e4bf6-66a0-4449-8647-b1c487fc54f8@f9941",
+      "displayName": "icon_effect",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 1,
+        "offsetY": 1,
+        "trimX": 5,
+        "trimY": 5,
+        "width": 48,
+        "height": 44,
+        "rawWidth": 56,
+        "rawHeight": 56,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -24,
+            -22,
+            0,
+            24,
+            -22,
+            0,
+            -24,
+            22,
+            0,
+            24,
+            22,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            5,
+            51,
+            53,
+            51,
+            5,
+            7,
+            53,
+            7
+          ],
+          "nuv": [
+            0.08928571428571429,
+            0.125,
+            0.9464285714285714,
+            0.125,
+            0.08928571428571429,
+            0.9107142857142857,
+            0.9464285714285714,
+            0.9107142857142857
+          ],
+          "minPos": [
+            -24,
+            -22,
+            0
+          ],
+          "maxPos": [
+            24,
+            22,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "735e4bf6-66a0-4449-8647-b1c487fc54f8@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "735e4bf6-66a0-4449-8647-b1c487fc54f8@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/setting/iocn_music.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/setting/iocn_music.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "e15f4367-52e3-42f3-abcb-5071715e6759",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "e15f4367-52e3-42f3-abcb-5071715e6759@6c48a",
+      "displayName": "iocn_music",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "e15f4367-52e3-42f3-abcb-5071715e6759",
+        "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": "e15f4367-52e3-42f3-abcb-5071715e6759@f9941",
+      "displayName": "iocn_music",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -2,
+        "offsetY": 0,
+        "trimX": 5,
+        "trimY": 5,
+        "width": 42,
+        "height": 46,
+        "rawWidth": 56,
+        "rawHeight": 56,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -21,
+            -23,
+            0,
+            21,
+            -23,
+            0,
+            -21,
+            23,
+            0,
+            21,
+            23,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            5,
+            51,
+            47,
+            51,
+            5,
+            5,
+            47,
+            5
+          ],
+          "nuv": [
+            0.08928571428571429,
+            0.08928571428571429,
+            0.8392857142857143,
+            0.08928571428571429,
+            0.08928571428571429,
+            0.9107142857142857,
+            0.8392857142857143,
+            0.9107142857142857
+          ],
+          "minPos": [
+            -21,
+            -23,
+            0
+          ],
+          "maxPos": [
+            21,
+            23,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "e15f4367-52e3-42f3-abcb-5071715e6759@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "e15f4367-52e3-42f3-abcb-5071715e6759@6c48a"
+  }
+}

+ 9 - 0
assets/bundle/gui/eliminate/texture/title.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "f219504d-9bda-43a8-a6cf-6f394d62363d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundle/gui/eliminate/texture/title_record.png → assets/bundle/gui/eliminate/texture/title/title_record.png


assets/bundle/gui/eliminate/texture/title_record.png.meta → assets/bundle/gui/eliminate/texture/title/title_record.png.meta


BIN
assets/bundle/gui/eliminate/texture/title/title_setting.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/title/title_setting.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "13e3ad67-7ac5-4927-ad93-16a6eeab8707",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "13e3ad67-7ac5-4927-ad93-16a6eeab8707@6c48a",
+      "displayName": "title_setting",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "13e3ad67-7ac5-4927-ad93-16a6eeab8707",
+        "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": "13e3ad67-7ac5-4927-ad93-16a6eeab8707@f9941",
+      "displayName": "title_setting",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": 0,
+        "trimX": 1,
+        "trimY": 0,
+        "width": 85,
+        "height": 47,
+        "rawWidth": 86,
+        "rawHeight": 47,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -42.5,
+            -23.5,
+            0,
+            42.5,
+            -23.5,
+            0,
+            -42.5,
+            23.5,
+            0,
+            42.5,
+            23.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            47,
+            86,
+            47,
+            1,
+            0,
+            86,
+            0
+          ],
+          "nuv": [
+            0.011627906976744186,
+            0,
+            1,
+            0,
+            0.011627906976744186,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -42.5,
+            -23.5,
+            0
+          ],
+          "maxPos": [
+            42.5,
+            23.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "13e3ad67-7ac5-4927-ad93-16a6eeab8707@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "13e3ad67-7ac5-4927-ad93-16a6eeab8707@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/设置.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/设置.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "a55ce6d7-7dc5-4786-8f89-3cffe92de775",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "a55ce6d7-7dc5-4786-8f89-3cffe92de775@6c48a",
+      "displayName": "设置",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "a55ce6d7-7dc5-4786-8f89-3cffe92de775",
+        "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": "a55ce6d7-7dc5-4786-8f89-3cffe92de775@f9941",
+      "displayName": "设置",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 1600,
+        "rawWidth": 720,
+        "rawHeight": 1600,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -800,
+            0,
+            360,
+            -800,
+            0,
+            -360,
+            800,
+            0,
+            360,
+            800,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1600,
+            720,
+            1600,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -800,
+            0
+          ],
+          "maxPos": [
+            360,
+            800,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "a55ce6d7-7dc5-4786-8f89-3cffe92de775@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "a55ce6d7-7dc5-4786-8f89-3cffe92de775@6c48a"
+  }
+}

+ 86 - 35
assets/script/game/common/setting/SettingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:40:20
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-03-31 17:09:16
+ * @LastEditTime: 2025-04-03 15:38:50
  * @Description:设置界面 
  */
 import { _decorator } from "cc";
@@ -15,6 +15,7 @@ import { Toggle } from "cc";
 import { Account } from "../../account/Account";
 import { ImageAsset, Texture2D, SpriteFrame, Sprite } from "cc";
 import { IRemoteOptions, resLoader } from "db://oops-framework/core/common/loader/ResLoader";
+import { Button } from "cc";
 
 const { ccclass, property } = _decorator;
 
@@ -28,11 +29,24 @@ export class SettingViewComp extends CCVMParentComp {
         music_state: true,
         effect_state: true
     }
+
+    @property(Button)
+    private musicBtn: Button = null!;
+
+    @property(Button)
+    private effectBtn: Button = null!;
+
+    private _musicState: boolean = true;
+    private _effectState: boolean = true;
+
+
+
     /** 视图层逻辑代码分离演示 */
     start() {
         // const entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
         this.setButton();
         this.updateHead();
+        this.updateBtnState();
     }
 
     /** 视图对象通过 ecs.Entity.remove(SettingViewComp) 删除组件是触发组件处理自定义释放逻辑 */
@@ -51,50 +65,49 @@ export class SettingViewComp extends CCVMParentComp {
     }
 
 
-    /**
-     * @description: 设置音乐开关
-     * @param {Toggle} toggle
-     * @return {*}
-     */
-    private onMusicToggleContainerClick(toggle: Toggle) {
-        switch (toggle.node.name) {
-            case "On":
-                this.data.music_state = true;
-                break;
-            case "Off":
-                this.data.music_state = false;
-                break;
+    //更新按钮状态
+    private updateBtnState() {
+        const music_state = oops.storage.get("music_state");
+        const effect_state = oops.storage.get("effect_state");
+        if (music_state == "" || music_state == null) {
+            oops.storage.set("music_state", true);
+            this._musicState = true;
+        } else {
+            // 将字符串转换为布尔值
+            let music_state_bool = music_state == "true" ? true : false;
+            this._musicState = music_state_bool;
         }
-        console.log("音乐状态", this.data.music_state);
-        oops.audio.switchMusic = this.data.music_state;
-    }
-
-    /**
-     * @description: 设置音乐开关
-     * @param {Toggle} toggle
-     * @return {*}
-     */
-    private onEffectToggleContainerClick(toggle: Toggle) {
-        switch (toggle.node.name) {
-            case "On":
-                this.data.effect_state = true;
-                break;
-            case "Off":
-                this.data.effect_state = false;
-                break;
+        if (effect_state == "" || effect_state == null) {
+            oops.storage.set("effect_state", true);
+            this._effectState = true;
+        } else {
+            // 将字符串转换为布尔值
+            let effect_state_bool = effect_state == "true" ? true : false;
+            this._effectState = effect_state_bool;
         }
-        console.log("音效状态", this.data.effect_state);
-        oops.audio.switchEffect = this.data.effect_state;
+        oops.audio.switchMusic = this._musicState;
+        oops.audio.switchEffect = this._effectState;
+
+        const music_on = this.musicBtn.node.getChildByPath("btn_on")!;
+        const music_off = this.musicBtn.node.getChildByPath("btn_off")!;
+        music_on.active = this._musicState;
+        music_off.active = !this._musicState;
+
+        const btn_on = this.effectBtn.node.getChildByPath("btn_on")!;
+        const btn_off = this.effectBtn.node.getChildByPath("btn_off")!;
+        btn_on.active = this._effectState;
+        btn_off.active = !this._effectState;
+
     }
 
+
     //更新头像
     private updateHead() {
         let account = ecs.getEntity<Account>(Account);
         let sprite = this.node.getChildByPath("Bg/btn_head/sp_head")!.uiSprite;
         // let url = account.AccountModel.head;
         let url = "http://www.kuaipng.com/Uploads/pic/w/2020/07-16/89010/water_89010_698_698_.png"
-        this.data.nickName = account.AccountModel.AccountName;
-        this.data.uid = account.AccountModel.uid;
+        this.data.uid = account.AccountModel.Uid;
         var opt: IRemoteOptions = { ext: ".png" };
         var onComplete = (err: Error | null, data: ImageAsset) => {
             const texture = new Texture2D();
@@ -108,6 +121,44 @@ export class SettingViewComp extends CCVMParentComp {
     }
 
 
+    //打开音乐
+    private btn_music() {
+        this._musicState = !this._musicState;
+        oops.storage.set("music_state", this._musicState);
+        oops.audio.switchMusic = this._musicState;
+        const btn_on = this.musicBtn.node.getChildByPath("btn_on")!;
+        const btn_off = this.musicBtn.node.getChildByPath("btn_off")!;
+        btn_on.active = this._musicState;
+        btn_off.active = !this._musicState;
+    }
+
+    //打开音效
+    private btn_effect() {
+        this._effectState = !this._effectState;
+        oops.storage.set("effect_state", this._effectState);
+        oops.audio.switchEffect = this._effectState;
+
+        const btn_on = this.effectBtn.node.getChildByPath("btn_on")!;
+        const btn_off = this.effectBtn.node.getChildByPath("btn_off")!;
+        btn_on.active = this._effectState;
+        btn_off.active = !this._effectState;
+    }
+
+
+    //隐私协议
+    private btn_privacy() {
+
+
+
+    }
+
+
+
+    //用户协议
+    private btn_protocol() {
 
 
+
+    }
+
 }

+ 3 - 2
assets/script/game/eliminate/view/WithdrawalRecordViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 10:17:49
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-03 12:02:09
+ * @LastEditTime: 2025-04-03 14:05:27
  * @Description: 提现记录
  */
 import { _decorator, Node } from "cc";
@@ -31,7 +31,8 @@ export class WithdrawalRecordViewComp extends CCComp {
             state: "提现成功",
             time: "2025-03-20 17:30",
             money: 0.1,
-            status: oops.random.getRandomInt(1, 2, 2)
+            status: oops.random.getRandomInt(0, 3, 3)
+
         }
 
         for (let i = 0; i < 20; i++) {