3 Commits 89a6318a9a ... ebbdd9ba69

Author SHA1 Message Date
  woso_javan ebbdd9ba69 技能图标更新 1 week ago
  woso_javan 6f22c11bc8 道具界面修改 1 week ago
  woso_javan 6b4dff3ae7 主界面替换 1 week ago
100 changed files with 6336 additions and 868 deletions
  1. 418 125
      assets/bundles/game/Stage.prefab
  2. 9 0
      assets/bundles/game/font.meta
  3. BIN
      assets/bundles/game/font/BRLNSB.TTF
  4. 12 0
      assets/bundles/game/font/BRLNSB.TTF.meta
  5. BIN
      assets/bundles/game/image/+.png
  6. 134 0
      assets/bundles/game/image/+.png.meta
  7. BIN
      assets/bundles/game/image/bg_farm.png
  8. 134 0
      assets/bundles/game/image/bg_farm.png.meta
  9. BIN
      assets/bundles/game/image/btn_bd.png
  10. 20 20
      assets/bundles/game/image/btn_bd.png.meta
  11. BIN
      assets/bundles/game/image/btn_dp.png
  12. 20 20
      assets/bundles/game/image/btn_dp.png.meta
  13. BIN
      assets/bundles/game/image/btn_hy.png
  14. 20 20
      assets/bundles/game/image/btn_hy.png.meta
  15. BIN
      assets/bundles/game/image/btn_sx.png
  16. 20 20
      assets/bundles/game/image/btn_sx.png.meta
  17. BIN
      assets/bundles/game/image/lj.png
  18. 20 20
      assets/bundles/game/image/lj.png.meta
  19. BIN
      assets/bundles/game/image/tip.png
  20. 20 20
      assets/bundles/game/image/tip.png.meta
  21. BIN
      assets/bundles/icon/item/icon_bd.png
  22. 20 20
      assets/bundles/icon/item/icon_bd.png.meta
  23. BIN
      assets/bundles/icon/item/icon_dp.png
  24. 20 20
      assets/bundles/icon/item/icon_dp.png.meta
  25. BIN
      assets/bundles/icon/item/icon_sx.png
  26. 20 20
      assets/bundles/icon/item/icon_sx.png.meta
  27. 477 79
      assets/bundles/ui/UIGame.prefab
  28. 2396 195
      assets/bundles/ui/UIGetSkill.prefab
  29. BIN
      assets/bundles/ui/UIGetSkill/icon_dp.png
  30. 384 110
      assets/bundles/ui/UISetting.prefab
  31. BIN
      assets/bundles/ui/UISetting/ShenYin_Kai.png
  32. 134 0
      assets/bundles/ui/UISetting/ShenYin_Kai.png.meta
  33. BIN
      assets/bundles/ui/UISetting/YinYue_Kai.png
  34. 134 0
      assets/bundles/ui/UISetting/YinYue_Kai.png.meta
  35. BIN
      assets/bundles/ui/UISetting/dk_sz2.png
  36. 20 20
      assets/bundles/ui/UISetting/dk_sz2.png.meta
  37. BIN
      assets/bundles/ui/UISetting/kg1.png
  38. 20 20
      assets/bundles/ui/UISetting/kg1.png.meta
  39. BIN
      assets/bundles/ui/UISetting/kg2.png
  40. 20 20
      assets/bundles/ui/UISetting/kg2.png.meta
  41. BIN
      assets/bundles/ui/UISetting/kg3.png
  42. 20 20
      assets/bundles/ui/UISetting/kg3.png.meta
  43. BIN
      assets/bundles/ui/common/btn_gb.png
  44. 20 20
      assets/bundles/ui/common/btn_gb.png.meta
  45. BIN
      assets/bundles/ui/common/dk1.png
  46. 24 24
      assets/bundles/ui/common/dk1.png.meta
  47. BIN
      assets/bundles/ui/common/nz.png
  48. 26 26
      assets/bundles/ui/common/nz.png.meta
  49. 0 0
      assets/bundles/ui/icon_dp.meta
  50. BIN
      assets/bundles/ui/icon_dp/BeiGuang.png
  51. 134 0
      assets/bundles/ui/icon_dp/BeiGuang.png.meta
  52. BIN
      assets/bundles/ui/icon_dp/Bingdong.png
  53. 134 0
      assets/bundles/ui/icon_dp/Bingdong.png.meta
  54. BIN
      assets/bundles/ui/icon_dp/MoBang.png
  55. 134 0
      assets/bundles/ui/icon_dp/MoBang.png.meta
  56. BIN
      assets/bundles/ui/icon_dp/Skill0_Get.png
  57. 134 0
      assets/bundles/ui/icon_dp/Skill0_Get.png.meta
  58. BIN
      assets/bundles/ui/icon_dp/Skill1_Get.png
  59. 134 0
      assets/bundles/ui/icon_dp/Skill1_Get.png.meta
  60. BIN
      assets/bundles/ui/icon_dp/Skill2_Get.png
  61. 134 0
      assets/bundles/ui/icon_dp/Skill2_Get.png.meta
  62. BIN
      assets/bundles/ui/icon_dp/TaiYangYueLiang.png
  63. 134 0
      assets/bundles/ui/icon_dp/TaiYangYueLiang.png.meta
  64. BIN
      assets/bundles/ui/icon_dp/XinXin.png
  65. 134 0
      assets/bundles/ui/icon_dp/XinXin.png.meta
  66. BIN
      assets/bundles/ui/icon_dp/XueHua.png
  67. 134 0
      assets/bundles/ui/icon_dp/XueHua.png.meta
  68. BIN
      assets/bundles/ui/icon_dp/ZhuanHuan.png
  69. 134 0
      assets/bundles/ui/icon_dp/ZhuanHuan.png.meta
  70. 0 0
      assets/bundles/ui/icon_dp/djtj_dk.png
  71. 0 0
      assets/bundles/ui/icon_dp/djtj_dk.png.meta
  72. 0 0
      assets/bundles/ui/icon_dp/dk_hddj.png
  73. 0 0
      assets/bundles/ui/icon_dp/dk_hddj.png.meta
  74. BIN
      assets/bundles/ui/icon_dp/icon_dp.png
  75. 20 20
      assets/bundles/ui/icon_dp/icon_dp.png.meta
  76. BIN
      assets/bundles/ui/icon_dp/skill0_bg.png
  77. 134 0
      assets/bundles/ui/icon_dp/skill0_bg.png.meta
  78. BIN
      assets/bundles/ui/icon_dp/skill1_bg.png
  79. 134 0
      assets/bundles/ui/icon_dp/skill1_bg.png.meta
  80. BIN
      assets/bundles/ui/icon_dp/skill2_bg.png
  81. 134 0
      assets/bundles/ui/icon_dp/skill2_bg.png.meta
  82. 0 0
      assets/bundles/ui/icon_dp/冰冻时间30秒.png
  83. 0 0
      assets/bundles/ui/icon_dp/冰冻时间30秒.png.meta
  84. 0 0
      assets/bundles/ui/icon_dp/冰冻道具.png
  85. 0 0
      assets/bundles/ui/icon_dp/冰冻道具.png.meta
  86. 0 0
      assets/bundles/ui/icon_dp/星星道具.png
  87. 0 0
      assets/bundles/ui/icon_dp/星星道具.png.meta
  88. 0 0
      assets/bundles/ui/icon_dp/灯泡道具.png
  89. 0 0
      assets/bundles/ui/icon_dp/灯泡道具.png.meta
  90. 0 0
      assets/bundles/ui/icon_dp/立即消除三组物品.png
  91. 0 0
      assets/bundles/ui/icon_dp/立即消除三组物品.png.meta
  92. 0 0
      assets/bundles/ui/icon_dp/获得星星双倍30秒.png
  93. 0 0
      assets/bundles/ui/icon_dp/获得星星双倍30秒.png.meta
  94. 0 0
      assets/bundles/ui/icon_dp/获得道具.png
  95. 0 0
      assets/bundles/ui/icon_dp/获得道具.png.meta
  96. 0 0
      assets/bundles/ui/icon_dp/转换道具.png
  97. 0 0
      assets/bundles/ui/icon_dp/转换道具.png.meta
  98. 0 0
      assets/bundles/ui/icon_dp/重置所有物品的位置.png
  99. 0 0
      assets/bundles/ui/icon_dp/重置所有物品的位置.png.meta
  100. 12 9
      assets/scripts/config/CfgSkillInfo.ts

