wujia 6 місяців тому
батько
коміт
10745fa2e7
22 змінених файлів з 505 додано та 833 видалено
  1. 45 45
      assets/package/prefab/ui/tips/CommomTips.prefab
  2. 13 16
      assets/script/game/ui/hero/EquipOpreate.ts
  3. BIN
      assets/sub_bundle/common/texture/background/bg_1.png
  4. 24 24
      assets/sub_bundle/common/texture/background/bg_1.png.meta
  5. BIN
      assets/sub_bundle/common/texture/background/bg_2.png
  6. BIN
      assets/sub_bundle/common/texture/background/bg_3.png
  7. 24 24
      assets/sub_bundle/common/texture/background/bg_3.png.meta
  8. BIN
      assets/sub_bundle/common/texture/button/green_btn_1.png
  9. 12 12
      assets/sub_bundle/common/texture/button/green_btn_1.png.meta
  10. BIN
      assets/sub_bundle/common/texture/button/grey_btn_1.png
  11. 22 22
      assets/sub_bundle/common/texture/button/grey_btn_1.png.meta
  12. BIN
      assets/sub_bundle/common/texture/button/tips_bnt.png
  13. 134 0
      assets/sub_bundle/common/texture/button/tips_bnt.png.meta
  14. BIN
      assets/sub_bundle/common/texture/button/yellow_btn_1.png
  15. 22 22
      assets/sub_bundle/common/texture/button/yellow_btn_1.png.meta
  16. BIN
      assets/sub_bundle/common/texture/image/line_1.png
  17. 21 21
      assets/sub_bundle/common/texture/image/line_1.png.meta
  18. BIN
      assets/sub_bundle/common/texture/image/star_0.png
  19. 20 20
      assets/sub_bundle/common/texture/image/star_0.png.meta
  20. BIN
      assets/sub_bundle/common/texture/image/star_1.png
  21. 20 20
      assets/sub_bundle/common/texture/image/star_1.png.meta
  22. 148 607
      assets/sub_bundle/hero/prefab/EquipOperate.prefab

+ 45 - 45
assets/package/prefab/ui/tips/CommomTips.prefab

@@ -568,8 +568,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 74.935546875,
-      "height": 43.8
+      "width": 82.060546875,
+      "height": 46.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -600,17 +600,17 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 239,
-      "b": 201,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_string": "邮 件",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 30,
-    "_fontSize": 30,
+    "_actualFontSize": 34,
+    "_fontSize": 34,
     "_fontFamily": "Arial",
-    "_lineHeight": 30,
+    "_lineHeight": 34,
     "_overflow": 0,
     "_enableWrapText": false,
     "_font": {
@@ -620,7 +620,7 @@
     "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -632,7 +632,7 @@
       "b": 0,
       "a": 255
     },