File diff suppressed because it is too large
+ 418 - 125
assets/bundles/game/Stage.prefab


+ 9 - 0
assets/bundles/game/font.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "a10c7747-5d78-48b7-8186-5c4965707b7f",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/bundles/game/font/BRLNSB.TTF


+ 12 - 0
assets/bundles/game/font/BRLNSB.TTF.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "ttf-font",
+  "imported": true,
+  "uuid": "b396e0a4-493d-4c5b-af06-66ba37f8dc1e",
+  "files": [
+    ".json",
+    "BRLNSB.ttf"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/bundles/game/image/+.png


+ 134 - 0
assets/bundles/game/image/+.png.meta

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

BIN
assets/bundles/game/image/bg_farm.png


+ 134 - 0
assets/bundles/game/image/bg_farm.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a",
+      "displayName": "bg_farm",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5",
+        "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": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@f9941",
+      "displayName": "bg_farm",
+      "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": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a"
+  }
+}

BIN
assets/bundles/game/image/btn_bd.png


+ 20 - 20
assets/bundles/game/image/btn_bd.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

BIN
assets/bundles/game/image/btn_dp.png


+ 20 - 20
assets/bundles/game/image/btn_dp.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

BIN
assets/bundles/game/image/btn_hy.png


+ 20 - 20
assets/bundles/game/image/btn_hy.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 47,
-        "height": 50,
-        "rawWidth": 47,
-        "rawHeight": 50,
+        "width": 58,
+        "height": 55,
+        "rawWidth": 58,
+        "rawHeight": 55,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -23.5,
-            -25,
+            -29,
+            -27.5,
             0,
-            23.5,
-            -25,
+            29,
+            -27.5,
             0,
-            -23.5,
-            25,
+            -29,
+            27.5,
             0,
-            23.5,
-            25,
+            29,
+            27.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            50,
-            47,
-            50,
+            55,
+            58,
+            55,
             0,
             0,
-            47,
+            58,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -23.5,
-            -25,
+            -29,
+            -27.5,
             0
           ],
           "maxPos": [
-            23.5,
-            25,
+            29,
+            27.5,
             0
           ]
         },

BIN
assets/bundles/game/image/btn_sx.png


+ 20 - 20
assets/bundles/game/image/btn_sx.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

BIN
assets/bundles/game/image/lj.png


+ 20 - 20
assets/bundles/game/image/lj.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 71,
-        "height": 35,
-        "rawWidth": 71,
-        "rawHeight": 35,
+        "width": 115,
+        "height": 32,
+        "rawWidth": 115,
+        "rawHeight": 32,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -35.5,
-            -17.5,
+            -57.5,
+            -16,
             0,
-            35.5,
-            -17.5,
+            57.5,
+            -16,
             0,
-            -35.5,
-            17.5,
+            -57.5,
+            16,
             0,
-            35.5,
-            17.5,
+            57.5,
+            16,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            35,
-            71,
-            35,
+            32,
+            115,
+            32,
             0,
             0,
-            71,
+            115,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -35.5,
-            -17.5,
+            -57.5,
+            -16,
             0
           ],
           "maxPos": [
-            35.5,
-            17.5,
+            57.5,
+            16,
             0
           ]
         },

BIN
assets/bundles/game/image/tip.png


+ 20 - 20
assets/bundles/game/image/tip.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 597,
-        "height": 55,
-        "rawWidth": 597,
-        "rawHeight": 55,
+        "width": 626,
+        "height": 89,
+        "rawWidth": 626,
+        "rawHeight": 89,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -298.5,
-            -27.5,
+            -313,
+            -44.5,
             0,
-            298.5,
-            -27.5,
+            313,
+            -44.5,
             0,
-            -298.5,
-            27.5,
+            -313,
+            44.5,
             0,
-            298.5,
-            27.5,
+            313,
+            44.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            55,
-            597,
-            55,
+            89,
+            626,
+            89,
             0,
             0,
-            597,
+            626,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -298.5,
-            -27.5,
+            -313,
+            -44.5,
             0
           ],
           "maxPos": [
-            298.5,
-            27.5,
+            313,
+            44.5,
             0
           ]
         },

BIN
assets/bundles/icon/item/icon_bd.png


+ 20 - 20
assets/bundles/icon/item/icon_bd.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 221,
-        "height": 214,
-        "rawWidth": 221,
-        "rawHeight": 214,
+        "width": 152,
+        "height": 173,
+        "rawWidth": 152,
+        "rawHeight": 173,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -110.5,
-            -107,
+            -76,
+            -86.5,
             0,
-            110.5,
-            -107,
+            76,
+            -86.5,
             0,
-            -110.5,
-            107,
+            -76,
+            86.5,
             0,
-            110.5,
-            107,
+            76,
+            86.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            214,
-            221,
-            214,
+            173,
+            152,
+            173,
             0,
             0,
-            221,
+            152,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -110.5,
-            -107,
+            -76,
+            -86.5,
             0
           ],
           "maxPos": [
-            110.5,
-            107,
+            76,
+            86.5,
             0
           ]
         },

BIN
assets/bundles/icon/item/icon_dp.png


+ 20 - 20
assets/bundles/icon/item/icon_dp.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 151,
-        "height": 171,
-        "rawWidth": 151,
-        "rawHeight": 171,
+        "width": 288,
+        "height": 247,
+        "rawWidth": 288,
+        "rawHeight": 247,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -75.5,
-            -85.5,
+            -144,
+            -123.5,
             0,
-            75.5,
-            -85.5,
+            144,
+            -123.5,
             0,
-            -75.5,
-            85.5,
+            -144,
+            123.5,
             0,
-            75.5,
-            85.5,
+            144,
+            123.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            171,
-            151,
-            171,
+            247,
+            288,
+            247,
             0,
             0,
-            151,
+            288,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -75.5,
-            -85.5,
+            -144,
+            -123.5,
             0
           ],
           "maxPos": [
-            75.5,
-            85.5,
+            144,
+            123.5,
             0
           ]
         },

BIN
assets/bundles/icon/item/icon_sx.png


+ 20 - 20
assets/bundles/icon/item/icon_sx.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 213,
-        "height": 179,
-        "rawWidth": 213,
-        "rawHeight": 179,
+        "width": 148,
+        "height": 156,
+        "rawWidth": 148,
+        "rawHeight": 156,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -106.5,
-            -89.5,
+            -74,
+            -78,
             0,
-            106.5,
-            -89.5,
+            74,
+            -78,
             0,
-            -106.5,
-            89.5,
+            -74,
+            78,
             0,
-            106.5,
-            89.5,
+            74,
+            78,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            179,
-            213,
-            179,
+            156,
+            148,
+            156,
             0,
             0,
-            213,
+            148,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -106.5,
-            -89.5,
+            -74,
+            -78,
             0
           ],
           "maxPos": [
-            106.5,
-            89.5,
+            74,
+            78,
             0
           ]
         },

+ 477 - 79
assets/bundles/ui/UIGame.prefab

@@ -22,26 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 22
+        "__id__": 41
       },
       {
-        "__id__": 35
+        "__id__": 70
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 88
       },
       {
-        "__id__": 52
+        "__id__": 90
       },
       {
-        "__id__": 54
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -95,8 +95,7 @@
     "fileId": "16guJqMb5Eup2r3IjuQlY8",
     "instance": {
       "__id__": 4
-    },
-    "targetOverrides": null
+    }
   },
   {
     "__type__": "cc.PrefabInstance",
@@ -113,17 +112,11 @@
       {
         "__id__": 7
       },
-      {
-        "__id__": 8
-      },
       {
         "__id__": 9
       },
       {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
+        "__id__": 11
       },
       {
         "__id__": 13
@@ -138,12 +131,36 @@
         "__id__": 19
       },
       {
-        "__id__": 20
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
       }
     ],
     "removedComponents": [
       {
-        "__id__": 21
+        "__id__": 40
       }
     ]
   },
@@ -166,22 +183,28 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 8
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -220,
+      "x": -192.008,
       "y": 724,
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 10
     },
     "propertyPath": [
       "_lrot"
@@ -194,10 +217,16 @@
       "w": 1
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 12
     },
     "propertyPath": [
       "_euler"
@@ -209,10 +238,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 14
     },
     "propertyPath": [
       "_alignFlags"
@@ -228,17 +263,23 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 16
     },
     "propertyPath": [
       "_lockFlags"
     ],
     "value": 9
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 14
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -254,7 +295,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 20
     },
     "propertyPath": [
       "clickEvents",
@@ -271,16 +312,22 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 22
     },
     "propertyPath": [
       "clickEvents",
       "0"
     ],
     "value": {
-      "__id__": 18
+      "__id__": 23
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8alSH/jBpNwLNNpOnspxKb"
+    ]
+  },
   {
     "__type__": "cc.ClickEvent",
     "target": {
@@ -294,23 +341,149 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 25
     },
     "propertyPath": [
       "_horizontalCenter"
     ],
-    "value": -220
+    "value": -192.008
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 27
     },
     "propertyPath": [
       "_top"
     ],
     "value": 45
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 29
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 121,
+      "height": 108
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "73ukzHkntOPYfHGh3oRUXD"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 31
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8ac9kyoU5LkLW39Opvt1zI"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 33
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 30,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "faBj9kU3hBa7mi5co6HxID"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 35
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 40.713,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8fnyHD4TRD+6Gq+AKR2hlU"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 37
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "68jM5C7VZNTaNkFa2/7Lk4"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 39
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 0
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "9adAmlzW1FR5eWPPqExv/J"
+    ]
+  },
   {
     "__type__": "cc.TargetInfo",
     "localID": [
@@ -324,14 +497,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 23
+      "__id__": 42
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 22
+      "__id__": 41
     },
     "asset": {
       "__uuid__": "7c472dc3-af09-4df4-a4f9-6678aebc66b0",
@@ -339,7 +512,7 @@
     },
     "fileId": "80B9Z+Ar1O7Z786kNWGrHv",
     "instance": {
-      "__id__": 24
+      "__id__": 43
     },
     "targetOverrides": null
   },