-    "_outlineWidth": 3,
+    "_outlineWidth": 2,
     "_enableShadow": false,
     "_shadowColor": {
       "__type__": "cc.Color",
@@ -909,7 +909,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -949,8 +949,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 62,
-      "height": 41.28
+      "width": 72,
+      "height": 46.84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -988,10 +988,10 @@
     "_string": "取消",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 28,
-    "_fontSize": 28,
+    "_actualFontSize": 34,
+    "_fontSize": 34,
     "_fontFamily": "Arial",
-    "_lineHeight": 28,
+    "_lineHeight": 34,
     "_overflow": 0,
     "_enableWrapText": false,
     "_font": {
@@ -1001,19 +1001,19 @@
     "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
     "_enableOutline": true,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 40,
-      "g": 86,
-      "b": 115,
+      "r": 91,
+      "g": 49,
+      "b": 20,
       "a": 255
     },
-    "_outlineWidth": 3,
+    "_outlineWidth": 2,
     "_enableShadow": false,
     "_shadowColor": {
       "__type__": "cc.Color",
@@ -1061,8 +1061,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 182,
-      "height": 90
+      "width": 248,
+      "height": 91
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1098,7 +1098,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "a08bf7db-92e5-4606-b525-0487cd0c3154@f9941",
+      "__uuid__": "34877f34-75e1-4cbb-8ec9-f1eda8f303fc@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1286,7 +1286,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -1365,10 +1365,10 @@
     "_string": "确定",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 28,
-    "_fontSize": 28,
+    "_actualFontSize": 34,
+    "_fontSize": 34,
     "_fontFamily": "Arial",
-    "_lineHeight": 28,
+    "_lineHeight": 34,
     "_overflow": 2,
     "_enableWrapText": false,
     "_font": {
@@ -1378,19 +1378,19 @@
     "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
     "_enableOutline": true,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 117,
-      "g": 71,
-      "b": 16,
+      "r": 49,
+      "g": 102,
+      "b": 38,
       "a": 255
     },
-    "_outlineWidth": 3,
+    "_outlineWidth": 2,
     "_enableShadow": false,
     "_shadowColor": {
       "__type__": "cc.Color",
@@ -1438,7 +1438,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 182,
+      "width": 248,
       "height": 90
     },
     "_anchorPoint": {
@@ -1475,7 +1475,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "34877f34-75e1-4cbb-8ec9-f1eda8f303fc@f9941",
+      "__uuid__": "d72e727b-1781-483e-a777-2c897d7df1be@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1663,7 +1663,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -1742,10 +1742,10 @@
     "_string": "关闭",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 28,
-    "_fontSize": 28,
+    "_actualFontSize": 34,
+    "_fontSize": 34,
     "_fontFamily": "Arial",
-    "_lineHeight": 28,
+    "_lineHeight": 34,
     "_overflow": 2,
     "_enableWrapText": false,
     "_font": {
@@ -1755,19 +1755,19 @@
     "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
     "_enableOutline": true,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 117,
-      "g": 71,
-      "b": 16,
+      "r": 49,
+      "g": 102,
+      "b": 38,
       "a": 255
     },
-    "_outlineWidth": 3,
+    "_outlineWidth": 2,
     "_enableShadow": false,
     "_shadowColor": {
       "__type__": "cc.Color",
@@ -1815,7 +1815,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 182,
+      "width": 248,
       "height": 90
     },
     "_anchorPoint": {
@@ -1852,7 +1852,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "97842c44-989e-43cd-9558-4c7583ef0b0b@f9941",
+      "__uuid__": "d72e727b-1781-483e-a777-2c897d7df1be@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

+ 13 - 16
assets/script/game/ui/hero/EquipOpreate.ts

@@ -1,4 +1,4 @@
-import { _decorator, instantiate, Label, Node, Prefab, SpotLight, Sprite, tween, UIOpacity } from 'cc';
+import { _decorator, instantiate, Label, Node, Prefab, RichText, SpotLight, Sprite, tween, UIOpacity } from 'cc';
 import { BaseView } from '../../../framework/layer/BaseView';
 import { StringUtil } from '../../../framework/util/StringUtil';
 import { Equip } from '../../data/EquipData';
@@ -15,9 +15,6 @@ export class EquipOpreate extends BaseView {
 	@property({ type: Label, tooltip: "关闭提示" })
 	closeTips: Label = null;
 
-	@property({ type: Label, tooltip: "标题" })
-	titieTx: Label = null;
-
 	@property({ type: Node, tooltip: "图标节点" })
 	itemNode: Node = null;
 
@@ -30,14 +27,14 @@ export class EquipOpreate extends BaseView {
 	@property({ type: Label, tooltip: "部位" })
 	slotTx: Label = null;
 
+	@property({ type: Label, tooltip: "描述标题" })
+	descTitieTx: Label = null;
+
 	@property({ type: Label, tooltip: "描述" })
 	descTx: Label = null;
 
-	@property({ type: Label, tooltip: "属性标题" })
-	attrTitieTx: Label = null;
-
-	@property({ type: Label, tooltip: "属性" })
-	attrTx: Label = null;
+	@property({ type: RichText, tooltip: "属性" })
+	attrTx: RichText = null;
 
 	@property({ type: Sprite, tooltip: "替换/卸下按钮图" })
 	wearBtnSp: Sprite = null;
@@ -59,8 +56,7 @@ export class EquipOpreate extends BaseView {
 	protected onLoad() {
 		super.onLoad();
 		this.closeTips.string = StringUtil.getLanguageData('点击空白关闭');
-		this.titieTx.string = StringUtil.getLanguageData('装备详情');
-		this.attrTitieTx.string = StringUtil.getLanguageData('属性加成');
+		this.descTitieTx.string = StringUtil.getLanguageData('装备描述');
 		this.wearBtnTx.string = StringUtil.getLanguageData('替换');
 		this.updateBtnTx.string = StringUtil.getLanguageData('升级');
 		this.strongBtnTx.string = StringUtil.getLanguageData('突破');
@@ -142,18 +138,19 @@ export class EquipOpreate extends BaseView {
 		this.slotTx.string = `${StringUtil.getLanguageData('装备位置')}: ${StringUtil.getLanguageData('部位' + this._curEquip.conf['Slot'])}`;
 		this.descTx.string = StringUtil.getLanguageData(this._curEquip.conf['Desc']);
 
-		let attrStr = "";
+		let attrName = "";
+		let attrNum = "";
 		for (let index = 1; index <= 2; index++) {
 			let Stat = this._curEquip.conf['Stat' + index];
 			if (Stat != 0) {
 				let attr = Stat.split(':');
 				let attrConf = AttrConf[attr[0]]
-				let value = attrConf.type == AttrAddTypeEnum.reality ? ("+" + attr[1]) :
-					("+" + (100 * Number(attr[1])) + "%")
-				attrStr = attrStr + StringUtil.getLanguageData(attrConf.name) + ' ' + value + "\n";
+				attrNum = attrConf.type == AttrAddTypeEnum.reality ? (attr[1]) :
+					((100 * Number(attr[1])) + "%")
+					attrName = StringUtil.getLanguageData(attrConf.name)
 			}
 		}
-		this.attrTx.string = attrStr;
+		this.attrTx.string = `<b><outline color=black width=2><color=#ffffff>${attrName}: </color><color=#FDD818 >${attrNum}</color></outline></b>`;
 	}
 
 }

BIN
assets/sub_bundle/common/texture/background/bg_1.png


+ 24 - 24
assets/sub_bundle/common/texture/background/bg_1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 704,
-        "height": 562,
-        "rawWidth": 704,
-        "rawHeight": 562,
-        "borderTop": 200,
-        "borderBottom": 200,
-        "borderLeft": 250,
-        "borderRight": 250,
+        "width": 100,
+        "height": 100,
+        "rawWidth": 100,
+        "rawHeight": 100,
+        "borderTop": 30,
+        "borderBottom": 30,
+        "borderLeft": 30,
+        "borderRight": 30,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -352,
-            -281,
+            -50,
+            -50,
             0,
-            352,
-            -281,
+            50,
+            -50,
             0,
-            -352,
-            281,
+            -50,
+            50,
             0,
-            352,
-            281,
+            50,
+            50,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            562,
-            704,
-            562,
+            100,
+            100,
+            100,
             0,
             0,
-            704,
+            100,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -352,
-            -281,
+            -50,
+            -50,
             0
           ],
           "maxPos": [
-            352,
-            281,
+            50,
+            50,
             0
           ]
         },

BIN
assets/sub_bundle/common/texture/background/bg_2.png


BIN
assets/sub_bundle/common/texture/background/bg_3.png


+ 24 - 24
assets/sub_bundle/common/texture/background/bg_3.png.meta

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

BIN
assets/sub_bundle/common/texture/button/green_btn_1.png


+ 12 - 12
assets/sub_bundle/common/texture/button/green_btn_1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 182,
+        "width": 248,
         "height": 90,
-        "rawWidth": 182,
+        "rawWidth": 248,
         "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderLeft": 50,
+        "borderRight": 50,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -91,
+            -124,
             -45,
             0,
-            91,
+            124,
             -45,
             0,
-            -91,
+            -124,
             45,
             0,
-            91,
+            124,
             45,
             0
           ],
@@ -85,11 +85,11 @@
           "uv": [
             0,
             90,
-            182,
+            248,
             90,
             0,
             0,
-            182,
+            248,
             0
           ],
           "nuv": [
@@ -103,12 +103,12 @@
             1
           ],
           "minPos": [
-            -91,
+            -124,
             -45,
             0
           ],
           "maxPos": [
-            91,
+            124,
             45,
             0
           ]

BIN
assets/sub_bundle/common/texture/button/grey_btn_1.png


+ 22 - 22
assets/sub_bundle/common/texture/button/grey_btn_1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 182,
-        "height": 90,
-        "rawWidth": 182,
-        "rawHeight": 90,
+        "width": 248,
+        "height": 91,
+        "rawWidth": 248,
+        "rawHeight": 91,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderLeft": 50,
+        "borderRight": 50,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -91,
-            -45,
+            -124,
+            -45.5,
             0,
-            91,
-            -45,
+            124,
+            -45.5,
             0,
-            -91,
-            45,
+            -124,
+            45.5,
             0,
-            91,
-            45,
+            124,
+            45.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            90,
-            182,
-            90,
+            91,
+            248,
+            91,
             0,
             0,
-            182,
+            248,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -91,
-            -45,
+            -124,
+            -45.5,
             0
           ],
           "maxPos": [
-            91,
-            45,
+            124,
+            45.5,
             0
           ]
         },

BIN
assets/sub_bundle/common/texture/button/tips_bnt.png


+ 134 - 0
assets/sub_bundle/common/texture/button/tips_bnt.png.meta

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

BIN
assets/sub_bundle/common/texture/button/yellow_btn_1.png


+ 22 - 22
assets/sub_bundle/common/texture/button/yellow_btn_1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 182,
-        "height": 90,
-        "rawWidth": 182,
-        "rawHeight": 90,
+        "width": 248,
+        "height": 91,
+        "rawWidth": 248,
+        "rawHeight": 91,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderLeft": 50,
+        "borderRight": 50,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -91,
-            -45,
+            -124,
+            -45.5,
             0,
-            91,
-            -45,
+            124,
+            -45.5,
             0,
-            -91,
-            45,
+            -124,
+            45.5,
             0,
-            91,
-            45,
+            124,
+            45.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            90,
-            182,
-            90,
+            91,
+            248,
+            91,
             0,
             0,
-            182,
+            248,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -91,
-            -45,
+            -124,
+            -45.5,
             0
           ],
           "maxPos": [
-            91,
-            45,
+            124,
+            45.5,
             0
           ]
         },