@@ -353,25 +526,55 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 25
+        "__id__": 44
       },
       {
-        "__id__": 27
+        "__id__": 46
       },
       {
-        "__id__": 28
+        "__id__": 47
+      },
+      {
+        "__id__": 48
       },
       {
-        "__id__": 29
+        "__id__": 49
       },
       {
-        "__id__": 30
+        "__id__": 51
       },
       {
-        "__id__": 32
+        "__id__": 53
       },
       {
-        "__id__": 34
+        "__id__": 54
+      },
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 60
+      },
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 67
+      },
+      {
+        "__id__": 69
       }
     ],
     "removedComponents": []
@@ -379,7 +582,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_name"
@@ -395,14 +598,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 74.961,
       "y": 724,
       "z": 0
     }
@@ -410,7 +613,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_lrot"
@@ -426,7 +629,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_euler"
@@ -441,7 +644,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 31
+      "__id__": 50
     },
     "propertyPath": [
       "_alignFlags"
@@ -457,7 +660,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 52
     },
     "propertyPath": [
       "_active"
@@ -473,13 +676,172 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 31
+      "__id__": 50
     },
     "propertyPath": [
       "_top"
     ],
     "value": 45
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 50
+    },
+    "propertyPath": [
+      "_lockFlags"
+    ],
+    "value": 8
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 50
+    },
+    "propertyPath": [
+      "_horizontalCenter"
+    ],
+    "value": 74.961
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 57
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 121,
+      "height": 108
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "daEOwjxKBGQKrJygYvy+EK"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 59
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "aaMD7Ej+FF+KxO26EfHBCh"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 61
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "9cp9Uqu2pH+LBPZtwBmpyI"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 63
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 30,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "74qTOGCV9KM5mJmgFhTkuv"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 65
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 40.798,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41t9QkAftFt5mQ1M+PadzD"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 52
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": -72.958,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 68
+    },
+    "propertyPath": [
+      "_type"
+    ],
+    "value": 1
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a7LdDTOEZISrlXsSsWaOht"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 68
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 0
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -487,14 +849,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 71
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 70
     },
     "asset": {
       "__uuid__": "97df4867-ae74-48cf-a999-483cbac9cc6f",
@@ -502,7 +864,7 @@
     },
     "fileId": "f3Bka97HBLC70aYs8RpRDZ",
     "instance": {
-      "__id__": 37
+      "__id__": 72
     },
     "targetOverrides": null
   },
@@ -516,34 +878,40 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 38
+        "__id__": 73
       },
       {
-        "__id__": 40
+        "__id__": 75
       },
       {
-        "__id__": 41
+        "__id__": 76
       },
       {
-        "__id__": 42
+        "__id__": 77
       },
       {
-        "__id__": 43
+        "__id__": 78
       },
       {
-        "__id__": 45
+        "__id__": 80
       },
       {
-        "__id__": 46
+        "__id__": 81
       },
       {
-        "__id__": 47
+        "__id__": 82
       },
       {
-        "__id__": 48
+        "__id__": 83
       },
       {
-        "__id__": 49
+        "__id__": 84
+      },
+      {
+        "__id__": 85
+      },
+      {
+        "__id__": 86
       }
     ],
     "removedComponents": []
@@ -551,7 +919,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_name"
@@ -567,7 +935,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_lpos"
@@ -575,14 +943,14 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 220,
-      "y": 724,
+      "y": 1133.71,
       "z": 0
     }
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_lrot"
@@ -598,7 +966,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_euler"
@@ -613,7 +981,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_alignFlags"
@@ -629,17 +997,17 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_top"
     ],
-    "value": 45
+    "value": -369.21000000000004
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_left"
@@ -649,7 +1017,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_right"
@@ -659,23 +1027,53 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_lockFlags"
     ],
-    "value": 33
+    "value": 32
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_horizontalCenter"
     ],
     "value": 220
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 74
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 87
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 109,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a5DChytv9Gc4whCvdJJJc0"
+    ]
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -686,7 +1084,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -714,7 +1112,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 91
     },
     "_alignFlags": 45,
     "_target": null,
@@ -750,7 +1148,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 93
     },
     "uiType": 0,
     "_id": ""
@@ -772,10 +1170,10 @@
     "targetOverrides": [],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 35
+        "__id__": 70
       },
       {
-        "__id__": 22
+        "__id__": 41
       },
       {
         "__id__": 2

File diff suppressed because it is too large
+ 2396 - 195
assets/bundles/ui/UIGetSkill.prefab


BIN
assets/bundles/ui/UIGetSkill/icon_dp.png


+ 384 - 110
assets/bundles/ui/UISetting.prefab

@@ -28,23 +28,23 @@
         "__id__": 19
       },
       {
-        "__id__": 58
+        "__id__": 64
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 109
       },
       {
-        "__id__": 99
+        "__id__": 111
       },
       {
-        "__id__": 101
+        "__id__": 113
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 115
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +139,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 461,
-      "height": 436
+      "width": 546,
+      "height": 741
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -240,8 +240,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 201,
-      "y": 174,
+      "x": 230,
+      "y": 320,
       "z": 0
     },
     "_lrot": {
@@ -281,8 +281,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 59
+      "width": 101,
+      "height": 98
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -323,7 +323,7 @@
     },
     "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -462,33 +462,36 @@
       },
       {
         "__id__": 36
+      },
+      {
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 52
       },
       {
-        "__id__": 48
+        "__id__": 54
       },
       {
-        "__id__": 50
+        "__id__": 56
       },
       {
-        "__id__": 53
+        "__id__": 59
       },
       {
-        "__id__": 55
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 72,
-      "y": 54,
+      "y": 129.818,
       "z": 0
     },
     "_lrot": {
@@ -541,7 +544,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 3.168,
       "y": 0,
       "z": 0
     },
@@ -632,8 +635,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 109,
-      "height": 56
+      "width": 147,
+      "height": 94
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -768,8 +771,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 47,
-      "height": 47
+      "width": 73,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -877,8 +880,6 @@
       "__id__": 0
     },
     "fileId": "51eJTa3KRPyKRBv0n8UbTU",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -905,7 +906,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 3.168,
       "y": 0,
       "z": 0
     },
@@ -996,8 +997,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 47,
-      "height": 47
+      "width": 73,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1105,6 +1106,140 @@
       "__id__": 0
     },
     "fileId": "b7wkkiT1hKZ7qmaltAk4t1",
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Sprite",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 51
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -184.278,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 147,
+      "height": 135
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bdFyiNBSJCYIUlu32ySDuU"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 50
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "25ybaa/YRMapew2CqmT9Hj"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "62AA9+zPBOooRVr4lI0v07",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1119,12 +1254,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 109,
-      "height": 56
+      "width": 147,
+      "height": 94
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1147,7 +1282,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1192,11 +1327,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 57
     },
     "clickEvents": [
       {
-        "__id__": 52
+        "__id__": 58
       }
     ],
     "_interactable": true,
@@ -1235,7 +1370,9 @@
     "_disabledSprite": null,
     "_duration": 0.1,
     "_zoomScale": 1.2,
-    "_target": null,
+    "_target": {
+      "__id__": 19
+    },
     "_id": ""
   },
   {
@@ -1262,7 +1399,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 60
     },
     "on": {
       "__id__": 20
@@ -1286,7 +1423,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 62
     },
     "safeTime": 0.5,
     "zoomScale": 1.1,
@@ -1308,8 +1445,6 @@
       "__id__": 0
     },
     "fileId": "09ygXa7RlPMqiqIVjXCc5C",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1322,37 +1457,40 @@
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 65
       },
       {
-        "__id__": 75
+        "__id__": 81
+      },
+      {
+        "__id__": 91
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 97
       },
       {
-        "__id__": 87
+        "__id__": 99
       },
       {
-        "__id__": 89
+        "__id__": 101
       },
       {
-        "__id__": 92
+        "__id__": 104
       },
       {
-        "__id__": 94
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 108
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 72,
-      "y": -52,
+      "y": -40,
       "z": 0
     },
     "_lrot": {
@@ -1384,24 +1522,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 64
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 66
       },
       {
-        "__id__": 66
+        "__id__": 72
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1438,20 +1576,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 67
       },
       {
-        "__id__": 63
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1488,16 +1626,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 109,
-      "height": 56
+      "width": 147,
+      "height": 94
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1516,11 +1654,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1574,20 +1712,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 73
       },
       {
-        "__id__": 69
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1624,16 +1762,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 66
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 74
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 47,
-      "height": 47
+      "width": 73,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1652,11 +1790,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 66
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 76
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1710,11 +1848,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1751,21 +1889,21 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 64
     },
     "_children": [
       {
-        "__id__": 76
+        "__id__": 82
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1802,20 +1940,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 75
+      "__id__": 81
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 83
       },
       {
-        "__id__": 79
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 87
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1852,16 +1990,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 76
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 84
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 47,
-      "height": 47
+      "width": 73,
+      "height": 72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1880,11 +2018,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 76
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 86
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1938,11 +2076,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 81
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1973,22 +2111,158 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Sprite",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 64
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 92
+      },
+      {
+        "__id__": 94
+      }
+    ],
+    "_prefab": {
+      "__id__": 96
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -178.997,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 91
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 93
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 147,
+      "height": 135
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "53rKH8b/JFvKlzzO38q7iL"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 95
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "166a855d-754b-4da8-8082-1cba81a795ec@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e3ouFldopO+Y7QobpS4rzo"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "f9hyL64ZNDWJozLn7lxG0O",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 109,
-      "height": 56
+      "width": 147,
+      "height": 94
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2007,11 +2281,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 100
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2052,15 +2326,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 102
     },
     "clickEvents": [
       {
-        "__id__": 91
+        "__id__": 103
       }
     ],
     "_interactable": true,
@@ -2122,17 +2396,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 105
     },
     "on": {
-      "__id__": 59
+      "__id__": 65
     },
     "off": {
-      "__id__": 75
+      "__id__": 81
     },
     "_id": ""
   },
@@ -2146,11 +2420,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 107
     },
     "safeTime": 0.5,
     "zoomScale": 1.1,
@@ -2186,7 +2460,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 110
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2214,7 +2488,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 112
     },
     "_alignFlags": 18,
     "_target": null,
@@ -2250,7 +2524,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 114
     },
     "uiType": 1,
     "_id": ""

BIN
assets/bundles/ui/UISetting/ShenYin_Kai.png


+ 134 - 0
assets/bundles/ui/UISetting/ShenYin_Kai.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "166a855d-754b-4da8-8082-1cba81a795ec",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "166a855d-754b-4da8-8082-1cba81a795ec@6c48a",
+      "displayName": "ShenYin_Kai",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "166a855d-754b-4da8-8082-1cba81a795ec",
+        "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": "166a855d-754b-4da8-8082-1cba81a795ec@f9941",
+      "displayName": "ShenYin_Kai",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 147,
+        "height": 135,
+        "rawWidth": 147,
+        "rawHeight": 135,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -73.5,
+            -67.5,
+            0,
+            73.5,
+            -67.5,
+            0,
+            -73.5,
+            67.5,
+            0,
+            73.5,
+            67.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            135,
+            147,
+            135,
+            0,
+            0,
+            147,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -73.5,
+            -67.5,
+            0
+          ],
+          "maxPos": [
+            73.5,
+            67.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "166a855d-754b-4da8-8082-1cba81a795ec@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "166a855d-754b-4da8-8082-1cba81a795ec@6c48a"
+  }
+}

BIN
assets/bundles/ui/UISetting/YinYue_Kai.png


+ 134 - 0
assets/bundles/ui/UISetting/YinYue_Kai.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d@6c48a",
+      "displayName": "YinYue_Kai",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d",
+        "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": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d@f9941",
+      "displayName": "YinYue_Kai",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 147,
+        "height": 135,
+        "rawWidth": 147,
+        "rawHeight": 135,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -73.5,
+            -67.5,
+            0,
+            73.5,
+            -67.5,
+            0,
+            -73.5,
+            67.5,
+            0,
+            73.5,
+            67.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            135,
+            147,
+            135,
+            0,
+            0,
+            147,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -73.5,
+            -67.5,
+            0
+          ],
+          "maxPos": [
+            73.5,
+            67.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1ff45d90-637e-41b0-be60-ef9d2dd07f7d@6c48a"
+  }
+}