BIN
assets/sub_bundle/common/texture/image/line_1.png


+ 21 - 21
assets/sub_bundle/common/texture/image/line_1.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 658,
-        "height": 4,
-        "rawWidth": 658,
-        "rawHeight": 4,
+        "width": 493,
+        "height": 2,
+        "rawWidth": 493,
+        "rawHeight": 2,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 100,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -329,
-            -2,
+            -246.5,
+            -1,
             0,
-            329,
-            -2,
+            246.5,
+            -1,
             0,
-            -329,
-            2,
+            -246.5,
+            1,
             0,
-            329,
-            2,
+            246.5,
+            1,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            4,
-            658,
-            4,
+            2,
+            493,
+            2,
             0,
             0,
-            658,
+            493,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -329,
-            -2,
+            -246.5,
+            -1,
             0
           ],
           "maxPos": [
-            329,
-            2,
+            246.5,
+            1,
             0
           ]
         },
@@ -127,7 +127,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
     "redirect": "3e3c9ff8-a39c-4a56-8ba3-e6914f2131cf@6c48a"
   }

BIN
assets/sub_bundle/common/texture/image/star_0.png


+ 20 - 20
assets/sub_bundle/common/texture/image/star_0.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
+        "trimX": 2,
+        "trimY": 2,
         "width": 30,
         "height": 29,