BIN
assets/bundles/ui/UISetting/dk_sz2.png


+ 20 - 20
assets/bundles/ui/UISetting/dk_sz2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 461,
-        "height": 436,
-        "rawWidth": 461,
-        "rawHeight": 436,
+        "width": 546,
+        "height": 741,
+        "rawWidth": 546,
+        "rawHeight": 741,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -230.5,
-            -218,
+            -273,
+            -370.5,
             0,
-            230.5,
-            -218,
+            273,
+            -370.5,
             0,
-            -230.5,
-            218,
+            -273,
+            370.5,
             0,
-            230.5,
-            218,
+            273,
+            370.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            436,
-            461,
-            436,
+            741,
+            546,
+            741,
             0,
             0,
-            461,
+            546,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -230.5,
-            -218,
+            -273,
+            -370.5,
             0
           ],
           "maxPos": [
-            230.5,
-            218,
+            273,
+            370.5,
             0
           ]
         },

BIN
assets/bundles/ui/UISetting/kg1.png


+ 20 - 20
assets/bundles/ui/UISetting/kg1.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 109,
-        "height": 56,
-        "rawWidth": 109,
-        "rawHeight": 56,
+        "width": 147,
+        "height": 94,
+        "rawWidth": 147,
+        "rawHeight": 94,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -54.5,
-            -28,
+            -73.5,
+            -47,
             0,
-            54.5,
-            -28,
+            73.5,
+            -47,
             0,
-            -54.5,
-            28,
+            -73.5,
+            47,
             0,
-            54.5,
-            28,
+            73.5,
+            47,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            56,
-            109,
-            56,
+            94,
+            147,
+            94,
             0,
             0,
-            109,
+            147,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -54.5,
-            -28,
+            -73.5,
+            -47,
             0
           ],
           "maxPos": [
-            54.5,
-            28,
+            73.5,
+            47,
             0
           ]
         },

BIN
assets/bundles/ui/UISetting/kg2.png


+ 20 - 20
assets/bundles/ui/UISetting/kg2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 109,
-        "height": 56,
-        "rawWidth": 109,
-        "rawHeight": 56,
+        "width": 147,
+        "height": 94,
+        "rawWidth": 147,
+        "rawHeight": 94,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -54.5,
-            -28,
+            -73.5,
+            -47,
             0,
-            54.5,
-            -28,
+            73.5,
+            -47,
             0,
-            -54.5,
-            28,
+            -73.5,
+            47,
             0,
-            54.5,
-            28,
+            73.5,
+            47,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            56,
-            109,
-            56,
+            94,
+            147,
+            94,
             0,
             0,
-            109,
+            147,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -54.5,
-            -28,
+            -73.5,
+            -47,
             0
           ],
           "maxPos": [
-            54.5,
-            28,
+            73.5,
+            47,
             0
           ]
         },

BIN
assets/bundles/ui/UISetting/kg3.png


+ 20 - 20
assets/bundles/ui/UISetting/kg3.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 47,
-        "height": 47,
-        "rawWidth": 47,
-        "rawHeight": 47,
+        "width": 73,
+        "height": 72,
+        "rawWidth": 73,
+        "rawHeight": 72,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -23.5,
-            -23.5,
+            -36.5,
+            -36,
             0,
-            23.5,
-            -23.5,
+            36.5,
+            -36,
             0,
-            -23.5,
-            23.5,
+            -36.5,
+            36,
             0,
-            23.5,
-            23.5,
+            36.5,
+            36,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            47,
-            47,
-            47,
+            72,
+            73,
+            72,
             0,
             0,
-            47,
+            73,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -23.5,
-            -23.5,
+            -36.5,
+            -36,
             0
           ],
           "maxPos": [
-            23.5,
-            23.5,
+            36.5,
+            36,
             0
           ]
         },

BIN
assets/bundles/ui/common/btn_gb.png


+ 20 - 20
assets/bundles/ui/common/btn_gb.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 58,
-        "height": 59,
-        "rawWidth": 58,
-        "rawHeight": 59,
+        "width": 101,
+        "height": 98,
+        "rawWidth": 101,
+        "rawHeight": 98,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -29,
-            -29.5,
+            -50.5,
+            -49,
             0,
-            29,
-            -29.5,
+            50.5,
+            -49,
             0,
-            -29,
-            29.5,
+            -50.5,
+            49,
             0,
-            29,
-            29.5,
+            50.5,
+            49,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            59,
-            58,
-            59,
+            98,
+            101,
+            98,
             0,
             0,
-            58,
+            101,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -29,
-            -29.5,
+            -50.5,
+            -49,
             0
           ],
           "maxPos": [
-            29,
-            29.5,
+            50.5,
+            49,
             0
           ]
         },

BIN
assets/bundles/ui/common/dk1.png


+ 24 - 24
assets/bundles/ui/common/dk1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 159,
-        "height": 62,
-        "rawWidth": 159,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "width": 109,
+        "height": 71,
+        "rawWidth": 109,
+        "rawHeight": 71,
+        "borderTop": 30,
+        "borderBottom": 30,
+        "borderLeft": 40,
+        "borderRight": 40,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -79.5,
-            -31,
+            -54.5,
+            -35.5,
             0,
-            79.5,
-            -31,
+            54.5,
+            -35.5,
             0,
-            -79.5,
-            31,
+            -54.5,
+            35.5,
             0,
-            79.5,
-            31,
+            54.5,
+            35.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            62,
-            159,
-            62,
+            71,
+            109,
+            71,
             0,
             0,
-            159,
+            109,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -79.5,
-            -31,
+            -54.5,
+            -35.5,
             0
           ],
           "maxPos": [
-            79.5,
-            31,
+            54.5,
+            35.5,
             0
           ]
         },

BIN
assets/bundles/ui/common/nz.png


+ 26 - 26
assets/bundles/ui/common/nz.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 0,
         "trimY": 0,
-        "width": 72,
-        "height": 77,
-        "rawWidth": 73,
-        "rawHeight": 77,
+        "width": 121,
+        "height": 108,
+        "rawWidth": 121,
+        "rawHeight": 108,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -36,
-            -38.5,
+            -60.5,
+            -54,
             0,
-            36,
-            -38.5,
+            60.5,
+            -54,
             0,
-            -36,
-            38.5,
+            -60.5,
+            54,
             0,
-            36,
-            38.5,
+            60.5,
+            54,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            1,
-            77,
-            73,
-            77,
-            1,
             0,
-            73,
+            108,
+            121,
+            108,
+            0,
+            0,
+            121,
             0
           ],
           "nuv": [
-            0.0136986301369863,
+            0,
             0,
             1,
             0,
-            0.0136986301369863,
+            0,
             1,
             1,
             1
           ],
           "minPos": [
-            -36,
-            -38.5,
+            -60.5,
+            -54,
             0
           ],
           "maxPos": [
-            36,
-            38.5,
+            60.5,
+            54,
             0
           ]
         },

+ 0 - 0
assets/bundles/ui/UIGetSkill.meta → assets/bundles/ui/icon_dp.meta


BIN
assets/bundles/ui/icon_dp/BeiGuang.png


+ 134 - 0
assets/bundles/ui/icon_dp/BeiGuang.png.meta

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

BIN
assets/bundles/ui/icon_dp/Bingdong.png


+ 134 - 0
assets/bundles/ui/icon_dp/Bingdong.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "65e4dbde-597f-43fe-b618-432729b15821",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "65e4dbde-597f-43fe-b618-432729b15821@6c48a",
+      "displayName": "Bingdong",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "65e4dbde-597f-43fe-b618-432729b15821",
+        "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": "65e4dbde-597f-43fe-b618-432729b15821@f9941",
+      "displayName": "Bingdong",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 152,
+        "height": 173,
+        "rawWidth": 152,
+        "rawHeight": 173,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -76,
+            -86.5,
+            0,
+            76,
+            -86.5,
+            0,
+            -76,
+            86.5,
+            0,
+            76,
+            86.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            173,
+            152,
+            173,
+            0,
+            0,
+            152,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -76,
+            -86.5,
+            0
+          ],
+          "maxPos": [
+            76,
+            86.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "65e4dbde-597f-43fe-b618-432729b15821@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "65e4dbde-597f-43fe-b618-432729b15821@6c48a"
+  }
+}

BIN
assets/bundles/ui/icon_dp/MoBang.png


+ 134 - 0
assets/bundles/ui/icon_dp/MoBang.png.meta

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

BIN
assets/bundles/ui/icon_dp/Skill0_Get.png


+ 134 - 0
assets/bundles/ui/icon_dp/Skill0_Get.png.meta

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

BIN
assets/bundles/ui/icon_dp/Skill1_Get.png


+ 134 - 0
assets/bundles/ui/icon_dp/Skill1_Get.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "968cc344-5d6b-422f-a578-f1db37d54150",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "968cc344-5d6b-422f-a578-f1db37d54150@6c48a",
+      "displayName": "Skill1_Get",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "968cc344-5d6b-422f-a578-f1db37d54150",
+        "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": "968cc344-5d6b-422f-a578-f1db37d54150@f9941",
+      "displayName": "Skill1_Get",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 223,
+        "height": 90,
+        "rawWidth": 223,
+        "rawHeight": 90,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -111.5,
+            -45,
+            0,
+            111.5,
+            -45,
+            0,
+            -111.5,
+            45,
+            0,
+            111.5,
+            45,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            90,
+            223,
+            90,
+            0,
+            0,
+            223,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -111.5,
+            -45,
+            0
+          ],
+          "maxPos": [
+            111.5,
+            45,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "968cc344-5d6b-422f-a578-f1db37d54150@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "968cc344-5d6b-422f-a578-f1db37d54150@6c48a"
+  }
+}

BIN
assets/bundles/ui/icon_dp/Skill2_Get.png


+ 134 - 0
assets/bundles/ui/icon_dp/Skill2_Get.png.meta

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

BIN
assets/bundles/ui/icon_dp/TaiYangYueLiang.png


+ 134 - 0
assets/bundles/ui/icon_dp/TaiYangYueLiang.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "531fed76-5e03-4368-851c-ad5454ce77af",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "531fed76-5e03-4368-851c-ad5454ce77af@6c48a",
+      "displayName": "TaiYangYueLiang",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "531fed76-5e03-4368-851c-ad5454ce77af",
+        "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": "531fed76-5e03-4368-851c-ad5454ce77af@f9941",
+      "displayName": "TaiYangYueLiang",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 375,
+        "height": 140,
+        "rawWidth": 375,
+        "rawHeight": 140,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -187.5,
+            -70,
+            0,
+            187.5,
+            -70,
+            0,
+            -187.5,
+            70,
+            0,
+            187.5,
+            70,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            140,
+            375,
+            140,
+            0,
+            0,
+            375,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -187.5,
+            -70,
+            0
+          ],
+          "maxPos": [
+            187.5,
+            70,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "531fed76-5e03-4368-851c-ad5454ce77af@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "531fed76-5e03-4368-851c-ad5454ce77af@6c48a"
+  }
+}

BIN
assets/bundles/ui/icon_dp/XinXin.png


+ 134 - 0
assets/bundles/ui/icon_dp/XinXin.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "000f45a5-c2f9-428a-83d0-d7889982364c",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "000f45a5-c2f9-428a-83d0-d7889982364c@6c48a",
+      "displayName": "XinXin",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "000f45a5-c2f9-428a-83d0-d7889982364c",
+        "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": "000f45a5-c2f9-428a-83d0-d7889982364c@f9941",
+      "displayName": "XinXin",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 364,
+        "height": 172,
+        "rawWidth": 364,
+        "rawHeight": 172,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -182,
+            -86,
+            0,
+            182,
+            -86,
+            0,
+            -182,
+            86,
+            0,
+            182,
+            86,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            172,
+            364,
+            172,
+            0,
+            0,
+            364,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -182,
+            -86,
+            0
+          ],
+          "maxPos": [
+            182,
+            86,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "000f45a5-c2f9-428a-83d0-d7889982364c@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "000f45a5-c2f9-428a-83d0-d7889982364c@6c48a"
+  }
+}

BIN
assets/bundles/ui/icon_dp/XueHua.png


+ 134 - 0
assets/bundles/ui/icon_dp/XueHua.png.meta

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