-        "rawWidth": 30,
-        "rawHeight": 29,
+        "rawWidth": 34,
+        "rawHeight": 33,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            0,
-            29,
-            30,
-            29,
-            0,
-            0,
-            30,
-            0
+            2,
+            31,
+            32,
+            31,
+            2,
+            2,
+            32,
+            2
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.058823529411764705,
+            0.06060606060606061,
+            0.9411764705882353,
+            0.06060606060606061,
+            0.058823529411764705,
+            0.9393939393939394,
+            0.9411764705882353,
+            0.9393939393939394
           ],
           "minPos": [
             -15,

BIN
assets/sub_bundle/common/texture/image/star_1.png


+ 20 - 20
assets/sub_bundle/common/texture/image/star_1.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
+        "trimX": 2,
+        "trimY": 2,
         "width": 30,
         "height": 29,
-        "rawWidth": 30,
-        "rawHeight": 29,
+        "rawWidth": 34,
+        "rawHeight": 33,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            0,
-            29,
-            30,
-            29,
-            0,
-            0,
-            30,
-            0
+            2,
+            31,
+            32,
+            31,
+            2,
+            2,
+            32,
+            2
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.058823529411764705,
+            0.06060606060606061,
+            0.9411764705882353,
+            0.06060606060606061,
+            0.058823529411764705,
+            0.9393939393939394,
+            0.9411764705882353,
+            0.9393939393939394
           ],
           "minPos": [
             -15,

Різницю між файлами не показано, бо вона завелика
+ 148 - 607
assets/sub_bundle/hero/prefab/EquipOperate.prefab


Деякі файли не було показано, через те що забагато файлів було змінено