BIN
assets/bundles/ui/icon_dp/ZhuanHuan.png


+ 134 - 0
assets/bundles/ui/icon_dp/ZhuanHuan.png.meta

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

+ 0 - 0
assets/bundles/ui/UIGetSkill/djtj_dk.png → assets/bundles/ui/icon_dp/djtj_dk.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/djtj_dk.png.meta → assets/bundles/ui/icon_dp/djtj_dk.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/dk_hddj.png → assets/bundles/ui/icon_dp/dk_hddj.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/dk_hddj.png.meta → assets/bundles/ui/icon_dp/dk_hddj.png.meta


BIN
assets/bundles/ui/icon_dp/icon_dp.png


+ 20 - 20
assets/bundles/ui/UIGetSkill/icon_dp.png.meta → assets/bundles/ui/icon_dp/icon_dp.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 151,
-        "height": 171,
-        "rawWidth": 151,
-        "rawHeight": 171,
+        "width": 288,
+        "height": 247,
+        "rawWidth": 288,
+        "rawHeight": 247,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -75.5,
-            -85.5,
+            -144,
+            -123.5,
             0,
-            75.5,
-            -85.5,
+            144,
+            -123.5,
             0,
-            -75.5,
-            85.5,
+            -144,
+            123.5,
             0,
-            75.5,
-            85.5,
+            144,
+            123.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            171,
-            151,
-            171,
+            247,
+            288,
+            247,
             0,
             0,
-            151,
+            288,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -75.5,
-            -85.5,
+            -144,
+            -123.5,
             0
           ],
           "maxPos": [
-            75.5,
-            85.5,
+            144,
+            123.5,
             0
           ]
         },

BIN
assets/bundles/ui/icon_dp/skill0_bg.png


+ 134 - 0
assets/bundles/ui/icon_dp/skill0_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "634e5407-915f-4418-a132-82d817b6ccf8",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "634e5407-915f-4418-a132-82d817b6ccf8@6c48a",
+      "displayName": "skill0_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "634e5407-915f-4418-a132-82d817b6ccf8",
+        "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": "634e5407-915f-4418-a132-82d817b6ccf8@f9941",
+      "displayName": "skill0_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 547,
+        "height": 679,
+        "rawWidth": 547,
+        "rawHeight": 679,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -273.5,
+            -339.5,
+            0,
+            273.5,
+            -339.5,
+            0,
+            -273.5,
+            339.5,
+            0,
+            273.5,
+            339.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            679,
+            547,
+            679,
+            0,
+            0,
+            547,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -273.5,
+            -339.5,
+            0
+          ],
+          "maxPos": [
+            273.5,
+            339.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "634e5407-915f-4418-a132-82d817b6ccf8@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "634e5407-915f-4418-a132-82d817b6ccf8@6c48a"
+  }
+}

BIN
assets/bundles/ui/icon_dp/skill1_bg.png


+ 134 - 0
assets/bundles/ui/icon_dp/skill1_bg.png.meta

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

BIN
assets/bundles/ui/icon_dp/skill2_bg.png


+ 134 - 0
assets/bundles/ui/icon_dp/skill2_bg.png.meta

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

+ 0 - 0
assets/bundles/ui/UIGetSkill/冰冻时间30秒.png → assets/bundles/ui/icon_dp/冰冻时间30秒.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/冰冻时间30秒.png.meta → assets/bundles/ui/icon_dp/冰冻时间30秒.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/冰冻道具.png → assets/bundles/ui/icon_dp/冰冻道具.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/冰冻道具.png.meta → assets/bundles/ui/icon_dp/冰冻道具.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/星星道具.png → assets/bundles/ui/icon_dp/星星道具.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/星星道具.png.meta → assets/bundles/ui/icon_dp/星星道具.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/灯泡道具.png → assets/bundles/ui/icon_dp/灯泡道具.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/灯泡道具.png.meta → assets/bundles/ui/icon_dp/灯泡道具.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/立即消除三组物品.png → assets/bundles/ui/icon_dp/立即消除三组物品.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/立即消除三组物品.png.meta → assets/bundles/ui/icon_dp/立即消除三组物品.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/获得星星双倍30秒.png → assets/bundles/ui/icon_dp/获得星星双倍30秒.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/获得星星双倍30秒.png.meta → assets/bundles/ui/icon_dp/获得星星双倍30秒.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/获得道具.png → assets/bundles/ui/icon_dp/获得道具.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/获得道具.png.meta → assets/bundles/ui/icon_dp/获得道具.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/转换道具.png → assets/bundles/ui/icon_dp/转换道具.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/转换道具.png.meta → assets/bundles/ui/icon_dp/转换道具.png.meta


+ 0 - 0
assets/bundles/ui/UIGetSkill/重置所有物品的位置.png → assets/bundles/ui/icon_dp/重置所有物品的位置.png


+ 0 - 0
assets/bundles/ui/UIGetSkill/重置所有物品的位置.png.meta → assets/bundles/ui/icon_dp/重置所有物品的位置.png.meta


+ 12 - 9
assets/scripts/config/CfgSkillInfo.ts

@@ -1,21 +1,24 @@
 export const CfgSkillInfo = [
     {
         id: 0,
-        name: '冰冻道具',
-        desc: '冰冻时间30秒',
-        icon: 'item/icon_bd'
+        name: 'Frost',
+        desc: 'Freeze time 30s',
+        icon: 'item/icon_bd',
+        btnIcon: 'icon_dp/Skill0_Get'
     },
     {
         id: 1,
-        name: '灯泡道具',
-        desc: '立即消除三组物品',
-        icon: 'item/icon_dp'
+        name: 'Eliminate',
+        desc: 'Remove three sets of items',
+        icon: 'item/icon_dp',
+        btnIcon: 'icon_dp/Skill1_Get'
     },
     {
         id: 2,
-        name: '转换道具',
-        desc: '重置所有物品的位置',
-        icon: 'item/icon_sx'
+        name: 'Refresh',
+        desc: 'Refresh item location',
+        icon: 'item/icon_sx',
+        btnIcon: 'icon_dp/Skill2_Get'
     },
     {
         id: 3,

Some files were not shown because too many files changed in this diff