diff --git a/assets/resources/gui/element/prefab_talent_item.prefab b/assets/resources/gui/element/prefab_talent_item.prefab index 959ecf1d..1545f54e 100644 --- a/assets/resources/gui/element/prefab_talent_item.prefab +++ b/assets/resources/gui/element/prefab_talent_item.prefab @@ -2151,13 +2151,10 @@ "bg": { "__id__": 2 }, - "node_plus": null, "node_max": { "__id__": 70 }, - "node_lock": { - "__id__": 64 - }, + "node_lock": null, "_id": "" }, { diff --git a/assets/resources/gui/element/talents.prefab b/assets/resources/gui/element/talents.prefab index b2cf683f..a9e82b09 100644 --- a/assets/resources/gui/element/talents.prefab +++ b/assets/resources/gui/element/talents.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 20 + "__id__": 30 }, { - "__id__": 70 + "__id__": 80 }, { - "__id__": 114 - }, - { - "__id__": 217 - } - ], - "_active": true, - "_components": [ - { - "__id__": 223 - }, - { - "__id__": 225 + "__id__": 124 }, { "__id__": 227 } ], + "_active": true, + "_components": [ + { + "__id__": 233 + }, + { + "__id__": 235 + }, + { + "__id__": 237 + } + ], "_prefab": { - "__id__": 229 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", @@ -110,43 +110,243 @@ "prefabRootNode": { "__id__": 1 }, - "mountedChildren": [], + "mountedChildren": [ + { + "__id__": 5 + } + ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 5 + "__id__": 15 }, + { + "__id__": 17 + }, + { + "__id__": 18 + }, + { + "__id__": 19 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + }, + { + "__id__": 26 + }, + { + "__id__": 28 + } + ], + "removedComponents": [] + }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 6 + }, + "nodes": [ { "__id__": 7 - }, + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "7228fRtBlHhKwOIL9H6qr/" + ] + }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 2 + } + }, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 8 }, - { - "__id__": 9 - }, { "__id__": 10 }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], - "removedComponents": [] + "_prefab": { + "__id__": 14 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 590.947, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 7 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 740, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "caD6JpcP9NVZKHxNxDbHWd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 7 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 65, + "g": 65, + "b": 65, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d3QQ/0DwxDsLa0/azUf7/C" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 7 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_alignFlags": 41, + "_target": null, + "_left": -10, + "_right": -10, + "_top": -0.9470000000000027, + "_bottom": 1224.075, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 20, + "_originalHeight": 20, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "50TRho+tNGCaFbUz1NqZE0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c3VMIjov9Acorcz8vxlKKe", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 6 + "__id__": 16 }, "propertyPath": [ "_name" @@ -162,7 +362,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 6 + "__id__": 16 }, "propertyPath": [ "_lpos" @@ -177,7 +377,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 6 + "__id__": 16 }, "propertyPath": [ "_lrot" @@ -193,7 +393,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 6 + "__id__": 16 }, "propertyPath": [ "_euler" @@ -208,16 +408,16 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 11 + "__id__": 21 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 209, - "g": 171, - "b": 255, + "r": 83, + "g": 83, + "b": 83, "a": 255 } }, @@ -230,16 +430,16 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 13 + "__id__": 23 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 221, - "g": 241, - "b": 255, + "r": 134, + "g": 134, + "b": 134, "a": 255 } }, @@ -252,12 +452,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 25 }, "propertyPath": [ "_bottom" ], - "value": 500 + "value": 0 }, { "__type__": "cc.TargetInfo", @@ -268,7 +468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 17 + "__id__": 27 }, "propertyPath": [ "_contentSize" @@ -276,7 +476,7 @@ "value": { "__type__": "cc.Size", "width": 720, - "height": 780 + "height": 1280 } }, { @@ -288,7 +488,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 29 }, "propertyPath": [ "_lpos" @@ -296,7 +496,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 250, + "y": 0, "z": 0 } }, @@ -316,34 +516,34 @@ }, "_children": [ { - "__id__": 21 + "__id__": 31 }, { - "__id__": 33 + "__id__": 43 }, { - "__id__": 51 + "__id__": 61 } ], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 73 }, { - "__id__": 65 + "__id__": 75 }, { - "__id__": 67 + "__id__": 77 } ], "_prefab": { - "__id__": 69 + "__id__": 79 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 527.606, + "y": 512.707, "z": 0 }, "_lrot": { @@ -375,24 +575,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 30 }, "_children": [ { - "__id__": 22 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 38 }, { - "__id__": 30 + "__id__": 40 } ], "_prefab": { - "__id__": 32 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -429,20 +629,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 31 }, "_children": [], "_active": true, "_components": [ { - "__id__": 23 + "__id__": 33 }, { - "__id__": 25 + "__id__": 35 } ], "_prefab": { - "__id__": 27 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", @@ -479,11 +679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -507,11 +707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -588,11 +788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -616,11 +816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 41 }, "_alignFlags": 32, "_target": null, @@ -665,21 +865,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 30 }, "_children": [ { - "__id__": 34 + "__id__": 44 } ], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 58 } ], "_prefab": { - "__id__": 50 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -716,27 +916,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 43 }, "_children": [ { - "__id__": 35 + "__id__": 45 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 51 }, { - "__id__": 43 + "__id__": 53 }, { - "__id__": 45 + "__id__": 55 } ], "_prefab": { - "__id__": 47 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -773,20 +973,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 34 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 46 }, { - "__id__": 38 + "__id__": 48 } ], "_prefab": { - "__id__": 40 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -823,11 +1023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -851,11 +1051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -868,7 +1068,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@457d0", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fe983", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -912,16 +1112,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", - "width": 800, - "height": 50 + "width": 810, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -940,11 +1140,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -957,7 +1157,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@70413", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@19840", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -988,14 +1188,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 56 }, "_barSprite": { - "__id__": 38 + "__id__": 48 }, "_mode": 0, "_totalLength": 800, @@ -1026,11 +1226,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", @@ -1067,24 +1267,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 30 }, "_children": [ { - "__id__": 52 + "__id__": 62 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 68 }, { - "__id__": 60 + "__id__": 70 } ], "_prefab": { - "__id__": 62 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -1121,20 +1321,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 51 + "__id__": 61 }, "_children": [], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 63 }, { - "__id__": 55 + "__id__": 65 } ], "_prefab": { - "__id__": 57 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -1171,11 +1371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 64 }, "_contentSize": { "__type__": "cc.Size", @@ -1199,11 +1399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 66 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1280,11 +1480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1308,11 +1508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1369,11 +1569,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 74 }, "_contentSize": { "__type__": "cc.Size", @@ -1397,11 +1597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 76 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1442,11 +1642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 78 }, "_alignFlags": 40, "_target": null, @@ -1495,29 +1695,29 @@ }, "_children": [ { - "__id__": 71 + "__id__": 81 }, { - "__id__": 89 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 117 }, { - "__id__": 109 + "__id__": 119 }, { - "__id__": 86 + "__id__": 96 }, { - "__id__": 111 + "__id__": 121 } ], "_prefab": { - "__id__": 113 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -1554,30 +1754,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [ { - "__id__": 72 + "__id__": 82 } ], "_active": false, "_components": [ { - "__id__": 78 + "__id__": 88 }, { - "__id__": 80 + "__id__": 90 }, { - "__id__": 82 + "__id__": 92 }, { - "__id__": 84 + "__id__": 94 } ], "_prefab": { - "__id__": 106 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1614,20 +1814,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 81 }, "_children": [], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 83 }, { - "__id__": 75 + "__id__": 85 } ], "_prefab": { - "__id__": 77 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", @@ -1664,11 +1864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1692,11 +1892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1750,11 +1950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", @@ -1778,11 +1978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1823,11 +2023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 93 }, "_alignFlags": 37, "_target": null, @@ -1859,17 +2059,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 95 }, "_scrollView": { - "__id__": 86 + "__id__": 96 }, "_handle": { - "__id__": 75 + "__id__": 85 }, "_direction": 1, "_enableAutoHide": false, @@ -1886,11 +2086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 97 }, "bounceDuration": 0.23, "brake": 0.75, @@ -1901,11 +2101,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 88 + "__id__": 98 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 84 + "__id__": 94 }, "_id": "" }, @@ -1919,23 +2119,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 89 + "__id__": 99 }, "_children": [], "_active": true, "_components": [ { - "__id__": 99 + "__id__": 109 }, { - "__id__": 101 + "__id__": 111 }, { - "__id__": 103 + "__id__": 113 } ], "_prefab": { - "__id__": 105 + "__id__": 115 }, "_lpos": { "__type__": "cc.Vec3", @@ -1972,30 +2172,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [ { - "__id__": 88 + "__id__": 98 } ], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 100 }, { - "__id__": 92 + "__id__": 102 }, { - "__id__": 94 + "__id__": 104 }, { - "__id__": 96 + "__id__": 106 } ], "_prefab": { - "__id__": 98 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2032,11 +2232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2060,11 +2260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 103 }, "_type": 0, "_inverted": false, @@ -2082,11 +2282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2128,11 +2328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 107 }, "_alignFlags": 45, "_target": null, @@ -2177,11 +2377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2205,11 +2405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 112 }, "_alignFlags": 41, "_target": null, @@ -2241,11 +2441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 114 }, "_resizeMode": 0, "_layoutType": 3, @@ -2305,11 +2505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2333,11 +2533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": false, "__prefab": { - "__id__": 110 + "__id__": 120 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2378,11 +2578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 122 }, "_alignFlags": 45, "_target": null, @@ -2431,26 +2631,26 @@ }, "_children": [ { - "__id__": 115 + "__id__": 125 }, { - "__id__": 144 + "__id__": 154 }, { - "__id__": 178 + "__id__": 188 } ], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 222 }, { - "__id__": 214 + "__id__": 224 } ], "_prefab": { - "__id__": 216 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -2487,27 +2687,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 114 + "__id__": 124 }, "_children": [ { - "__id__": 116 + "__id__": 126 }, { - "__id__": 124 + "__id__": 134 }, { - "__id__": 135 + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 151 } ], "_prefab": { - "__id__": 143 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -2542,17 +2742,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 115 + "__id__": 125 }, "_prefab": { - "__id__": 117 + "__id__": 127 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 116 + "__id__": 126 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -2560,7 +2760,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 118 + "__id__": 128 }, "targetOverrides": null }, @@ -2574,16 +2774,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 119 + "__id__": 129 }, { - "__id__": 121 + "__id__": 131 }, { - "__id__": 122 + "__id__": 132 }, { - "__id__": 123 + "__id__": 133 } ], "removedComponents": [] @@ -2591,7 +2791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 130 }, "propertyPath": [ "_name" @@ -2607,7 +2807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 130 }, "propertyPath": [ "_lpos" @@ -2622,7 +2822,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 130 }, "propertyPath": [ "_lrot" @@ -2638,7 +2838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 130 }, "propertyPath": [ "_euler" @@ -2654,17 +2854,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 115 + "__id__": 125 }, "_prefab": { - "__id__": 125 + "__id__": 135 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 124 + "__id__": 134 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -2672,7 +2872,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 126 + "__id__": 136 }, "targetOverrides": null }, @@ -2686,22 +2886,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 127 + "__id__": 137 }, { - "__id__": 129 + "__id__": 139 }, { - "__id__": 130 + "__id__": 140 }, { - "__id__": 131 + "__id__": 141 }, { - "__id__": 132 + "__id__": 142 }, { - "__id__": 134 + "__id__": 144 } ], "removedComponents": [] @@ -2709,7 +2909,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 138 }, "propertyPath": [ "_name" @@ -2725,7 +2925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 138 }, "propertyPath": [ "_lpos" @@ -2740,7 +2940,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 138 }, "propertyPath": [ "_lrot" @@ -2756,7 +2956,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 138 }, "propertyPath": [ "_euler" @@ -2771,7 +2971,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 133 + "__id__": 143 }, "propertyPath": [ "_color" @@ -2793,7 +2993,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 138 }, "propertyPath": [ "_active" @@ -2806,20 +3006,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 115 + "__id__": 125 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 146 }, { - "__id__": 138 + "__id__": 148 } ], "_prefab": { - "__id__": 140 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -2856,11 +3056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -2884,11 +3084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2965,11 +3165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -3006,30 +3206,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 114 + "__id__": 124 }, "_children": [ { - "__id__": 145 - }, - { - "__id__": 153 + "__id__": 155 }, { "__id__": 163 }, { - "__id__": 169 + "__id__": 173 + }, + { + "__id__": 179 } ], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 185 } ], "_prefab": { - "__id__": 177 + "__id__": 187 }, "_lpos": { "__type__": "cc.Vec3", @@ -3064,17 +3264,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 144 + "__id__": 154 }, "_prefab": { - "__id__": 146 + "__id__": 156 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 145 + "__id__": 155 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3082,7 +3282,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 147 + "__id__": 157 }, "targetOverrides": null }, @@ -3096,16 +3296,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 148 + "__id__": 158 }, { - "__id__": 150 + "__id__": 160 }, { - "__id__": 151 + "__id__": 161 }, { - "__id__": 152 + "__id__": 162 } ], "removedComponents": [] @@ -3113,7 +3313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 159 }, "propertyPath": [ "_name" @@ -3129,7 +3329,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 159 }, "propertyPath": [ "_lpos" @@ -3144,7 +3344,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 159 }, "propertyPath": [ "_lrot" @@ -3160,7 +3360,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 159 }, "propertyPath": [ "_euler" @@ -3176,17 +3376,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 144 + "__id__": 154 }, "_prefab": { - "__id__": 154 + "__id__": 164 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 153 + "__id__": 163 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3194,7 +3394,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 155 + "__id__": 165 }, "targetOverrides": null }, @@ -3208,19 +3408,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 156 + "__id__": 166 }, { - "__id__": 158 + "__id__": 168 }, { - "__id__": 159 + "__id__": 169 }, { - "__id__": 160 + "__id__": 170 }, { - "__id__": 161 + "__id__": 171 } ], "removedComponents": [] @@ -3228,7 +3428,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 167 }, "propertyPath": [ "_name" @@ -3244,7 +3444,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 167 }, "propertyPath": [ "_lpos" @@ -3259,7 +3459,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 167 }, "propertyPath": [ "_lrot" @@ -3275,7 +3475,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 167 }, "propertyPath": [ "_euler" @@ -3290,7 +3490,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 172 }, "propertyPath": [ "_color" @@ -3315,20 +3515,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 144 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 174 }, { - "__id__": 166 + "__id__": 176 } ], "_prefab": { - "__id__": 168 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -3365,11 +3565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", @@ -3393,11 +3593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3474,20 +3674,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 144 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 180 }, { - "__id__": 172 + "__id__": 182 } ], "_prefab": { - "__id__": 174 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -3524,11 +3724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 181 }, "_contentSize": { "__type__": "cc.Size", @@ -3552,11 +3752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 183 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3568,13 +3768,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7d7fe", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3610,11 +3807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 186 }, "_contentSize": { "__type__": "cc.Size", @@ -3651,30 +3848,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 114 + "__id__": 124 }, "_children": [ { - "__id__": 179 - }, - { - "__id__": 187 + "__id__": 189 }, { "__id__": 197 }, { - "__id__": 203 + "__id__": 207 + }, + { + "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 209 + "__id__": 219 } ], "_prefab": { - "__id__": 211 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -3709,17 +3906,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 178 + "__id__": 188 }, "_prefab": { - "__id__": 180 + "__id__": 190 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 179 + "__id__": 189 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3727,7 +3924,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 181 + "__id__": 191 }, "targetOverrides": null }, @@ -3741,16 +3938,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 182 + "__id__": 192 }, { - "__id__": 184 + "__id__": 194 }, { - "__id__": 185 + "__id__": 195 }, { - "__id__": 186 + "__id__": 196 } ], "removedComponents": [] @@ -3758,7 +3955,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 193 }, "propertyPath": [ "_name" @@ -3774,7 +3971,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 193 }, "propertyPath": [ "_lpos" @@ -3789,7 +3986,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 193 }, "propertyPath": [ "_lrot" @@ -3805,7 +4002,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 193 }, "propertyPath": [ "_euler" @@ -3821,17 +4018,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 178 + "__id__": 188 }, "_prefab": { - "__id__": 188 + "__id__": 198 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 187 + "__id__": 197 }, "asset": { "__uuid__": "f42da8df-b2a0-49a4-a1ce-dcfe5e62e0c8", @@ -3839,7 +4036,7 @@ }, "fileId": "b6wCk5tlZEMqEmX5Myn34Y", "instance": { - "__id__": 189 + "__id__": 199 }, "targetOverrides": null }, @@ -3853,19 +4050,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 190 + "__id__": 200 }, { - "__id__": 192 + "__id__": 202 }, { - "__id__": 193 + "__id__": 203 }, { - "__id__": 194 + "__id__": 204 }, { - "__id__": 195 + "__id__": 205 } ], "removedComponents": [] @@ -3873,7 +4070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 201 }, "propertyPath": [ "_name" @@ -3889,7 +4086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 201 }, "propertyPath": [ "_lpos" @@ -3904,7 +4101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 201 }, "propertyPath": [ "_lrot" @@ -3920,7 +4117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 201 }, "propertyPath": [ "_euler" @@ -3935,7 +4132,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 196 + "__id__": 206 }, "propertyPath": [ "_color" @@ -3960,20 +4157,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 178 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 198 + "__id__": 208 }, { - "__id__": 200 + "__id__": 210 } ], "_prefab": { - "__id__": 202 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -4010,11 +4207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -4038,11 +4235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4119,20 +4316,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 178 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 204 + "__id__": 214 }, { - "__id__": 206 + "__id__": 216 } ], "_prefab": { - "__id__": 208 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -4169,11 +4366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -4197,11 +4394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4213,13 +4410,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7d7fe", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -4255,11 +4449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -4296,11 +4490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -4324,11 +4518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 225 }, "_resizeMode": 1, "_layoutType": 1, @@ -4381,19 +4575,19 @@ "_active": true, "_components": [ { - "__id__": 218 + "__id__": 228 }, { - "__id__": 220 + "__id__": 230 } ], "_prefab": { - "__id__": 222 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", "x": -285.836, - "y": 598.685, + "y": 590.995, "z": 0 }, "_lrot": { @@ -4425,11 +4619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 229 }, "_contentSize": { "__type__": "cc.Size", @@ -4453,11 +4647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4538,7 +4732,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -4566,7 +4760,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 236 }, "_alignFlags": 45, "_target": null, @@ -4602,41 +4796,41 @@ }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 238 }, "talents_content": { - "__id__": 88 + "__id__": 98 }, "prefab_talent_item": { "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", "__expectedType__": "cc.Prefab" }, "lbl_points": { - "__id__": 25 + "__id__": 35 }, "lbl_lv": { - "__id__": 55 + "__id__": 65 }, "progress_exp": { - "__id__": 45 + "__id__": 55 }, "tab_basic": { - "__id__": 115 + "__id__": 125 }, "tab_special": { - "__id__": 144 + "__id__": 154 }, "tab_super": { - "__id__": 178 + "__id__": 188 }, "lbl_tab_basic": { - "__id__": 138 + "__id__": 148 }, "lbl_tab_special": { - "__id__": 166 + "__id__": 176 }, "lbl_tab_super": { - "__id__": 200 + "__id__": 210 }, "btn_reset": null, "_id": "" @@ -4658,22 +4852,22 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 187 + "__id__": 197 }, { - "__id__": 179 + "__id__": 189 }, { - "__id__": 153 + "__id__": 163 }, { - "__id__": 145 + "__id__": 155 }, { - "__id__": 124 + "__id__": 134 }, { - "__id__": 116 + "__id__": 126 }, { "__id__": 2 diff --git a/assets/resources/gui/ui3.plist b/assets/resources/gui/ui3.plist index b4f54c77..3ce66558 100644 --- a/assets/resources/gui/ui3.plist +++ b/assets/resources/gui/ui3.plist @@ -17,9 +17,9 @@ spriteSourceSize {64,66} textureRect - {{1725,953},{64,66}} + {{1533,377},{64,66}} textureRotated - + Alert_Diamond_Single_Red.png @@ -34,9 +34,9 @@ spriteSourceSize {64,66} textureRect - {{1798,899},{64,66}} + {{1533,443},{64,66}} textureRotated - + ArrowIconButton_01_Next.png @@ -51,9 +51,9 @@ spriteSourceSize {60,85} textureRect - {{1202,504},{60,85}} + {{1528,509},{60,85}} textureRotated - + ArrowIconButton_01_Prev.png @@ -68,9 +68,9 @@ spriteSourceSize {60,85} textureRect - {{1634,662},{60,85}} + {{1889,1121},{60,85}} textureRotated - + ArrowIconButton_02_Next.png @@ -85,7 +85,7 @@ spriteSourceSize {46,76} textureRect - {{1166,174},{46,76}} + {{1779,1219},{46,76}} textureRotated @@ -102,7 +102,7 @@ spriteSourceSize {46,76} textureRect - {{1253,130},{46,76}} + {{1971,605},{46,76}} textureRotated @@ -119,9 +119,9 @@ spriteSourceSize {57,80} textureRect - {{1785,766},{57,80}} + {{1631,1166},{57,80}} textureRotated - + Artboard 40.png @@ -153,9 +153,9 @@ spriteSourceSize {145,82} textureRect - {{1571,78},{115,64}} + {{1335,71},{115,64}} textureRotated - + Artboard 45.png @@ -170,9 +170,9 @@ spriteSourceSize {152,76} textureRect - {{1249,1361},{124,64}} + {{1535,251},{124,64}} textureRotated - + Artboard 62.png @@ -187,7 +187,7 @@ spriteSourceSize {112,117} textureRect - {{927,1245},{106,113}} + {{519,1335},{106,113}} textureRotated @@ -204,7 +204,24 @@ spriteSourceSize {104,108} textureRect - {{1335,71},{104,108}} + {{1186,1251},{104,108}} + textureRotated + + + BannerFrame03_Single.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {338,114} + spriteSourceSize + {338,114} + textureRect + {{419,515},{338,114}} textureRotated @@ -225,6 +242,57 @@ textureRotated + BorderFrame_Round20_Single_Dark.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {44,46} + spriteSourceSize + {44,46} + textureRect + {{1857,1219},{44,46}} + textureRotated + + + BorderFrame_Round20_Single_Yellow.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {44,48} + spriteSourceSize + {44,48} + textureRect + {{1724,1328},{44,48}} + textureRotated + + + BorderFrame_Round20_White_Bg.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {44,46} + spriteSourceSize + {44,46} + textureRect + {{1774,1328},{44,46}} + textureRotated + + BubbleFrame04_White_Arrow.png aliases @@ -238,7 +306,7 @@ spriteSourceSize {38,35} textureRect - {{1842,1021},{38,35}} + {{1166,174},{38,35}} textureRotated @@ -255,7 +323,7 @@ spriteSourceSize {64,72} textureRect - {{1795,825},{64,72}} + {{1979,531},{64,72}} textureRotated @@ -272,7 +340,7 @@ spriteSourceSize {80,142} textureRect - {{1813,58},{80,142}} + {{758,984},{80,142}} textureRotated @@ -289,7 +357,7 @@ spriteSourceSize {80,142} textureRect - {{1120,427},{80,142}} + {{663,1191},{80,142}} textureRotated @@ -306,7 +374,7 @@ spriteSourceSize {80,142} textureRect - {{851,875},{80,142}} + {{745,1354},{80,142}} textureRotated @@ -323,9 +391,9 @@ spriteSourceSize {80,142} textureRect - {{1008,796},{80,142}} + {{1083,655},{80,142}} textureRotated - + Button01_l_Purple.png @@ -340,7 +408,7 @@ spriteSourceSize {80,142} textureRect - {{1152,796},{80,142}} + {{1001,945},{80,142}} textureRotated @@ -357,7 +425,7 @@ spriteSourceSize {80,142} textureRect - {{927,1101},{80,142}} + {{1090,448},{80,142}} textureRotated @@ -374,9 +442,9 @@ spriteSourceSize {80,142} textureRect - {{1637,114},{80,142}} + {{891,1210},{80,142}} textureRotated - + Button01_l_Yellow.png @@ -391,9 +459,9 @@ spriteSourceSize {80,142} textureRect - {{1781,140},{80,142}} + {{898,1066},{80,142}} textureRotated - + Button_Convex_Rectangle_01_Gray.png @@ -408,9 +476,9 @@ spriteSourceSize {40,48} textureRect - {{1925,180},{40,48}} + {{1165,1363},{40,48}} textureRotated - + Button_Convex_Rectangle_01_Green.png @@ -425,7 +493,7 @@ spriteSourceSize {40,48} textureRect - {{1975,169},{40,48}} + {{1207,1361},{40,48}} textureRotated @@ -442,7 +510,41 @@ spriteSourceSize {50,58} textureRect - {{1733,724},{50,58}} + {{1396,1378},{50,58}} + textureRotated + + + Button_Round10_Bg.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {50,53} + spriteSourceSize + {50,53} + textureRect + {{1456,1361},{50,53}} + textureRotated + + + Button_Round10_Light.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {40,26} + spriteSourceSize + {40,26} + textureRect + {{1289,1420},{40,26}} textureRotated @@ -459,7 +561,7 @@ spriteSourceSize {64,64} textureRect - {{1781,1132},{64,64}} + {{1396,1235},{64,64}} textureRotated @@ -476,7 +578,7 @@ spriteSourceSize {64,67} textureRect - {{1375,1372},{64,67}} + {{278,1381},{64,67}} textureRotated @@ -493,7 +595,7 @@ spriteSourceSize {40,40} textureRect - {{1895,1107},{40,40}} + {{1999,1059},{40,40}} textureRotated @@ -510,7 +612,7 @@ spriteSourceSize {56,56} textureRect - {{1741,1224},{56,56}} + {{1928,1268},{56,56}} textureRotated @@ -527,7 +629,7 @@ spriteSourceSize {108,108} textureRect - {{1686,446},{108,108}} + {{1291,976},{108,108}} textureRotated @@ -544,7 +646,7 @@ spriteSourceSize {108,108} textureRect - {{1686,446},{108,108}} + {{1291,976},{108,108}} textureRotated @@ -561,7 +663,7 @@ spriteSourceSize {48,190} textureRect - {{523,984},{48,190}} + {{320,1023},{48,190}} textureRotated @@ -578,9 +680,9 @@ spriteSourceSize {56,63} textureRect - {{1957,55},{56,63}} + {{922,994},{56,63}} textureRotated - + CardFrame_Rectangle_02_FrontGradient.png @@ -595,7 +697,7 @@ spriteSourceSize {48,189} textureRect - {{1138,236},{48,189}} + {{708,858},{48,189}} textureRotated @@ -612,7 +714,7 @@ spriteSourceSize {48,52} textureRect - {{1725,1021},{48,52}} + {{1483,1185},{48,52}} textureRotated @@ -629,9 +731,9 @@ spriteSourceSize {29,30} textureRect - {{1971,1195},{29,30}} + {{1961,1237},{29,30}} textureRotated - + Dropdown_01_Focus.png @@ -646,7 +748,7 @@ spriteSourceSize {31,30} textureRect - {{1476,968},{31,30}} + {{1145,995},{31,30}} textureRotated @@ -663,7 +765,7 @@ spriteSourceSize {27,20} textureRect - {{720,214},{27,20}} + {{1166,214},{27,20}} textureRotated @@ -680,9 +782,9 @@ spriteSourceSize {42,37} textureRect - {{1482,798},{42,37}} + {{1207,1411},{42,37}} textureRotated - + Effect_Light_01_128.png @@ -697,7 +799,7 @@ spriteSourceSize {128,128} textureRect - {{1035,1243},{114,116}} + {{1175,877},{114,116}} textureRotated @@ -731,9 +833,9 @@ spriteSourceSize {154,77} textureRect - {{489,1324},{154,77}} + {{922,838},{154,77}} textureRotated - + FlagFrame_01_Bg_Red.png @@ -748,7 +850,7 @@ spriteSourceSize {154,77} textureRect - {{1114,571},{154,77}} + {{1452,58},{154,77}} textureRotated @@ -765,7 +867,7 @@ spriteSourceSize {154,77} textureRect - {{852,796},{154,77}} + {{1608,58},{154,77}} textureRotated @@ -782,7 +884,7 @@ spriteSourceSize {179,95} textureRect - {{308,1287},{179,95}} + {{759,543},{179,95}} textureRotated @@ -816,7 +918,7 @@ spriteSourceSize {38,42} textureRect - {{1937,1105},{38,42}} + {{1995,927},{38,42}} textureRotated @@ -833,7 +935,7 @@ spriteSourceSize {183,183} textureRect - {{953,236},{183,183}} + {{523,858},{183,183}} textureRotated @@ -850,7 +952,7 @@ spriteSourceSize {183,183} textureRect - {{523,617},{183,183}} + {{761,236},{183,183}} textureRotated @@ -884,7 +986,7 @@ spriteSourceSize {231,225} textureRect - {{720,236},{231,225}} + {{523,631},{231,225}} textureRotated @@ -901,9 +1003,9 @@ spriteSourceSize {60,62} textureRect - {{865,1101},{60,62}} + {{1537,1185},{60,62}} textureRotated - + ItemFrame00~03_BgGlow.png @@ -918,7 +1020,7 @@ spriteSourceSize {133,133} textureRect - {{1009,878},{133,133}} + {{1274,251},{133,133}} textureRotated @@ -935,7 +1037,7 @@ spriteSourceSize {50,39} textureRect - {{1733,784},{50,39}} + {{1672,1324},{50,39}} textureRotated @@ -952,7 +1054,7 @@ spriteSourceSize {60,62} textureRect - {{1721,662},{60,62}} + {{1518,1247},{60,62}} textureRotated @@ -969,7 +1071,7 @@ spriteSourceSize {110,110} textureRect - {{1509,960},{110,110}} + {{1519,855},{110,110}} textureRotated @@ -986,9 +1088,9 @@ spriteSourceSize {76,78} textureRect - {{1032,1361},{76,78}} + {{426,1372},{76,78}} textureRotated - + ItemFrame_Square_01_Blue.png @@ -1003,9 +1105,9 @@ spriteSourceSize {96,97} textureRect - {{1599,1342},{96,97}} + {{1175,523},{96,97}} textureRotated - + ItemFrame_Square_02_Single_Bg_Blue.png @@ -1020,7 +1122,7 @@ spriteSourceSize {96,97} textureRect - {{1785,668},{96,97}} + {{1790,1121},{96,97}} textureRotated @@ -1037,7 +1139,7 @@ spriteSourceSize {52,52} textureRect - {{1682,1184},{52,52}} + {{1508,1367},{52,52}} textureRotated @@ -1054,7 +1156,7 @@ spriteSourceSize {52,52} textureRect - {{1799,1198},{52,52}} + {{1568,1309},{52,52}} textureRotated @@ -1071,7 +1173,7 @@ spriteSourceSize {48,48} textureRect - {{1799,1252},{48,48}} + {{1622,1310},{48,48}} textureRotated @@ -1088,7 +1190,7 @@ spriteSourceSize {40,40} textureRect - {{1893,1233},{40,40}} + {{1644,1365},{40,40}} textureRotated @@ -1105,9 +1207,9 @@ spriteSourceSize {128,128} textureRect - {{1151,1243},{108,116}} + {{1835,1011},{108,116}} textureRotated - + ItemIcon_Battle.png @@ -1122,7 +1224,7 @@ spriteSourceSize {128,128} textureRect - {{1009,1013},{128,104}} + {{1903,251},{128,104}} textureRotated @@ -1139,9 +1241,9 @@ spriteSourceSize {128,128} textureRect - {{852,528},{120,118}} + {{1723,326},{120,118}} textureRotated - + ItemIcon_Coin_Gold.png @@ -1156,9 +1258,9 @@ spriteSourceSize {128,128} textureRect - {{1261,1243},{112,116}} + {{627,1335},{112,116}} textureRotated - + ItemIcon_Coin_Silver.png @@ -1173,9 +1275,9 @@ spriteSourceSize {128,128} textureRect - {{1391,1000},{112,116}} + {{1721,772},{112,116}} textureRotated - + ItemIcon_Compass.png @@ -1190,7 +1292,7 @@ spriteSourceSize {128,128} textureRect - {{1270,878},{120,120}} + {{1601,373},{120,120}} textureRotated @@ -1207,9 +1309,9 @@ spriteSourceSize {128,128} textureRect - {{1441,78},{128,102}} + {{1945,1},{128,102}} textureRotated - + ItemIcon_Dungeon.png @@ -1224,7 +1326,7 @@ spriteSourceSize {128,128} textureRect - {{1438,302},{124,108}} + {{1723,446},{124,108}} textureRotated @@ -1241,9 +1343,9 @@ spriteSourceSize {128,128} textureRect - {{1438,412},{124,108}} + {{1291,850},{124,108}} textureRotated - + ItemIcon_GearWheel.png @@ -1258,9 +1360,9 @@ spriteSourceSize {128,128} textureRect - {{771,1323},{116,120}} + {{1401,839},{116,120}} textureRotated - + ItemIcon_Gear_Armor.png @@ -1275,7 +1377,7 @@ spriteSourceSize {128,128} textureRect - {{1261,1000},{128,112}} + {{1203,137},{128,112}} textureRotated @@ -1292,7 +1394,7 @@ spriteSourceSize {128,128} textureRect - {{1789,558},{108,112}} + {{1721,890},{108,112}} textureRotated @@ -1309,7 +1411,7 @@ spriteSourceSize {128,128} textureRect - {{1144,878},{124,120}} + {{1409,251},{124,120}} textureRotated @@ -1326,7 +1428,7 @@ spriteSourceSize {128,128} textureRect - {{1564,422},{114,120}} + {{1601,495},{114,120}} textureRotated @@ -1343,7 +1445,7 @@ spriteSourceSize {128,128} textureRect - {{1521,738},{108,112}} + {{1721,1000},{108,112}} textureRotated @@ -1360,9 +1462,9 @@ spriteSourceSize {128,128} textureRect - {{1796,440},{116,108}} + {{1835,791},{116,108}} textureRotated - + ItemIcon_Gift_Yellow.png @@ -1377,7 +1479,7 @@ spriteSourceSize {128,128} textureRect - {{1903,568},{116,108}} + {{1835,901},{116,108}} textureRotated @@ -1394,9 +1496,9 @@ spriteSourceSize {128,128} textureRect - {{1131,1119},{122,110}} + {{1409,373},{122,110}} textureRotated - + ItemIcon_Medal_Bronze_1.png @@ -1411,7 +1513,7 @@ spriteSourceSize {128,128} textureRect - {{1139,1013},{120,104}} + {{1719,666},{120,104}} textureRotated @@ -1428,7 +1530,7 @@ spriteSourceSize {128,128} textureRect - {{1667,556},{120,104}} + {{1841,685},{120,104}} textureRotated @@ -1445,9 +1547,9 @@ spriteSourceSize {128,128} textureRect - {{1375,1242},{128,110}} + {{1593,137},{128,110}} textureRotated - + ItemIcon_Medal_Gold_2.png @@ -1462,9 +1564,9 @@ spriteSourceSize {128,128} textureRect - {{1487,1242},{128,110}} + {{1901,357},{128,110}} textureRotated - + ItemIcon_Medal_Silver_1.png @@ -1479,9 +1581,9 @@ spriteSourceSize {128,128} textureRect - {{1202,374},{128,104}} + {{1849,469},{128,104}} textureRotated - + ItemIcon_Medal_Silver_2.png @@ -1496,7 +1598,7 @@ spriteSourceSize {128,128} textureRect - {{1308,409},{128,104}} + {{1274,386},{128,104}} textureRotated @@ -1513,7 +1615,7 @@ spriteSourceSize {128,128} textureRect - {{1009,1119},{120,122}} + {{1601,249},{120,122}} textureRotated @@ -1530,7 +1632,7 @@ spriteSourceSize {128,128} textureRect - {{1243,1119},{120,122}} + {{1723,202},{120,122}} textureRotated @@ -1547,7 +1649,7 @@ spriteSourceSize {128,128} textureRect - {{1419,522},{122,108}} + {{1723,556},{122,108}} textureRotated @@ -1564,7 +1666,7 @@ spriteSourceSize {128,128} textureRect - {{1543,538},{122,108}} + {{1847,575},{122,108}} textureRotated @@ -1581,7 +1683,7 @@ spriteSourceSize {128,128} textureRect - {{1284,615},{110,120}} + {{1519,733},{110,120}} textureRotated @@ -1598,7 +1700,7 @@ spriteSourceSize {128,128} textureRect - {{1898,222},{122,112}} + {{1404,485},{122,112}} textureRotated @@ -1615,7 +1717,7 @@ spriteSourceSize {128,128} textureRect - {{1396,632},{116,106}} + {{1401,961},{116,106}} textureRotated @@ -1632,7 +1734,7 @@ spriteSourceSize {128,128} textureRect - {{1392,854},{110,112}} + {{1519,967},{110,112}} textureRotated @@ -1649,9 +1751,9 @@ spriteSourceSize {128,128} textureRect - {{645,1323},{124,116}} + {{1279,596},{124,116}} textureRotated - + ItemIcon_Skill_Damage.png @@ -1666,7 +1768,7 @@ spriteSourceSize {128,128} textureRect - {{1308,181},{128,112}} + {{1333,137},{128,112}} textureRotated @@ -1683,7 +1785,7 @@ spriteSourceSize {128,128} textureRect - {{1308,295},{128,112}} + {{1463,137},{128,112}} textureRotated @@ -1700,7 +1802,7 @@ spriteSourceSize {128,128} textureRect - {{1906,458},{108,114}} + {{1290,1086},{108,114}} textureRotated @@ -1717,9 +1819,9 @@ spriteSourceSize {128,128} textureRect - {{1560,196},{124,104}} + {{1184,995},{124,104}} textureRotated - + ItemIcon_Skull_Boss.png @@ -1734,7 +1836,7 @@ spriteSourceSize {128,128} textureRect - {{1365,1114},{126,112}} + {{1165,621},{126,112}} textureRotated @@ -1751,7 +1853,7 @@ spriteSourceSize {128,128} textureRect - {{1479,1114},{126,112}} + {{1175,749},{126,112}} textureRotated @@ -1768,7 +1870,7 @@ spriteSourceSize {128,128} textureRect - {{1906,336},{114,120}} + {{1519,611},{114,120}} textureRotated @@ -1785,7 +1887,7 @@ spriteSourceSize {128,128} textureRect - {{1438,182},{120,118}} + {{1397,599},{120,118}} textureRotated @@ -1802,7 +1904,7 @@ spriteSourceSize {128,128} textureRect - {{1564,302},{120,118}} + {{1397,719},{120,118}} textureRotated @@ -1819,9 +1921,9 @@ spriteSourceSize {128,128} textureRect - {{1686,316},{128,102}} + {{1274,492},{128,102}} textureRotated - + ItemIcon_Timer_Gold.png @@ -1836,7 +1938,7 @@ spriteSourceSize {128,128} textureRect - {{1790,312},{106,126}} + {{1289,722},{106,126}} textureRotated @@ -1853,9 +1955,9 @@ spriteSourceSize {128,128} textureRect - {{1289,515},{128,98}} + {{1186,1121},{128,98}} textureRotated - + Label_Bubble.png @@ -1870,9 +1972,9 @@ spriteSourceSize {61,39} textureRect - {{1779,1021},{61,39}} + {{1723,137},{61,39}} textureRotated - + Label_Flag_01_Single_Blue.png @@ -1887,9 +1989,9 @@ spriteSourceSize {52,75} textureRect - {{1945,1},{52,75}} + {{1111,1373},{52,75}} textureRotated - + Label_Flag_01_Single_Purple.png @@ -1904,9 +2006,9 @@ spriteSourceSize {52,75} textureRect - {{1967,678},{52,75}} + {{1971,653},{52,75}} textureRotated - + Label_Flag_01_Single_Red.png @@ -1921,7 +2023,7 @@ spriteSourceSize {52,75} textureRect - {{1721,899},{52,75}} + {{1406,1181},{52,75}} textureRotated @@ -1938,9 +2040,9 @@ spriteSourceSize {52,75} textureRect - {{1791,967},{52,75}} + {{1396,1301},{52,75}} textureRotated - + Label_Flag_01_White_BgTop.png @@ -1955,9 +2057,9 @@ spriteSourceSize {48,29} textureRect - {{1799,1302},{48,29}} + {{1690,1059},{48,29}} textureRotated - + Loading_Circle_1.png @@ -1972,7 +2074,7 @@ spriteSourceSize {146,146} textureRect - {{708,528},{142,144}} + {{758,838},{142,144}} textureRotated @@ -1989,9 +2091,9 @@ spriteSourceSize {146,146} textureRect - {{783,1170},{144,142}} + {{745,1210},{144,142}} textureRotated - + Loading_Circle_11.png @@ -2006,9 +2108,9 @@ spriteSourceSize {146,146} textureRect - {{1140,650},{144,142}} + {{1764,58},{144,142}} textureRotated - + Loading_Circle_12.png @@ -2023,7 +2125,7 @@ spriteSourceSize {146,146} textureRect - {{637,1181},{144,140}} + {{980,1171},{144,140}} textureRotated @@ -2040,9 +2142,9 @@ spriteSourceSize {146,146} textureRect - {{708,674},{142,144}} + {{944,448},{142,144}} textureRotated - + Loading_Circle_3.png @@ -2057,7 +2159,7 @@ spriteSourceSize {146,146} textureRect - {{865,957},{142,142}} + {{980,1027},{142,142}} textureRotated @@ -2074,7 +2176,7 @@ spriteSourceSize {146,146} textureRect - {{489,1180},{146,142}} + {{519,1043},{146,142}} textureRotated @@ -2091,7 +2193,7 @@ spriteSourceSize {146,146} textureRect - {{705,820},{144,142}} + {{373,1228},{144,142}} textureRotated @@ -2108,9 +2210,9 @@ spriteSourceSize {146,146} textureRect - {{721,964},{144,142}} + {{752,1066},{144,142}} textureRotated - + Loading_Circle_7.png @@ -2125,9 +2227,9 @@ spriteSourceSize {146,146} textureRect - {{972,421},{142,146}} + {{519,1187},{142,146}} textureRotated - + Loading_Circle_8.png @@ -2142,9 +2244,9 @@ spriteSourceSize {146,146} textureRect - {{852,650},{142,144}} + {{937,655},{142,144}} textureRotated - + Loading_Circle_9.png @@ -2159,7 +2261,7 @@ spriteSourceSize {146,146} textureRect - {{996,650},{142,144}} + {{1001,799},{142,144}} textureRotated @@ -2193,9 +2295,9 @@ spriteSourceSize {153,150} textureRect - {{503,1034},{153,144}} + {{373,1073},{153,144}} textureRotated - + Pattern02.png @@ -2210,7 +2312,7 @@ spriteSourceSize {180,180} textureRect - {{523,802},{180,180}} + {{946,236},{180,180}} textureRotated @@ -2227,9 +2329,9 @@ spriteSourceSize {54,63} textureRect - {{1957,113},{54,63}} + {{1462,1235},{54,63}} textureRotated - + Popup01_Basic_White_Bg.png @@ -2244,7 +2346,7 @@ spriteSourceSize {54,61} textureRect - {{1867,766},{54,61}} + {{1087,592},{54,61}} textureRotated @@ -2261,7 +2363,7 @@ spriteSourceSize {50,24} textureRect - {{446,617},{50,24}} + {{1849,440},{50,24}} textureRotated @@ -2278,7 +2380,7 @@ spriteSourceSize {54,61} textureRect - {{1867,766},{54,61}} + {{1087,592},{54,61}} textureRotated @@ -2295,7 +2397,7 @@ spriteSourceSize {48,26} textureRect - {{1937,1005},{48,26}} + {{308,1344},{48,26}} textureRotated @@ -2312,7 +2414,7 @@ spriteSourceSize {50,24} textureRect - {{446,617},{50,24}} + {{1849,440},{50,24}} textureRotated @@ -2346,9 +2448,9 @@ spriteSourceSize {54,106} textureRect - {{1374,798},{54,106}} + {{1845,332},{54,106}} textureRotated - + Popup07_Topbar_Divided_Single_Blue.png @@ -2363,7 +2465,7 @@ spriteSourceSize {54,174} textureRect - {{279,1384},{54,174}} + {{756,782},{54,174}} textureRotated @@ -2380,9 +2482,9 @@ spriteSourceSize {54,174} textureRect - {{1637,58},{54,174}} + {{1128,236},{54,174}} textureRotated - + Popup08_Topbar_Divided_Single.png @@ -2397,7 +2499,7 @@ spriteSourceSize {59,275} textureRect - {{419,515},{59,275}} + {{1,1381},{59,275}} textureRotated @@ -2431,9 +2533,9 @@ spriteSourceSize {56,58} textureRect - {{1923,765},{56,58}} + {{1126,1305},{56,58}} textureRotated - + SkillFrame_01_Border_Blue.png @@ -2448,7 +2550,7 @@ spriteSourceSize {56,58} textureRect - {{1923,825},{56,58}} + {{1903,1208},{56,58}} textureRotated @@ -2465,7 +2567,7 @@ spriteSourceSize {56,58} textureRect - {{1926,885},{56,58}} + {{1810,1267},{56,58}} textureRotated @@ -2482,9 +2584,9 @@ spriteSourceSize {56,58} textureRect - {{1929,945},{56,58}} + {{1868,1268},{56,58}} textureRotated - + SkillFrame_01_Border_Red.png @@ -2499,7 +2601,7 @@ spriteSourceSize {56,58} textureRect - {{1683,1238},{56,58}} + {{1450,1301},{56,58}} textureRotated @@ -2516,10 +2618,146 @@ spriteSourceSize {56,58} textureRect - {{1697,1342},{56,58}} + {{1508,1309},{56,58}} + textureRotated + + + Slider_Basic03_Bg_Single.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {25,48} + spriteSourceSize + {25,48} + textureRect + {{1601,1185},{25,48}} textureRotated + Slider_Basic03_Bg_White1.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {25,43} + spriteSourceSize + {25,43} + textureRect + {{1500,1421},{25,43}} + textureRotated + + + Slider_Basic03_FillMask.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {17,35} + spriteSourceSize + {17,35} + textureRect + {{320,1073},{17,35}} + textureRotated + + + Slider_Basic03_Fill_Blue.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,35} + spriteSourceSize + {8,35} + textureRect + {{1396,1196},{8,35}} + textureRotated + + + Slider_Basic03_Fill_Green.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,35} + spriteSourceSize + {8,35} + textureRect + {{1963,781},{8,35}} + textureRotated + + + Slider_Basic03_Fill_White.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,35} + spriteSourceSize + {8,35} + textureRect + {{2000,781},{8,35}} + textureRotated + + + Slider_Basic03_Fill_Yellow.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,35} + spriteSourceSize + {8,35} + textureRect + {{2039,1173},{8,35}} + textureRotated + + + Slider_Basic04_Bg.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {37,56} + spriteSourceSize + {37,56} + textureRect + {{932,799},{37,56}} + textureRotated + + Slider_BorderDeco_Tapered_01_Border.png aliases @@ -2533,9 +2771,9 @@ spriteSourceSize {140,83} textureRect - {{972,565},{140,83}} + {{667,1049},{140,83}} textureRotated - + Slider_Border_Tapered_02_Fill_Blue.Png @@ -2550,7 +2788,7 @@ spriteSourceSize {150,28} textureRect - {{455,1403},{150,28}} + {{946,418},{150,28}} textureRotated @@ -2567,7 +2805,7 @@ spriteSourceSize {150,28} textureRect - {{1188,222},{150,28}} + {{1145,799},{150,28}} textureRotated @@ -2584,7 +2822,7 @@ spriteSourceSize {150,28} textureRect - {{1218,222},{150,28}} + {{1184,251},{150,28}} textureRotated @@ -2601,7 +2839,7 @@ spriteSourceSize {150,28} textureRect - {{1248,222},{150,28}} + {{1214,251},{150,28}} textureRotated @@ -2618,7 +2856,7 @@ spriteSourceSize {150,28} textureRect - {{1278,222},{150,28}} + {{1244,251},{150,28}} textureRotated @@ -2635,10 +2873,61 @@ spriteSourceSize {105,57} textureRect - {{1284,737},{105,57}} + {{1631,1059},{105,57}} + textureRotated + + + Slider_Icon01_Bg.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {23,35} + spriteSourceSize + {23,35} + textureRect + {{1331,1420},{23,35}} + textureRotated + + + Slider_Icon01_Fill_Orange.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,47} + spriteSourceSize + {8,47} + textureRect + {{1165,749},{8,47}} textureRotated + Slider_Icon01_Fill_White.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {8,47} + spriteSourceSize + {8,47} + textureRect + {{1112,1363},{8,47}} + textureRotated + + Slider_Level_02_Bg.png aliases @@ -2652,7 +2941,7 @@ spriteSourceSize {25,25} textureRect - {{419,617},{25,25}} + {{1910,104},{25,25}} textureRotated @@ -2669,7 +2958,7 @@ spriteSourceSize {23,24} textureRect - {{498,617},{23,24}} + {{1143,592},{23,24}} textureRotated @@ -2686,7 +2975,7 @@ spriteSourceSize {23,24} textureRect - {{1781,114},{23,24}} + {{1098,418},{23,24}} textureRotated @@ -2703,9 +2992,9 @@ spriteSourceSize {17,16} textureRect - {{1667,538},{17,16}} + {{2031,791},{17,16}} textureRotated - + Slider_Play_01_Fill_Green.png @@ -2720,9 +3009,9 @@ spriteSourceSize {4,18} textureRect - {{1843,1333},{4,18}} + {{667,1043},{4,18}} textureRotated - + Slider_Play_01_Fill_Red.png @@ -2737,7 +3026,7 @@ spriteSourceSize {4,18} textureRect - {{1971,1075},{4,18}} + {{1178,995},{4,18}} textureRotated @@ -2754,7 +3043,7 @@ spriteSourceSize {87,52} textureRect - {{1593,1184},{87,52}} + {{1690,1208},{87,52}} textureRotated @@ -2771,9 +3060,9 @@ spriteSourceSize {194,18} textureRect - {{1441,58},{194,18}} + {{902,838},{194,18}} textureRotated - + Swich_01_Bg_Off.png @@ -2788,7 +3077,7 @@ spriteSourceSize {102,82} textureRect - {{1599,1238},{102,82}} + {{1635,611},{102,82}} textureRotated @@ -2805,7 +3094,7 @@ spriteSourceSize {102,82} textureRect - {{1697,1072},{102,82}} + {{1635,715},{102,82}} textureRotated @@ -2822,7 +3111,7 @@ spriteSourceSize {81,85} textureRect - {{1884,678},{81,85}} + {{889,1354},{81,85}} textureRotated @@ -2839,7 +3128,7 @@ spriteSourceSize {137,58} textureRect - {{1,1381},{137,58}} + {{1910,131},{137,58}} textureRotated @@ -2856,7 +3145,7 @@ spriteSourceSize {137,58} textureRect - {{140,1381},{137,58}} + {{1910,191},{137,58}} textureRotated @@ -2873,7 +3162,7 @@ spriteSourceSize {137,58} textureRect - {{721,1110},{137,58}} + {{973,1313},{137,58}} textureRotated @@ -2890,7 +3179,7 @@ spriteSourceSize {137,58} textureRect - {{893,1360},{137,58}} + {{972,1373},{137,58}} textureRotated @@ -2907,9 +3196,9 @@ spriteSourceSize {137,58} textureRect - {{1110,1361},{137,58}} + {{1124,1027},{137,58}} textureRotated - + Title_01_NoDeco_Yellow.Png @@ -2924,9 +3213,9 @@ spriteSourceSize {137,58} textureRect - {{1441,1372},{137,58}} + {{1126,1166},{137,58}} textureRotated - + Title_Result_Victory.png @@ -2958,7 +3247,7 @@ spriteSourceSize {181,120} textureRect - {{320,1023},{181,120}} + {{761,421},{181,120}} textureRotated @@ -2975,7 +3264,7 @@ spriteSourceSize {40,40} textureRect - {{1935,1231},{40,40}} + {{1724,1374},{40,40}} textureRotated @@ -2992,7 +3281,7 @@ spriteSourceSize {40,40} textureRect - {{1849,1321},{40,40}} + {{1766,1376},{40,40}} textureRotated @@ -3009,9 +3298,9 @@ spriteSourceSize {68,60} textureRect - {{1781,1062},{68,60}} + {{1979,469},{68,60}} textureRotated - + Toggle_Check_02_On.png @@ -3026,9 +3315,9 @@ spriteSourceSize {80,76} textureRect - {{1296,796},{80,76}} + {{344,1372},{80,76}} textureRotated - + Toggle_Check_03_l_Off.png @@ -3043,7 +3332,7 @@ spriteSourceSize {60,60} textureRect - {{1861,829},{60,60}} + {{1624,1248},{60,60}} textureRotated @@ -3060,7 +3349,7 @@ spriteSourceSize {60,60} textureRect - {{1864,891},{60,60}} + {{1686,1262},{60,60}} textureRotated @@ -3077,7 +3366,7 @@ spriteSourceSize {44,44} textureRect - {{1879,1015},{44,44}} + {{1820,1327},{44,44}} textureRotated @@ -3094,7 +3383,7 @@ spriteSourceSize {44,44} textureRect - {{1843,1061},{44,44}} + {{1953,1029},{44,44}} textureRotated @@ -3111,7 +3400,7 @@ spriteSourceSize {72,72} textureRect - {{1721,825},{72,72}} + {{1963,707},{72,72}} textureRotated @@ -3128,7 +3417,7 @@ spriteSourceSize {111,110} textureRect - {{1504,848},{111,110}} + {{1406,1069},{111,110}} textureRotated @@ -3145,9 +3434,9 @@ spriteSourceSize {128,128} textureRect - {{1617,848},{102,110}} + {{1519,1081},{102,110}} textureRotated - + UI_Rewards_Medal_01_Gold.png @@ -3162,7 +3451,7 @@ spriteSourceSize {128,128} textureRect - {{1621,960},{102,110}} + {{1292,1196},{102,110}} textureRotated @@ -3179,7 +3468,7 @@ spriteSourceSize {128,128} textureRect - {{1593,1072},{102,110}} + {{1292,1308},{102,110}} textureRotated @@ -3196,7 +3485,7 @@ spriteSourceSize {128,128} textureRect - {{1686,196},{118,88}} + {{1184,403},{118,88}} textureRotated @@ -3213,9 +3502,9 @@ spriteSourceSize {128,128} textureRect - {{1776,222},{118,88}} + {{1631,819},{118,88}} textureRotated - + UI_Rewards_Trophy_01_Silver.png @@ -3230,9 +3519,9 @@ spriteSourceSize {128,128} textureRect - {{1514,648},{118,88}} + {{1631,939},{118,88}} textureRotated - + bg6.png @@ -3264,9 +3553,9 @@ spriteSourceSize {96,98} textureRect - {{1635,724},{96,98}} + {{1690,1110},{96,98}} textureRotated - + bg_line.png @@ -3281,9 +3570,9 @@ spriteSourceSize {250,63} textureRect - {{720,463},{250,63}} + {{308,1092},{250,63}} textureRotated - + bg_title.png @@ -3315,9 +3604,9 @@ spriteSourceSize {145,61} textureRect - {{658,1034},{145,61}} + {{940,592},{145,61}} textureRotated - + function_icon_abstract.png @@ -3332,7 +3621,7 @@ spriteSourceSize {64,64} textureRect - {{1987,931},{44,32}} + {{1910,58},{44,32}} textureRotated @@ -3349,7 +3638,7 @@ spriteSourceSize {64,64} textureRect - {{607,1403},{36,36}} + {{1251,1411},{36,36}} textureRotated @@ -3366,7 +3655,7 @@ spriteSourceSize {64,64} textureRect - {{1931,1149},{40,38}} + {{1997,1215},{40,38}} textureRotated @@ -3383,7 +3672,7 @@ spriteSourceSize {64,64} textureRect - {{1984,755},{36,44}} + {{1993,791},{36,44}} textureRotated @@ -3400,7 +3689,7 @@ spriteSourceSize {64,64} textureRect - {{1853,1239},{38,38}} + {{1562,1409},{38,38}} textureRotated @@ -3417,9 +3706,9 @@ spriteSourceSize {64,64} textureRect - {{1763,1282},{42,34}} + {{1997,1101},{42,34}} textureRotated - + function_icon_blast.png @@ -3434,7 +3723,7 @@ spriteSourceSize {64,64} textureRect - {{1889,1061},{44,40}} + {{1953,937},{44,40}} textureRotated @@ -3451,9 +3740,9 @@ spriteSourceSize {64,64} textureRect - {{1203,134},{48,38}} + {{1249,1361},{48,38}} textureRotated - + function_icon_buckler.png @@ -3468,7 +3757,7 @@ spriteSourceSize {64,64} textureRect - {{1843,1403},{36,36}} + {{2006,1367},{36,36}} textureRotated @@ -3485,7 +3774,7 @@ spriteSourceSize {64,64} textureRect - {{1843,1363},{38,38}} + {{1602,1405},{38,38}} textureRotated @@ -3502,7 +3791,7 @@ spriteSourceSize {64,64} textureRect - {{1787,1405},{38,32}} + {{1682,1416},{38,32}} textureRotated @@ -3519,9 +3808,9 @@ spriteSourceSize {64,64} textureRect - {{1887,1149},{42,38}} + {{1997,971},{42,38}} textureRotated - + function_icon_dagger.png @@ -3536,7 +3825,7 @@ spriteSourceSize {64,64} textureRect - {{1883,1363},{38,38}} + {{1642,1407},{38,38}} textureRotated @@ -3553,7 +3842,7 @@ spriteSourceSize {64,64} textureRect - {{1981,801},{48,38}} + {{1953,791},{48,38}} textureRotated @@ -3570,7 +3859,7 @@ spriteSourceSize {64,64} textureRect - {{1984,851},{36,38}} + {{1686,1365},{36,38}} textureRotated @@ -3587,9 +3876,9 @@ spriteSourceSize {64,64} textureRect - {{1763,1326},{36,34}} + {{1888,1407},{36,34}} textureRotated - + function_icon_fire.png @@ -3604,7 +3893,7 @@ spriteSourceSize {64,64} textureRect - {{1392,968},{30,42}} + {{1953,1119},{30,42}} textureRotated @@ -3621,7 +3910,7 @@ spriteSourceSize {64,64} textureRect - {{1977,1075},{38,38}} + {{1808,1376},{38,38}} textureRotated @@ -3638,9 +3927,9 @@ spriteSourceSize {64,64} textureRect - {{1853,1195},{42,34}} + {{1997,1137},{42,34}} textureRotated - + function_icon_hammer.png @@ -3655,7 +3944,7 @@ spriteSourceSize {64,64} textureRect - {{1977,1115},{38,38}} + {{1848,1373},{38,38}} textureRotated @@ -3672,7 +3961,7 @@ spriteSourceSize {64,64} textureRect - {{1736,1176},{46,40}} + {{1953,841},{46,40}} textureRotated @@ -3689,7 +3978,7 @@ spriteSourceSize {64,64} textureRect - {{1697,1402},{46,34}} + {{1128,412},{46,34}} textureRotated @@ -3706,7 +3995,7 @@ spriteSourceSize {64,64} textureRect - {{1745,1405},{34,40}} + {{1165,1413},{34,40}} textureRotated @@ -3723,9 +4012,9 @@ spriteSourceSize {64,64} textureRect - {{893,1316},{32,42}} + {{1456,1416},{32,42}} textureRotated - + function_icon_knight.png @@ -3740,9 +4029,9 @@ spriteSourceSize {64,64} textureRect - {{1244,178},{42,44}} + {{1953,983},{42,44}} textureRotated - + function_icon_leaf.png @@ -3757,7 +4046,7 @@ spriteSourceSize {64,64} textureRect - {{1973,1155},{38,38}} + {{1866,1327},{38,38}} textureRotated @@ -3774,7 +4063,7 @@ spriteSourceSize {64,64} textureRect - {{1799,1333},{42,34}} + {{1993,1255},{42,34}} textureRotated @@ -3791,7 +4080,7 @@ spriteSourceSize {64,64} textureRect - {{1799,1369},{42,34}} + {{1986,1291},{42,34}} textureRotated @@ -3808,7 +4097,7 @@ spriteSourceSize {64,64} textureRect - {{1889,1189},{38,42}} + {{1995,883},{38,42}} textureRotated @@ -3825,7 +4114,7 @@ spriteSourceSize {64,64} textureRect - {{1984,891},{36,38}} + {{1888,1367},{36,38}} textureRotated @@ -3842,7 +4131,7 @@ spriteSourceSize {64,64} textureRect - {{1973,1033},{38,40}} + {{1562,1367},{38,40}} textureRotated @@ -3859,9 +4148,9 @@ spriteSourceSize {64,64} textureRect - {{1987,977},{32,38}} + {{1722,1416},{32,38}} textureRotated - + function_icon_powerup.png @@ -3876,9 +4165,9 @@ spriteSourceSize {64,64} textureRect - {{1509,1072},{54,40}} + {{1582,1247},{54,40}} textureRotated - + function_icon_preference_1.png @@ -3893,7 +4182,7 @@ spriteSourceSize {64,64} textureRect - {{1881,1403},{36,36}} + {{1926,1406},{36,36}} textureRotated @@ -3910,9 +4199,9 @@ spriteSourceSize {64,64} textureRect - {{1847,1107},{46,40}} + {{1953,889},{46,40}} textureRotated - + function_icon_setting_2.png @@ -3927,7 +4216,7 @@ spriteSourceSize {64,64} textureRect - {{1919,1403},{36,36}} + {{1964,1407},{36,36}} textureRotated @@ -3944,7 +4233,7 @@ spriteSourceSize {64,64} textureRect - {{1977,1227},{38,38}} + {{1906,1326},{38,38}} textureRotated @@ -3961,7 +4250,7 @@ spriteSourceSize {64,64} textureRect - {{1977,1267},{38,38}} + {{1946,1326},{38,38}} textureRotated @@ -3978,9 +4267,9 @@ spriteSourceSize {64,64} textureRect - {{1755,1364},{42,38}} + {{1999,1015},{42,38}} textureRotated - + function_icon_spiderweb.png @@ -3995,7 +4284,7 @@ spriteSourceSize {64,64} textureRect - {{1931,1033},{40,40}} + {{1951,1151},{40,40}} textureRotated @@ -4012,7 +4301,7 @@ spriteSourceSize {64,64} textureRect - {{1727,1298},{34,42}} + {{1961,1193},{34,42}} textureRotated @@ -4029,7 +4318,7 @@ spriteSourceSize {64,64} textureRect - {{1683,1298},{42,42}} + {{1953,1075},{42,42}} textureRotated @@ -4046,7 +4335,7 @@ spriteSourceSize {64,64} textureRect - {{1893,1275},{38,38}} + {{1986,1327},{38,38}} textureRotated @@ -4063,7 +4352,7 @@ spriteSourceSize {64,64} textureRect - {{1929,1189},{40,40}} + {{1997,1173},{40,40}} textureRotated @@ -4080,7 +4369,7 @@ spriteSourceSize {64,64} textureRect - {{1849,1279},{40,40}} + {{1602,1363},{40,40}} textureRotated @@ -4097,7 +4386,7 @@ spriteSourceSize {64,64} textureRect - {{1436,968},{30,38}} + {{1762,1418},{30,38}} textureRotated @@ -4114,9 +4403,9 @@ spriteSourceSize {64,64} textureRect - {{1931,1075},{28,38}} + {{1145,951},{28,38}} textureRotated - + function_icon_volume_mute.png @@ -4131,7 +4420,7 @@ spriteSourceSize {64,64} textureRect - {{1891,1315},{38,38}} + {{1926,1366},{38,38}} textureRotated @@ -4148,7 +4437,7 @@ spriteSourceSize {64,64} textureRect - {{1935,1273},{38,38}} + {{1966,1367},{38,38}} textureRotated @@ -4165,9 +4454,9 @@ spriteSourceSize {64,64} textureRect - {{1925,140},{30,38}} + {{1802,1418},{30,38}} textureRotated - + function_icon_wizard.png @@ -4182,7 +4471,7 @@ spriteSourceSize {64,64} textureRect - {{1847,1149},{38,44}} + {{1995,837},{38,44}} textureRotated @@ -4199,9 +4488,9 @@ spriteSourceSize {128,56} textureRect - {{1391,740},{128,56}} + {{1845,202},{128,56}} textureRotated - + prg.png @@ -4233,7 +4522,7 @@ spriteSourceSize {36,36} textureRect - {{1975,1307},{36,36}} + {{2002,1407},{36,36}} textureRotated @@ -4250,9 +4539,9 @@ spriteSourceSize {284,39} textureRect - {{419,576},{284,39}} + {{720,214},{284,39}} textureRotated - + top_btn_back.png @@ -4267,7 +4556,7 @@ spriteSourceSize {179,140} textureRect - {{308,1145},{179,140}} + {{756,640},{179,140}} textureRotated @@ -4284,9 +4573,9 @@ spriteSourceSize {59,60} textureRect - {{1868,953},{59,60}} + {{1748,1267},{59,60}} textureRotated - + wave info.png @@ -4317,9 +4606,9 @@ realTextureFileName ui3.png size - {2021,1440} + {2048,1449} smartupdate - $TexturePacker:SmartUpdate:d756139f1949f481c39b89b03f8ba7eb:0bc6a4c83dfa0deb5f3f35af6065e3c3:e1bf24f6fd107d358e5ec626ea4dfc29$ + $TexturePacker:SmartUpdate:4027d5b00d1dd92dc84a70e09ea00eee:a6d986f5d5df25305f5072e5f4565031:e1bf24f6fd107d358e5ec626ea4dfc29$ textureFileName ui3.png diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta index 9a29c63a..88741b30 100644 --- a/assets/resources/gui/ui3.plist.meta +++ b/assets/resources/gui/ui3.plist.meta @@ -18,8 +18,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1975, - "trimY": 1307, + "trimX": 2002, + "trimY": 1407, "width": 36, "height": 36, "rawWidth": 36, @@ -53,6 +53,52 @@ ], "subMetas": {} }, + "19840": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@19840", + "displayName": "", + "id": "19840", + "name": "Slider_Basic03_Bg_Single", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1601, + "trimY": 1185, + "width": 25, + "height": 48, + "rawWidth": 25, + "rawHeight": 48, + "borderTop": 24, + "borderBottom": 19, + "borderLeft": 12, + "borderRight": 12, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "24885": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@24885", @@ -61,11 +107,11 @@ "name": "Popup04_Topber_Single", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1374, - "trimY": 798, + "trimX": 1845, + "trimY": 332, "width": 54, "height": 106, "rawWidth": 54, @@ -107,11 +153,11 @@ "name": "Label_Flag_01_White_BgTop", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1799, - "trimY": 1302, + "trimX": 1690, + "trimY": 1059, "width": 48, "height": 29, "rawWidth": 48, @@ -156,8 +202,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1667, - "trimY": 556, + "trimX": 1841, + "trimY": 685, "width": 120, "height": 104, "rawWidth": 128, @@ -202,8 +248,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1476, - "trimY": 968, + "trimX": 1145, + "trimY": 995, "width": 31, "height": 30, "rawWidth": 31, @@ -245,11 +291,11 @@ "name": "function_icon_potion_2", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1987, - "trimY": 977, + "trimX": 1722, + "trimY": 1416, "width": 32, "height": 38, "rawWidth": 64, @@ -291,11 +337,11 @@ "name": "Popup01_Basic_Single", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1957, - "trimY": 113, + "trimX": 1462, + "trimY": 1235, "width": 54, "height": 63, "rawWidth": 54, @@ -337,11 +383,11 @@ "name": "ItemIcon_Medal_Gold_2", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1487, - "trimY": 1242, + "trimX": 1901, + "trimY": 357, "width": 128, "height": 110, "rawWidth": 128, @@ -386,8 +432,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1697, - "trimY": 1072, + "trimX": 1635, + "trimY": 715, "width": 102, "height": 82, "rawWidth": 102, @@ -429,11 +475,11 @@ "name": "Dropdown_01_Bg", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1971, - "trimY": 1195, + "trimX": 1961, + "trimY": 1237, "width": 29, "height": 30, "rawWidth": 29, @@ -478,8 +524,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 455, - "trimY": 1403, + "trimX": 946, + "trimY": 418, "width": 150, "height": 28, "rawWidth": 150, @@ -521,11 +567,11 @@ "name": "Slider_Play_01_Fill_Green", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1843, - "trimY": 1333, + "trimX": 667, + "trimY": 1043, "width": 4, "height": 18, "rawWidth": 4, @@ -570,8 +616,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1903, - "trimY": 568, + "trimX": 1835, + "trimY": 901, "width": 116, "height": 108, "rawWidth": 128, @@ -616,8 +662,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1787, - "trimY": 1405, + "trimX": 1682, + "trimY": 1416, "width": 38, "height": 32, "rawWidth": 64, @@ -662,8 +708,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1881, - "trimY": 1403, + "trimX": 1926, + "trimY": 1406, "width": 36, "height": 36, "rawWidth": 64, @@ -708,8 +754,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1781, - "trimY": 114, + "trimX": 1098, + "trimY": 418, "width": 23, "height": 24, "rawWidth": 23, @@ -754,8 +800,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1884, - "trimY": 678, + "trimX": 889, + "trimY": 1354, "width": 81, "height": 85, "rawWidth": 81, @@ -800,7 +846,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 720, + "trimX": 1166, "trimY": 214, "width": 27, "height": 20, @@ -846,8 +892,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1721, - "trimY": 662, + "trimX": 1518, + "trimY": 1247, "width": 60, "height": 62, "rawWidth": 60, @@ -892,8 +938,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1139, - "trimY": 1013, + "trimX": 1719, + "trimY": 666, "width": 120, "height": 104, "rawWidth": 128, @@ -981,11 +1027,11 @@ "name": "Alert_Diamond_Single_Green", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1725, - "trimY": 953, + "trimX": 1533, + "trimY": 377, "width": 64, "height": 66, "rawWidth": 64, @@ -1027,11 +1073,11 @@ "name": "Alert_Diamond_Single_Red", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1798, - "trimY": 899, + "trimX": 1533, + "trimY": 443, "width": 64, "height": 66, "rawWidth": 64, @@ -1073,11 +1119,11 @@ "name": "ArrowIconButton_01_Next", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1202, - "trimY": 504, + "trimX": 1528, + "trimY": 509, "width": 60, "height": 85, "rawWidth": 60, @@ -1119,11 +1165,11 @@ "name": "ArrowIconButton_01_Prev", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1634, - "trimY": 662, + "trimX": 1889, + "trimY": 1121, "width": 60, "height": 85, "rawWidth": 60, @@ -1168,8 +1214,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1166, - "trimY": 174, + "trimX": 1779, + "trimY": 1219, "width": 46, "height": 76, "rawWidth": 46, @@ -1214,8 +1260,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1253, - "trimY": 130, + "trimX": 1971, + "trimY": 605, "width": 46, "height": 76, "rawWidth": 46, @@ -1257,11 +1303,11 @@ "name": "ArrowIconButton_03_Back", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1785, - "trimY": 766, + "trimX": 1631, + "trimY": 1166, "width": 57, "height": 80, "rawWidth": 57, @@ -1349,11 +1395,11 @@ "name": "Artboard 42", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 2, "offsetY": 0, - "trimX": 1571, - "trimY": 78, + "trimX": 1335, + "trimY": 71, "width": 115, "height": 64, "rawWidth": 145, @@ -1395,11 +1441,11 @@ "name": "Artboard 45", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -7, "offsetY": 0, - "trimX": 1249, - "trimY": 1361, + "trimX": 1535, + "trimY": 251, "width": 124, "height": 64, "rawWidth": 152, @@ -1444,8 +1490,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 927, - "trimY": 1245, + "trimX": 519, + "trimY": 1335, "width": 106, "height": 113, "rawWidth": 112, @@ -1490,8 +1536,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1335, - "trimY": 71, + "trimX": 1186, + "trimY": 1251, "width": 104, "height": 108, "rawWidth": 104, @@ -1525,6 +1571,52 @@ ], "subMetas": {} }, + "06790": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@06790", + "displayName": "", + "id": "06790", + "name": "BannerFrame03_Single", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 419, + "trimY": 515, + "width": 338, + "height": 114, + "rawWidth": 338, + "rawHeight": 114, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 30, + "borderRight": 306, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "0e9c9": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@0e9c9", @@ -1571,6 +1663,144 @@ ], "subMetas": {} }, + "8e327": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@8e327", + "displayName": "", + "id": "8e327", + "name": "BorderFrame_Round20_Single_Dark", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1857, + "trimY": 1219, + "width": 44, + "height": 46, + "rawWidth": 44, + "rawHeight": 46, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "d9e01": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@d9e01", + "displayName": "", + "id": "d9e01", + "name": "BorderFrame_Round20_Single_Yellow", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1724, + "trimY": 1328, + "width": 44, + "height": 48, + "rawWidth": 44, + "rawHeight": 48, + "borderTop": 22, + "borderBottom": 26, + "borderLeft": 22, + "borderRight": 22, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0c9e0": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@0c9e0", + "displayName": "", + "id": "0c9e0", + "name": "BorderFrame_Round20_White_Bg", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1774, + "trimY": 1328, + "width": 44, + "height": 46, + "rawWidth": 44, + "rawHeight": 46, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "4bcea": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@4bcea", @@ -1582,8 +1812,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1842, - "trimY": 1021, + "trimX": 1166, + "trimY": 174, "width": 38, "height": 35, "rawWidth": 38, @@ -1628,8 +1858,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1795, - "trimY": 825, + "trimX": 1979, + "trimY": 531, "width": 64, "height": 72, "rawWidth": 64, @@ -1674,8 +1904,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1813, - "trimY": 58, + "trimX": 758, + "trimY": 984, "width": 80, "height": 142, "rawWidth": 80, @@ -1720,8 +1950,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1120, - "trimY": 427, + "trimX": 663, + "trimY": 1191, "width": 80, "height": 142, "rawWidth": 80, @@ -1766,8 +1996,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 851, - "trimY": 875, + "trimX": 745, + "trimY": 1354, "width": 80, "height": 142, "rawWidth": 80, @@ -1809,11 +2039,11 @@ "name": "Button01_l_Pink", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1008, - "trimY": 796, + "trimX": 1083, + "trimY": 655, "width": 80, "height": 142, "rawWidth": 80, @@ -1858,8 +2088,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1152, - "trimY": 796, + "trimX": 1001, + "trimY": 945, "width": 80, "height": 142, "rawWidth": 80, @@ -1904,8 +2134,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 927, - "trimY": 1101, + "trimX": 1090, + "trimY": 448, "width": 80, "height": 142, "rawWidth": 80, @@ -1947,11 +2177,11 @@ "name": "Button01_l_White_Bg", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1637, - "trimY": 114, + "trimX": 891, + "trimY": 1210, "width": 80, "height": 142, "rawWidth": 80, @@ -1993,11 +2223,11 @@ "name": "Button01_l_Yellow", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1781, - "trimY": 140, + "trimX": 898, + "trimY": 1066, "width": 80, "height": 142, "rawWidth": 80, @@ -2039,11 +2269,11 @@ "name": "Button_Convex_Rectangle_01_Gray", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1925, - "trimY": 180, + "trimX": 1165, + "trimY": 1363, "width": 40, "height": 48, "rawWidth": 40, @@ -2088,8 +2318,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1975, - "trimY": 169, + "trimX": 1207, + "trimY": 1361, "width": 40, "height": 48, "rawWidth": 40, @@ -2131,11 +2361,11 @@ "name": "Button_Convex_Rectangle_01_H58_Gray", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1733, - "trimY": 724, + "trimX": 1396, + "trimY": 1378, "width": 50, "height": 58, "rawWidth": 50, @@ -2169,6 +2399,98 @@ ], "subMetas": {} }, + "1b34c": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@1b34c", + "displayName": "", + "id": "1b34c", + "name": "Button_Round10_Bg", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1456, + "trimY": 1361, + "width": 50, + "height": 53, + "rawWidth": 50, + "rawHeight": 53, + "borderTop": 25, + "borderBottom": 28, + "borderLeft": 25, + "borderRight": 25, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "8dd1b": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@8dd1b", + "displayName": "", + "id": "8dd1b", + "name": "Button_Round10_Light", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1289, + "trimY": 1420, + "width": 40, + "height": 26, + "rawWidth": 40, + "rawHeight": 26, + "borderTop": 25, + "borderBottom": 1, + "borderLeft": 20, + "borderRight": 20, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "d37ad": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@d37ad", @@ -2180,8 +2502,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1781, - "trimY": 1132, + "trimX": 1396, + "trimY": 1235, "width": 64, "height": 64, "rawWidth": 64, @@ -2226,8 +2548,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1375, - "trimY": 1372, + "trimX": 278, + "trimY": 1381, "width": 64, "height": 67, "rawWidth": 64, @@ -2272,8 +2594,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1895, - "trimY": 1107, + "trimX": 1999, + "trimY": 1059, "width": 40, "height": 40, "rawWidth": 40, @@ -2318,8 +2640,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1741, - "trimY": 1224, + "trimX": 1928, + "trimY": 1268, "width": 56, "height": 56, "rawWidth": 56, @@ -2364,8 +2686,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1686, - "trimY": 446, + "trimX": 1291, + "trimY": 976, "width": 108, "height": 108, "rawWidth": 108, @@ -2410,8 +2732,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1686, - "trimY": 446, + "trimX": 1291, + "trimY": 976, "width": 108, "height": 108, "rawWidth": 108, @@ -2456,8 +2778,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 523, - "trimY": 984, + "trimX": 320, + "trimY": 1023, "width": 48, "height": 190, "rawWidth": 48, @@ -2499,11 +2821,11 @@ "name": "CardFrame_Rectangle_02_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1957, - "trimY": 55, + "trimX": 922, + "trimY": 994, "width": 56, "height": 63, "rawWidth": 56, @@ -2548,8 +2870,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1138, - "trimY": 236, + "trimX": 708, + "trimY": 858, "width": 48, "height": 189, "rawWidth": 48, @@ -2594,8 +2916,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1725, - "trimY": 1021, + "trimX": 1483, + "trimY": 1185, "width": 48, "height": 52, "rawWidth": 48, @@ -2637,11 +2959,11 @@ "name": "Dropdown_01_Icon_Filter", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1482, - "trimY": 798, + "trimX": 1207, + "trimY": 1411, "width": 42, "height": 37, "rawWidth": 42, @@ -2686,8 +3008,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1035, - "trimY": 1243, + "trimX": 1175, + "trimY": 877, "width": 114, "height": 116, "rawWidth": 128, @@ -2775,11 +3097,11 @@ "name": "FlagFrame_01_Bg_Blue", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 489, - "trimY": 1324, + "trimX": 922, + "trimY": 838, "width": 154, "height": 77, "rawWidth": 154, @@ -2824,8 +3146,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1114, - "trimY": 571, + "trimX": 1452, + "trimY": 58, "width": 154, "height": 77, "rawWidth": 154, @@ -2870,8 +3192,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 852, - "trimY": 796, + "trimX": 1608, + "trimY": 58, "width": 154, "height": 77, "rawWidth": 154, @@ -2916,8 +3238,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 308, - "trimY": 1287, + "trimX": 759, + "trimY": 543, "width": 179, "height": 95, "rawWidth": 179, @@ -3008,8 +3330,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1937, - "trimY": 1105, + "trimX": 1995, + "trimY": 927, "width": 38, "height": 42, "rawWidth": 38, @@ -3054,8 +3376,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 953, - "trimY": 236, + "trimX": 523, + "trimY": 858, "width": 183, "height": 183, "rawWidth": 183, @@ -3100,8 +3422,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 523, - "trimY": 617, + "trimX": 761, + "trimY": 236, "width": 183, "height": 183, "rawWidth": 183, @@ -3192,8 +3514,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 720, - "trimY": 236, + "trimX": 523, + "trimY": 631, "width": 231, "height": 225, "rawWidth": 231, @@ -3235,11 +3557,11 @@ "name": "ItemFrame00~03_Bg", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 865, - "trimY": 1101, + "trimX": 1537, + "trimY": 1185, "width": 60, "height": 62, "rawWidth": 60, @@ -3284,8 +3606,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1009, - "trimY": 878, + "trimX": 1274, + "trimY": 251, "width": 133, "height": 133, "rawWidth": 133, @@ -3330,8 +3652,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1733, - "trimY": 784, + "trimX": 1672, + "trimY": 1324, "width": 50, "height": 39, "rawWidth": 50, @@ -3376,8 +3698,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1509, - "trimY": 960, + "trimX": 1519, + "trimY": 855, "width": 110, "height": 110, "rawWidth": 110, @@ -3419,11 +3741,11 @@ "name": "ItemFrame00~03_FocusLine", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1032, - "trimY": 1361, + "trimX": 426, + "trimY": 1372, "width": 76, "height": 78, "rawWidth": 76, @@ -3465,11 +3787,11 @@ "name": "ItemFrame_Square_01_Blue", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1599, - "trimY": 1342, + "trimX": 1175, + "trimY": 523, "width": 96, "height": 97, "rawWidth": 96, @@ -3514,8 +3836,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1785, - "trimY": 668, + "trimX": 1790, + "trimY": 1121, "width": 96, "height": 97, "rawWidth": 96, @@ -3560,8 +3882,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1682, - "trimY": 1184, + "trimX": 1508, + "trimY": 1367, "width": 52, "height": 52, "rawWidth": 52, @@ -3606,8 +3928,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1799, - "trimY": 1198, + "trimX": 1568, + "trimY": 1309, "width": 52, "height": 52, "rawWidth": 52, @@ -3652,8 +3974,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1799, - "trimY": 1252, + "trimX": 1622, + "trimY": 1310, "width": 48, "height": 48, "rawWidth": 48, @@ -3698,8 +4020,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1893, - "trimY": 1233, + "trimX": 1644, + "trimY": 1365, "width": 40, "height": 40, "rawWidth": 40, @@ -3741,11 +4063,11 @@ "name": "ItemIcon_Ad", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1151, - "trimY": 1243, + "trimX": 1835, + "trimY": 1011, "width": 108, "height": 116, "rawWidth": 128, @@ -3790,8 +4112,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1009, - "trimY": 1013, + "trimX": 1903, + "trimY": 251, "width": 128, "height": 104, "rawWidth": 128, @@ -3833,11 +4155,11 @@ "name": "ItemIcon_Card_1", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 852, - "trimY": 528, + "trimX": 1723, + "trimY": 326, "width": 120, "height": 118, "rawWidth": 128, @@ -3879,11 +4201,11 @@ "name": "ItemIcon_Coin_Gold", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1261, - "trimY": 1243, + "trimX": 627, + "trimY": 1335, "width": 112, "height": 116, "rawWidth": 128, @@ -3925,11 +4247,11 @@ "name": "ItemIcon_Coin_Silver", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1391, - "trimY": 1000, + "trimX": 1721, + "trimY": 772, "width": 112, "height": 116, "rawWidth": 128, @@ -3974,8 +4296,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1270, - "trimY": 878, + "trimX": 1601, + "trimY": 373, "width": 120, "height": 120, "rawWidth": 128, @@ -4017,11 +4339,11 @@ "name": "ItemIcon_Crown_2", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1441, - "trimY": 78, + "trimX": 1945, + "trimY": 1, "width": 128, "height": 102, "rawWidth": 128, @@ -4066,8 +4388,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1438, - "trimY": 302, + "trimX": 1723, + "trimY": 446, "width": 124, "height": 108, "rawWidth": 128, @@ -4109,11 +4431,11 @@ "name": "ItemIcon_Friend", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1438, - "trimY": 412, + "trimX": 1291, + "trimY": 850, "width": 124, "height": 108, "rawWidth": 128, @@ -4155,11 +4477,11 @@ "name": "ItemIcon_GearWheel", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 771, - "trimY": 1323, + "trimX": 1401, + "trimY": 839, "width": 116, "height": 120, "rawWidth": 128, @@ -4204,8 +4526,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1261, - "trimY": 1000, + "trimX": 1203, + "trimY": 137, "width": 128, "height": 112, "rawWidth": 128, @@ -4250,8 +4572,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1789, - "trimY": 558, + "trimX": 1721, + "trimY": 890, "width": 108, "height": 112, "rawWidth": 128, @@ -4296,8 +4618,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1144, - "trimY": 878, + "trimX": 1409, + "trimY": 251, "width": 124, "height": 120, "rawWidth": 128, @@ -4342,8 +4664,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1564, - "trimY": 422, + "trimX": 1601, + "trimY": 495, "width": 114, "height": 120, "rawWidth": 128, @@ -4388,8 +4710,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1521, - "trimY": 738, + "trimX": 1721, + "trimY": 1000, "width": 108, "height": 112, "rawWidth": 128, @@ -4431,11 +4753,11 @@ "name": "ItemIcon_Gift_Purple", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1796, - "trimY": 440, + "trimX": 1835, + "trimY": 791, "width": 116, "height": 108, "rawWidth": 128, @@ -4477,11 +4799,11 @@ "name": "ItemIcon_Map", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1131, - "trimY": 1119, + "trimX": 1409, + "trimY": 373, "width": 122, "height": 110, "rawWidth": 128, @@ -4523,11 +4845,11 @@ "name": "ItemIcon_Medal_Gold_1", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1375, - "trimY": 1242, + "trimX": 1593, + "trimY": 137, "width": 128, "height": 110, "rawWidth": 128, @@ -4569,11 +4891,11 @@ "name": "ItemIcon_Medal_Silver_1", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1202, - "trimY": 374, + "trimX": 1849, + "trimY": 469, "width": 128, "height": 104, "rawWidth": 128, @@ -4618,8 +4940,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1308, - "trimY": 409, + "trimX": 1274, + "trimY": 386, "width": 128, "height": 104, "rawWidth": 128, @@ -4664,8 +4986,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1009, - "trimY": 1119, + "trimX": 1601, + "trimY": 249, "width": 120, "height": 122, "rawWidth": 128, @@ -4710,8 +5032,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1243, - "trimY": 1119, + "trimX": 1723, + "trimY": 202, "width": 120, "height": 122, "rawWidth": 128, @@ -4756,8 +5078,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1419, - "trimY": 522, + "trimX": 1723, + "trimY": 556, "width": 122, "height": 108, "rawWidth": 128, @@ -4802,8 +5124,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1543, - "trimY": 538, + "trimX": 1847, + "trimY": 575, "width": 122, "height": 108, "rawWidth": 128, @@ -4848,8 +5170,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1284, - "trimY": 615, + "trimX": 1519, + "trimY": 733, "width": 110, "height": 120, "rawWidth": 128, @@ -4894,8 +5216,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1898, - "trimY": 222, + "trimX": 1404, + "trimY": 485, "width": 122, "height": 112, "rawWidth": 128, @@ -4940,8 +5262,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1396, - "trimY": 632, + "trimX": 1401, + "trimY": 961, "width": 116, "height": 106, "rawWidth": 128, @@ -4986,8 +5308,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1392, - "trimY": 854, + "trimX": 1519, + "trimY": 967, "width": 110, "height": 112, "rawWidth": 128, @@ -5029,11 +5351,11 @@ "name": "ItemIcon_Skill_Critical", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 645, - "trimY": 1323, + "trimX": 1279, + "trimY": 596, "width": 124, "height": 116, "rawWidth": 128, @@ -5078,8 +5400,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1308, - "trimY": 181, + "trimX": 1333, + "trimY": 137, "width": 128, "height": 112, "rawWidth": 128, @@ -5124,8 +5446,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1308, - "trimY": 295, + "trimX": 1463, + "trimY": 137, "width": 128, "height": 112, "rawWidth": 128, @@ -5170,8 +5492,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1906, - "trimY": 458, + "trimX": 1290, + "trimY": 1086, "width": 108, "height": 114, "rawWidth": 128, @@ -5213,11 +5535,11 @@ "name": "ItemIcon_Skill_Health", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1560, - "trimY": 196, + "trimX": 1184, + "trimY": 995, "width": 124, "height": 104, "rawWidth": 128, @@ -5262,8 +5584,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1365, - "trimY": 1114, + "trimX": 1165, + "trimY": 621, "width": 126, "height": 112, "rawWidth": 128, @@ -5308,8 +5630,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1479, - "trimY": 1114, + "trimX": 1175, + "trimY": 749, "width": 126, "height": 112, "rawWidth": 128, @@ -5354,8 +5676,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1906, - "trimY": 336, + "trimX": 1519, + "trimY": 611, "width": 114, "height": 120, "rawWidth": 128, @@ -5400,8 +5722,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1438, - "trimY": 182, + "trimX": 1397, + "trimY": 599, "width": 120, "height": 118, "rawWidth": 128, @@ -5446,8 +5768,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1564, - "trimY": 302, + "trimX": 1397, + "trimY": 719, "width": 120, "height": 118, "rawWidth": 128, @@ -5489,11 +5811,11 @@ "name": "ItemIcon_Ticket_Gold", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1686, - "trimY": 316, + "trimX": 1274, + "trimY": 492, "width": 128, "height": 102, "rawWidth": 128, @@ -5538,8 +5860,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1790, - "trimY": 312, + "trimX": 1289, + "trimY": 722, "width": 106, "height": 126, "rawWidth": 128, @@ -5581,11 +5903,11 @@ "name": "ItemIcon_Trophy", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1289, - "trimY": 515, + "trimX": 1186, + "trimY": 1121, "width": 128, "height": 98, "rawWidth": 128, @@ -5627,11 +5949,11 @@ "name": "Label_Bubble", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1779, - "trimY": 1021, + "trimX": 1723, + "trimY": 137, "width": 61, "height": 39, "rawWidth": 61, @@ -5673,11 +5995,11 @@ "name": "Label_Flag_01_Single_Blue", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1945, - "trimY": 1, + "trimX": 1111, + "trimY": 1373, "width": 52, "height": 75, "rawWidth": 52, @@ -5719,11 +6041,11 @@ "name": "Label_Flag_01_Single_Purple", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1967, - "trimY": 678, + "trimX": 1971, + "trimY": 653, "width": 52, "height": 75, "rawWidth": 52, @@ -5768,8 +6090,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1721, - "trimY": 899, + "trimX": 1406, + "trimY": 1181, "width": 52, "height": 75, "rawWidth": 52, @@ -5811,11 +6133,11 @@ "name": "Label_Flag_01_White_Bg", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1791, - "trimY": 967, + "trimX": 1396, + "trimY": 1301, "width": 52, "height": 75, "rawWidth": 52, @@ -5860,8 +6182,8 @@ "rotated": false, "offsetX": -2, "offsetY": 1, - "trimX": 708, - "trimY": 528, + "trimX": 758, + "trimY": 838, "width": 142, "height": 144, "rawWidth": 146, @@ -5903,11 +6225,11 @@ "name": "Loading_Circle_10", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 783, - "trimY": 1170, + "trimX": 745, + "trimY": 1210, "width": 144, "height": 142, "rawWidth": 146, @@ -5949,11 +6271,11 @@ "name": "Loading_Circle_11", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1140, - "trimY": 650, + "trimX": 1764, + "trimY": 58, "width": 144, "height": 142, "rawWidth": 146, @@ -5998,8 +6320,8 @@ "rotated": false, "offsetX": -1, "offsetY": -1, - "trimX": 637, - "trimY": 1181, + "trimX": 980, + "trimY": 1171, "width": 144, "height": 140, "rawWidth": 146, @@ -6041,11 +6363,11 @@ "name": "Loading_Circle_2", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -2, "offsetY": 1, - "trimX": 708, - "trimY": 674, + "trimX": 944, + "trimY": 448, "width": 142, "height": 144, "rawWidth": 146, @@ -6090,8 +6412,8 @@ "rotated": false, "offsetX": -2, "offsetY": 2, - "trimX": 865, - "trimY": 957, + "trimX": 980, + "trimY": 1027, "width": 142, "height": 142, "rawWidth": 146, @@ -6136,8 +6458,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 489, - "trimY": 1180, + "trimX": 519, + "trimY": 1043, "width": 146, "height": 142, "rawWidth": 146, @@ -6182,8 +6504,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 705, - "trimY": 820, + "trimX": 373, + "trimY": 1228, "width": 144, "height": 142, "rawWidth": 146, @@ -6225,11 +6547,11 @@ "name": "Loading_Circle_6", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 721, - "trimY": 964, + "trimX": 752, + "trimY": 1066, "width": 144, "height": 142, "rawWidth": 146, @@ -6271,11 +6593,11 @@ "name": "Loading_Circle_7", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 972, - "trimY": 421, + "trimX": 519, + "trimY": 1187, "width": 142, "height": 146, "rawWidth": 146, @@ -6317,11 +6639,11 @@ "name": "Loading_Circle_8", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 852, - "trimY": 650, + "trimX": 937, + "trimY": 655, "width": 142, "height": 144, "rawWidth": 146, @@ -6366,8 +6688,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 996, - "trimY": 650, + "trimX": 1001, + "trimY": 799, "width": 142, "height": 144, "rawWidth": 146, @@ -6455,11 +6777,11 @@ "name": "Pattern01_s", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 503, - "trimY": 1034, + "trimX": 373, + "trimY": 1073, "width": 153, "height": 144, "rawWidth": 153, @@ -6504,8 +6826,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 523, - "trimY": 802, + "trimX": 946, + "trimY": 236, "width": 180, "height": 180, "rawWidth": 180, @@ -6550,8 +6872,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1867, - "trimY": 766, + "trimX": 1087, + "trimY": 592, "width": 54, "height": 61, "rawWidth": 54, @@ -6596,8 +6918,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 446, - "trimY": 617, + "trimX": 1849, + "trimY": 440, "width": 50, "height": 24, "rawWidth": 50, @@ -6642,8 +6964,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1867, - "trimY": 766, + "trimX": 1087, + "trimY": 592, "width": 54, "height": 61, "rawWidth": 54, @@ -6688,8 +7010,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1937, - "trimY": 1005, + "trimX": 308, + "trimY": 1344, "width": 48, "height": 26, "rawWidth": 48, @@ -6734,8 +7056,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 446, - "trimY": 617, + "trimX": 1849, + "trimY": 440, "width": 50, "height": 24, "rawWidth": 50, @@ -6826,8 +7148,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 279, - "trimY": 1384, + "trimX": 756, + "trimY": 782, "width": 54, "height": 174, "rawWidth": 54, @@ -6869,11 +7191,11 @@ "name": "Popup07_Topbar_Divided_Single_Sky", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1637, - "trimY": 58, + "trimX": 1128, + "trimY": 236, "width": 54, "height": 174, "rawWidth": 54, @@ -6918,8 +7240,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 419, - "trimY": 515, + "trimX": 1, + "trimY": 1381, "width": 59, "height": 275, "rawWidth": 59, @@ -7007,11 +7329,11 @@ "name": "SkillFrame_01_Bg", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1923, - "trimY": 765, + "trimX": 1126, + "trimY": 1305, "width": 56, "height": 58, "rawWidth": 56, @@ -7056,8 +7378,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1923, - "trimY": 825, + "trimX": 1903, + "trimY": 1208, "width": 56, "height": 58, "rawWidth": 56, @@ -7102,8 +7424,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1926, - "trimY": 885, + "trimX": 1810, + "trimY": 1267, "width": 56, "height": 58, "rawWidth": 56, @@ -7145,11 +7467,11 @@ "name": "SkillFrame_01_Border_Purple", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1929, - "trimY": 945, + "trimX": 1868, + "trimY": 1268, "width": 56, "height": 58, "rawWidth": 56, @@ -7194,8 +7516,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1683, - "trimY": 1238, + "trimX": 1450, + "trimY": 1301, "width": 56, "height": 58, "rawWidth": 56, @@ -7237,11 +7559,11 @@ "name": "SkillFrame_01_Border_Yellow", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1697, - "trimY": 1342, + "trimX": 1508, + "trimY": 1309, "width": 56, "height": 58, "rawWidth": 56, @@ -7275,6 +7597,328 @@ ], "subMetas": {} }, + "ede51": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@ede51", + "displayName": "", + "id": "ede51", + "name": "Slider_Basic03_Bg_White1", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1500, + "trimY": 1421, + "width": 25, + "height": 43, + "rawWidth": 25, + "rawHeight": 43, + "borderTop": 24, + "borderBottom": 19, + "borderLeft": 12, + "borderRight": 12, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e5c5f": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@e5c5f", + "displayName": "", + "id": "e5c5f", + "name": "Slider_Basic03_FillMask", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 320, + "trimY": 1073, + "width": 17, + "height": 35, + "rawWidth": 17, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "fe983": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@fe983", + "displayName": "", + "id": "fe983", + "name": "Slider_Basic03_Fill_Blue", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1396, + "trimY": 1196, + "width": 8, + "height": 35, + "rawWidth": 8, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 7, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "9812a": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@9812a", + "displayName": "", + "id": "9812a", + "name": "Slider_Basic03_Fill_Green", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1963, + "trimY": 781, + "width": 8, + "height": 35, + "rawWidth": 8, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 7, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "00fc5": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@00fc5", + "displayName": "", + "id": "00fc5", + "name": "Slider_Basic03_Fill_White", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 2000, + "trimY": 781, + "width": 8, + "height": 35, + "rawWidth": 8, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 7, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "62bb6": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@62bb6", + "displayName": "", + "id": "62bb6", + "name": "Slider_Basic03_Fill_Yellow", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2039, + "trimY": 1173, + "width": 8, + "height": 35, + "rawWidth": 8, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 7, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "6621b": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@6621b", + "displayName": "", + "id": "6621b", + "name": "Slider_Basic04_Bg", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 932, + "trimY": 799, + "width": 37, + "height": 56, + "rawWidth": 37, + "rawHeight": 56, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "dea8c": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@dea8c", @@ -7283,11 +7927,11 @@ "name": "Slider_BorderDeco_Tapered_01_Border", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 972, - "trimY": 565, + "trimX": 667, + "trimY": 1049, "width": 140, "height": 83, "rawWidth": 140, @@ -7332,8 +7976,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1188, - "trimY": 222, + "trimX": 1145, + "trimY": 799, "width": 150, "height": 28, "rawWidth": 150, @@ -7378,8 +8022,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1218, - "trimY": 222, + "trimX": 1184, + "trimY": 251, "width": 150, "height": 28, "rawWidth": 150, @@ -7424,8 +8068,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1248, - "trimY": 222, + "trimX": 1214, + "trimY": 251, "width": 150, "height": 28, "rawWidth": 150, @@ -7470,8 +8114,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1278, - "trimY": 222, + "trimX": 1244, + "trimY": 251, "width": 150, "height": 28, "rawWidth": 150, @@ -7513,11 +8157,11 @@ "name": "Slider_Handle_01_Border", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1284, - "trimY": 737, + "trimX": 1631, + "trimY": 1059, "width": 105, "height": 57, "rawWidth": 105, @@ -7551,6 +8195,144 @@ ], "subMetas": {} }, + "d2d85": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@d2d85", + "displayName": "", + "id": "d2d85", + "name": "Slider_Icon01_Bg", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1331, + "trimY": 1420, + "width": 23, + "height": 35, + "rawWidth": 23, + "rawHeight": 35, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f56ea": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@f56ea", + "displayName": "", + "id": "f56ea", + "name": "Slider_Icon01_Fill_Orange", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1165, + "trimY": 749, + "width": 8, + "height": 47, + "rawWidth": 8, + "rawHeight": 47, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "67fdb": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@67fdb", + "displayName": "", + "id": "67fdb", + "name": "Slider_Icon01_Fill_White", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1112, + "trimY": 1363, + "width": 8, + "height": 47, + "rawWidth": 8, + "rawHeight": 47, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "46c83": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83", @@ -7562,8 +8344,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 419, - "trimY": 617, + "trimX": 1910, + "trimY": 104, "width": 25, "height": 25, "rawWidth": 25, @@ -7608,8 +8390,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 498, - "trimY": 617, + "trimX": 1143, + "trimY": 592, "width": 23, "height": 24, "rawWidth": 23, @@ -7651,11 +8433,11 @@ "name": "Slider_Play_01_Border", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1667, - "trimY": 538, + "trimX": 2031, + "trimY": 791, "width": 17, "height": 16, "rawWidth": 17, @@ -7700,8 +8482,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1971, - "trimY": 1075, + "trimX": 1178, + "trimY": 995, "width": 4, "height": 18, "rawWidth": 4, @@ -7746,8 +8528,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1593, - "trimY": 1184, + "trimX": 1690, + "trimY": 1208, "width": 87, "height": 52, "rawWidth": 87, @@ -7789,11 +8571,11 @@ "name": "Slider_Play_02_Fill_Red", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1441, - "trimY": 58, + "trimX": 902, + "trimY": 838, "width": 194, "height": 18, "rawWidth": 194, @@ -7838,8 +8620,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1599, - "trimY": 1238, + "trimX": 1635, + "trimY": 611, "width": 102, "height": 82, "rawWidth": 102, @@ -7884,8 +8666,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1381, + "trimX": 1910, + "trimY": 131, "width": 137, "height": 58, "rawWidth": 137, @@ -7930,8 +8712,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 140, - "trimY": 1381, + "trimX": 1910, + "trimY": 191, "width": 137, "height": 58, "rawWidth": 137, @@ -7976,8 +8758,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 721, - "trimY": 1110, + "trimX": 973, + "trimY": 1313, "width": 137, "height": 58, "rawWidth": 137, @@ -8022,8 +8804,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 893, - "trimY": 1360, + "trimX": 972, + "trimY": 1373, "width": 137, "height": 58, "rawWidth": 137, @@ -8065,11 +8847,11 @@ "name": "Title_01_NoDeco_White", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1110, - "trimY": 1361, + "trimX": 1124, + "trimY": 1027, "width": 137, "height": 58, "rawWidth": 137, @@ -8111,11 +8893,11 @@ "name": "Title_01_NoDeco_Yellow", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1441, - "trimY": 1372, + "trimX": 1126, + "trimY": 1166, "width": 137, "height": 58, "rawWidth": 137, @@ -8206,8 +8988,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 320, - "trimY": 1023, + "trimX": 761, + "trimY": 421, "width": 181, "height": 120, "rawWidth": 181, @@ -8252,8 +9034,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1935, - "trimY": 1231, + "trimX": 1724, + "trimY": 1374, "width": 40, "height": 40, "rawWidth": 40, @@ -8298,8 +9080,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1849, - "trimY": 1321, + "trimX": 1766, + "trimY": 1376, "width": 40, "height": 40, "rawWidth": 40, @@ -8341,11 +9123,11 @@ "name": "Toggle_Check_02_Off", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1781, - "trimY": 1062, + "trimX": 1979, + "trimY": 469, "width": 68, "height": 60, "rawWidth": 68, @@ -8387,11 +9169,11 @@ "name": "Toggle_Check_02_On", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1296, - "trimY": 796, + "trimX": 344, + "trimY": 1372, "width": 80, "height": 76, "rawWidth": 80, @@ -8436,8 +9218,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1861, - "trimY": 829, + "trimX": 1624, + "trimY": 1248, "width": 60, "height": 60, "rawWidth": 60, @@ -8482,8 +9264,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1864, - "trimY": 891, + "trimX": 1686, + "trimY": 1262, "width": 60, "height": 60, "rawWidth": 60, @@ -8528,8 +9310,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1879, - "trimY": 1015, + "trimX": 1820, + "trimY": 1327, "width": 44, "height": 44, "rawWidth": 44, @@ -8574,8 +9356,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1843, - "trimY": 1061, + "trimX": 1953, + "trimY": 1029, "width": 44, "height": 44, "rawWidth": 44, @@ -8620,8 +9402,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1721, - "trimY": 825, + "trimX": 1963, + "trimY": 707, "width": 72, "height": 72, "rawWidth": 72, @@ -8666,8 +9448,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1504, - "trimY": 848, + "trimX": 1406, + "trimY": 1069, "width": 111, "height": 110, "rawWidth": 111, @@ -8709,11 +9491,11 @@ "name": "UI_Rewards_Medal_01_Bronze", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1617, - "trimY": 848, + "trimX": 1519, + "trimY": 1081, "width": 102, "height": 110, "rawWidth": 128, @@ -8758,8 +9540,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1621, - "trimY": 960, + "trimX": 1292, + "trimY": 1196, "width": 102, "height": 110, "rawWidth": 128, @@ -8804,8 +9586,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1593, - "trimY": 1072, + "trimX": 1292, + "trimY": 1308, "width": 102, "height": 110, "rawWidth": 128, @@ -8850,8 +9632,8 @@ "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 1686, - "trimY": 196, + "trimX": 1184, + "trimY": 403, "width": 118, "height": 88, "rawWidth": 128, @@ -8893,11 +9675,11 @@ "name": "UI_Rewards_Trophy_01_Gold", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 1776, - "trimY": 222, + "trimX": 1631, + "trimY": 819, "width": 118, "height": 88, "rawWidth": 128, @@ -8939,11 +9721,11 @@ "name": "UI_Rewards_Trophy_01_Silver", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 1514, - "trimY": 648, + "trimX": 1631, + "trimY": 939, "width": 118, "height": 88, "rawWidth": 128, @@ -9031,11 +9813,11 @@ "name": "bg_ar", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1635, - "trimY": 724, + "trimX": 1690, + "trimY": 1110, "width": 96, "height": 98, "rawWidth": 96, @@ -9077,11 +9859,11 @@ "name": "bg_line", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 720, - "trimY": 463, + "trimX": 308, + "trimY": 1092, "width": 250, "height": 63, "rawWidth": 250, @@ -9123,11 +9905,11 @@ "name": "bosstext", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 658, - "trimY": 1034, + "trimX": 940, + "trimY": 592, "width": 145, "height": 61, "rawWidth": 145, @@ -9172,8 +9954,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1987, - "trimY": 931, + "trimX": 1910, + "trimY": 58, "width": 44, "height": 32, "rawWidth": 64, @@ -9218,8 +10000,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 607, - "trimY": 1403, + "trimX": 1251, + "trimY": 1411, "width": 36, "height": 36, "rawWidth": 64, @@ -9264,8 +10046,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1931, - "trimY": 1149, + "trimX": 1997, + "trimY": 1215, "width": 40, "height": 38, "rawWidth": 64, @@ -9310,8 +10092,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1984, - "trimY": 755, + "trimX": 1993, + "trimY": 791, "width": 36, "height": 44, "rawWidth": 64, @@ -9356,8 +10138,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1853, - "trimY": 1239, + "trimX": 1562, + "trimY": 1409, "width": 38, "height": 38, "rawWidth": 64, @@ -9399,11 +10181,11 @@ "name": "function_icon_battle", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 1282, + "trimX": 1997, + "trimY": 1101, "width": 42, "height": 34, "rawWidth": 64, @@ -9448,8 +10230,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1889, - "trimY": 1061, + "trimX": 1953, + "trimY": 937, "width": 44, "height": 40, "rawWidth": 64, @@ -9491,11 +10273,11 @@ "name": "function_icon_boot_fly", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1203, - "trimY": 134, + "trimX": 1249, + "trimY": 1361, "width": 48, "height": 38, "rawWidth": 64, @@ -9540,8 +10322,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1843, - "trimY": 1403, + "trimX": 2006, + "trimY": 1367, "width": 36, "height": 36, "rawWidth": 64, @@ -9586,8 +10368,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1843, - "trimY": 1363, + "trimX": 1602, + "trimY": 1405, "width": 38, "height": 38, "rawWidth": 64, @@ -9629,11 +10411,11 @@ "name": "function_icon_cyclone", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1887, - "trimY": 1149, + "trimX": 1997, + "trimY": 971, "width": 42, "height": 38, "rawWidth": 64, @@ -9678,8 +10460,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1883, - "trimY": 1363, + "trimX": 1642, + "trimY": 1407, "width": 38, "height": 38, "rawWidth": 64, @@ -9724,8 +10506,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1981, - "trimY": 801, + "trimX": 1953, + "trimY": 791, "width": 48, "height": 38, "rawWidth": 64, @@ -9770,8 +10552,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1984, - "trimY": 851, + "trimX": 1686, + "trimY": 1365, "width": 36, "height": 38, "rawWidth": 64, @@ -9813,11 +10595,11 @@ "name": "function_icon_feather", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 1326, + "trimX": 1888, + "trimY": 1407, "width": 36, "height": 34, "rawWidth": 64, @@ -9862,8 +10644,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1392, - "trimY": 968, + "trimX": 1953, + "trimY": 1119, "width": 30, "height": 42, "rawWidth": 64, @@ -9908,8 +10690,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1977, - "trimY": 1075, + "trimX": 1808, + "trimY": 1376, "width": 38, "height": 38, "rawWidth": 64, @@ -9951,11 +10733,11 @@ "name": "function_icon_halberd", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1853, - "trimY": 1195, + "trimX": 1997, + "trimY": 1137, "width": 42, "height": 34, "rawWidth": 64, @@ -10000,8 +10782,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1977, - "trimY": 1115, + "trimX": 1848, + "trimY": 1373, "width": 38, "height": 38, "rawWidth": 64, @@ -10046,8 +10828,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1736, - "trimY": 1176, + "trimX": 1953, + "trimY": 841, "width": 46, "height": 40, "rawWidth": 64, @@ -10092,8 +10874,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1697, - "trimY": 1402, + "trimX": 1128, + "trimY": 412, "width": 46, "height": 34, "rawWidth": 64, @@ -10138,8 +10920,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1745, - "trimY": 1405, + "trimX": 1165, + "trimY": 1413, "width": 34, "height": 40, "rawWidth": 64, @@ -10181,11 +10963,11 @@ "name": "function_icon_helmet_2", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 893, - "trimY": 1316, + "trimX": 1456, + "trimY": 1416, "width": 32, "height": 42, "rawWidth": 64, @@ -10227,11 +11009,11 @@ "name": "function_icon_knight", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1244, - "trimY": 178, + "trimX": 1953, + "trimY": 983, "width": 42, "height": 44, "rawWidth": 64, @@ -10276,8 +11058,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1973, - "trimY": 1155, + "trimX": 1866, + "trimY": 1327, "width": 38, "height": 38, "rawWidth": 64, @@ -10322,8 +11104,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1799, - "trimY": 1333, + "trimX": 1993, + "trimY": 1255, "width": 42, "height": 34, "rawWidth": 64, @@ -10368,8 +11150,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1799, - "trimY": 1369, + "trimX": 1986, + "trimY": 1291, "width": 42, "height": 34, "rawWidth": 64, @@ -10414,8 +11196,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1889, - "trimY": 1189, + "trimX": 1995, + "trimY": 883, "width": 38, "height": 42, "rawWidth": 64, @@ -10460,8 +11242,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1984, - "trimY": 891, + "trimX": 1888, + "trimY": 1367, "width": 36, "height": 38, "rawWidth": 64, @@ -10506,8 +11288,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1973, - "trimY": 1033, + "trimX": 1562, + "trimY": 1367, "width": 38, "height": 40, "rawWidth": 64, @@ -10549,11 +11331,11 @@ "name": "function_icon_powerup", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1509, - "trimY": 1072, + "trimX": 1582, + "trimY": 1247, "width": 54, "height": 40, "rawWidth": 64, @@ -10595,11 +11377,11 @@ "name": "function_icon_revive_1", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1847, - "trimY": 1107, + "trimX": 1953, + "trimY": 889, "width": 46, "height": 40, "rawWidth": 64, @@ -10644,8 +11426,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1919, - "trimY": 1403, + "trimX": 1964, + "trimY": 1407, "width": 36, "height": 36, "rawWidth": 64, @@ -10690,8 +11472,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1977, - "trimY": 1227, + "trimX": 1906, + "trimY": 1326, "width": 38, "height": 38, "rawWidth": 64, @@ -10736,8 +11518,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1977, - "trimY": 1267, + "trimX": 1946, + "trimY": 1326, "width": 38, "height": 38, "rawWidth": 64, @@ -10779,11 +11561,11 @@ "name": "function_icon_skull", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1755, - "trimY": 1364, + "trimX": 1999, + "trimY": 1015, "width": 42, "height": 38, "rawWidth": 64, @@ -10828,8 +11610,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1931, - "trimY": 1033, + "trimX": 1951, + "trimY": 1151, "width": 40, "height": 40, "rawWidth": 64, @@ -10874,8 +11656,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1727, - "trimY": 1298, + "trimX": 1961, + "trimY": 1193, "width": 34, "height": 42, "rawWidth": 64, @@ -10920,8 +11702,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1683, - "trimY": 1298, + "trimX": 1953, + "trimY": 1075, "width": 42, "height": 42, "rawWidth": 64, @@ -10966,8 +11748,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1893, - "trimY": 1275, + "trimX": 1986, + "trimY": 1327, "width": 38, "height": 38, "rawWidth": 64, @@ -11012,8 +11794,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1929, - "trimY": 1189, + "trimX": 1997, + "trimY": 1173, "width": 40, "height": 40, "rawWidth": 64, @@ -11058,8 +11840,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1849, - "trimY": 1279, + "trimX": 1602, + "trimY": 1363, "width": 40, "height": 40, "rawWidth": 64, @@ -11104,8 +11886,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1436, - "trimY": 968, + "trimX": 1762, + "trimY": 1418, "width": 30, "height": 38, "rawWidth": 64, @@ -11147,11 +11929,11 @@ "name": "function_icon_volume", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1931, - "trimY": 1075, + "trimX": 1145, + "trimY": 951, "width": 28, "height": 38, "rawWidth": 64, @@ -11196,8 +11978,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1891, - "trimY": 1315, + "trimX": 1926, + "trimY": 1366, "width": 38, "height": 38, "rawWidth": 64, @@ -11242,8 +12024,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1935, - "trimY": 1273, + "trimX": 1966, + "trimY": 1367, "width": 38, "height": 38, "rawWidth": 64, @@ -11285,11 +12067,11 @@ "name": "function_icon_water", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1925, - "trimY": 140, + "trimX": 1802, + "trimY": 1418, "width": 30, "height": 38, "rawWidth": 64, @@ -11334,8 +12116,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1847, - "trimY": 1149, + "trimX": 1995, + "trimY": 837, "width": 38, "height": 44, "rawWidth": 64, @@ -11377,11 +12159,11 @@ "name": "play_character_target", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1391, - "trimY": 740, + "trimX": 1845, + "trimY": 202, "width": 128, "height": 56, "rawWidth": 128, @@ -11469,11 +12251,11 @@ "name": "shadow", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 419, - "trimY": 576, + "trimX": 720, + "trimY": 214, "width": 284, "height": 39, "rawWidth": 284, @@ -11518,8 +12300,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 308, - "trimY": 1145, + "trimX": 756, + "trimY": 640, "width": 179, "height": 140, "rawWidth": 179, @@ -11561,11 +12343,11 @@ "name": "userinfo_icon_crown", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1868, - "trimY": 953, + "trimX": 1748, + "trimY": 1267, "width": 59, "height": 60, "rawWidth": 59, diff --git a/assets/resources/gui/ui3.png b/assets/resources/gui/ui3.png index fc5461b6..9bb2aba4 100644 Binary files a/assets/resources/gui/ui3.png and b/assets/resources/gui/ui3.png differ diff --git a/assets/script/game/map/TalentItemComp.ts b/assets/script/game/map/TalentItemComp.ts index a5318789..6d1f4e68 100644 --- a/assets/script/game/map/TalentItemComp.ts +++ b/assets/script/game/map/TalentItemComp.ts @@ -5,29 +5,29 @@ * 职责： * 1. 接收 TalentsComp 下发的天赋配置 + 当前等级 + 阶位解锁态，渲染迷你点选卡。 * 2. 卡面自包含：图标 / 名称 / 当前已生效数值（Lv0 显示每级数值引导）/ 右下「当前/满级」角标。 - * 3. 状态机：可升级（右上 + 徽标）/ 满级（MAX 金角标）/ 未激活（左上锁角标，点击锁/卡体可升级激活）。 - * 4. 点击回调上抛（含 + 徽标与卡体），升级校验与 toast 统一由 TalentsComp 处理（单一决策点）。 + * 3. 阶位背景：普通背景节点下挂 blue / red / yellow 三个颜色子节点，按阶位激活其一（Ⅰ蓝 / Ⅱ红 / Ⅲ金）。 + * 4. 状态机：满级（MAX 金角标）/ 未激活（左上锁角标 + 背景与图标灰阶 Grayscale）。 + * 5. 点击回调上抛卡体点击，加点确认弹窗与升级校验统一由 TalentsComp 处理（单一决策点）。 * * 依赖： * - TalentSet.TalentConfig / TalentTier / getTalentDisplayText —— 配置与卡面文案 - * - CardBgComp —— 阶位品质底框（Ⅰ蓝 / Ⅱ紫 / Ⅲ金） + * - 背景三颜色子节点（blue / red / yellow，编辑器侧搭建） * - smc.uiconsAtlas —— 图标解析（缺省回退资源目录） */ import { _decorator, Label, Node, NodeEventType, Sprite, SpriteFrame } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { TalentConfig, TalentTier, getTalentDisplayText } from "../common/config/TalentSet"; -import { CardBgComp } from "./CardBgComp"; import { smc } from "../common/SingletonModuleComp"; import { oops } from "db://oops-framework/core/Oops"; const { ccclass, property } = _decorator; -/** 阶位 → 品质底框 card_lv（CARD_LV_BG_COLORS：2=blue、3=purple、4=yellow） */ -const TIER_TO_BG_LV: Record = { - [TalentTier.Basic]: 2, - [TalentTier.Specialized]: 3, - [TalentTier.Super]: 4, +/** 阶位 → 背景节点下的颜色子节点名（Ⅰ蓝 / Ⅱ红 / Ⅲ金） */ +const TIER_BG_CHILD_NAMES: Record = { + [TalentTier.Basic]: "blue", + [TalentTier.Specialized]: "red", + [TalentTier.Super]: "yellow", }; /** TalentItemComp —— 天赋迷你升级卡组件 */ @@ -47,11 +47,8 @@ export class TalentItemComp extends CCComp { @property({ type: Sprite, tooltip: "天赋图标" }) icon: Sprite = null!; - @property({ type: CardBgComp, tooltip: "卡牌背景组件（阶位品质色）" }) - bg: CardBgComp = null!; - - @property({ type: Node, tooltip: "右上 + 升级徽标（可升级时显示）" }) - node_plus: Node = null!; + @property({ type: Node, tooltip: "卡牌背景节点（下挂 blue / red / yellow 三颜色子节点，按阶位激活其一）" }) + bg: Node = null!; @property({ type: Node, tooltip: "MAX 满级角标" }) node_max: Node = null!; @@ -78,9 +75,8 @@ export class TalentItemComp extends CCComp { * @param cfg 天赋配置（TalentSet 条目） * @param lv 当前等级 * @param tierUnlocked 所属阶位是否已解锁 - * @param canUp 父级预判的"可升级"（阶位解锁 + 未满级 + 点数足够） */ - public updateItem(cfg: TalentConfig, lv: number, tierUnlocked: boolean, canUp: boolean): void { + public updateItem(cfg: TalentConfig, lv: number, tierUnlocked: boolean): void { if (!cfg) return; this.curUuid = cfg.uuid; @@ -89,8 +85,11 @@ export class TalentItemComp extends CCComp { if (this.lbl_info) this.lbl_info.string = getTalentDisplayText(cfg, lv); if (this.lbl_lv) this.lbl_lv.string = `${lv}/${cfg.max_lv}`; - // 阶位品质底框：Ⅰ蓝 / Ⅱ紫 / Ⅲ金 - if (this.bg) this.bg.apply(TIER_TO_BG_LV[cfg.tier] ?? 1); + // 未激活（Lv0 或阶位未解锁）：背景与图标灰阶 + const inactive = lv <= 0 || !tierUnlocked; + + // 阶位背景：激活对应颜色子节点（Ⅰ蓝 / Ⅱ红 / Ⅲ金） + if (this.bg) this.applyTierBg(cfg.tier, inactive); // 图标：uiconsAtlas 优先，资源目录回退（与 TalentItemComp 旧版/SCardComp 口径一致） if (this.icon && cfg.icon) { @@ -102,16 +101,28 @@ export class TalentItemComp extends CCComp { frame = oops.res.get("game/heros/cards/" + cfg.icon, SpriteFrame) as SpriteFrame; } if (frame) this.icon.spriteFrame = frame; + this.icon.grayscale = inactive; } - // 状态徽标：满级 MAX / 可升级 + / 未激活锁角标（未加点或阶位未解锁，置于左上角） - const maxed = lv >= cfg.max_lv; - if (this.node_max) this.node_max.active = maxed; - if (this.node_plus) this.node_plus.active = !maxed && tierUnlocked && canUp; - if (this.node_lock) this.node_lock.active = lv <= 0 || !tierUnlocked; + // 状态角标：满级 MAX / 未激活锁角标（未加点或阶位未解锁，置于左上角） + if (this.node_max) this.node_max.active = lv >= cfg.max_lv; + if (this.node_lock) this.node_lock.active = inactive; } - /** 卡体/+ 徽标/锁角标点击：触摸事件冒泡至卡体统一上抛 uuid，升级校验与提示由 TalentsComp 处理 */ + /** 按阶位激活 bg 下对应颜色子节点，其余隐藏；未激活时全部开启灰阶 */ + private applyTierBg(tier: TalentTier, inactive: boolean): void { + const curName = TIER_BG_CHILD_NAMES[tier]; + for (const [, name] of Object.entries(TIER_BG_CHILD_NAMES)) { + const child = this.bg.getChildByName(name); + if (!child) continue; + child.active = name === curName; + // Sprite 内置灰阶材质，未激活天赋的背景置灰 + const render = child.getComponent(Sprite); + if (render) render.grayscale = inactive; + } + } + + /** 卡体点击上抛 uuid，加点确认与升级校验由 TalentsComp 处理 */ private onTap(): void { this.onTalentTap?.(this.curUuid); } diff --git a/assets/script/game/map/TalentsComp.ts b/assets/script/game/map/TalentsComp.ts index b9b74650..c6a90171 100644 --- a/assets/script/game/map/TalentsComp.ts +++ b/assets/script/game/map/TalentsComp.ts @@ -4,7 +4,7 @@ * * 职责： * 1. 三阶页签（Ⅰ 基础 / Ⅱ 专精 / Ⅲ 超强）状态机：单屏聚焦当前阶位的迷你天赋卡。 - * 2. 页签常显解锁进度（前阶投入 x/10），点击卡/+ 徽标升级（smc.upgradeTalent）。 + * 2. 页签常显解锁进度（前阶投入 x/10），点击天赋卡弹出 CommonPrompt 确认加点（smc.upgradeTalent）。 * 3. 监听 GameEvent.TALENT_UPDATE 全量重渲染（23 条卡片，无需虚拟列表）。 * 4. 看广告重置入口：CommonPrompt 二次确认后调 smc.resetTalents() 退还全部点数。 * @@ -19,7 +19,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { TalentSet, TalentTier, TALENT_TIER_UNLOCK_THRESHOLD, - getTalentLevelExp, getTalentTierInvestedPoints, getTalentUpgradeCost, isTalentTierUnlocked, + getTalentDisplayText, getTalentLevelExp, getTalentTierInvestedPoints, getTalentUpgradeCost, isTalentTierUnlocked, } from "../common/config/TalentSet"; import { GameEvent } from "../common/config/GameEvent"; import { UIID } from "../common/config/GameUIConfig"; @@ -196,7 +196,6 @@ export class TalentsComp extends CCComp { private refreshGrid(levels: Record): void { this.talents_content.removeAllChildren(); const unlocked = isTalentTierUnlocked(levels, this.curTier); - const points = smc.getTalentPoints(); const cfgs = Object.values(TalentSet) .filter(cfg => cfg.tier === this.curTier) .sort((a, b) => a.uuid - b.uuid); @@ -204,15 +203,12 @@ export class TalentsComp extends CCComp { let cardHeight = 0; for (const cfg of cfgs) { const lv = levels[cfg.uuid] ?? 0; - const cost = getTalentUpgradeCost(lv); - // 可升级 = 阶位解锁 + 未满级 + 点数足够（+ 徽标显示依据） - const canUp = unlocked && lv < cfg.max_lv && cost > 0 && points >= cost; const itemNode = instantiate(this.prefab_talent_item); this.talents_content.addChild(itemNode); const comp = itemNode.getComponent(TalentItemComp); if (!comp) continue; - comp.updateItem(cfg, lv, unlocked, canUp); + comp.updateItem(cfg, lv, unlocked); comp.onTalentTap = (uuid: number) => this.onTalentTap(uuid); if (!cardHeight) cardHeight = itemNode.getComponent(UITransform)?.height ?? 0; } @@ -226,7 +222,7 @@ export class TalentsComp extends CCComp { } } - /** 卡片点击统一入口：阶位未解锁/已满级/点数不足分别 toast，成功升级由事件驱动刷新 */ + /** 卡片点击统一入口：未解锁/已满级直接 toast；其余弹出 CommonPrompt 确认加点，成功后事件驱动刷新 */ private onTalentTap(uuid: number): void { const cfg = TalentSet[uuid]; if (!cfg) return; @@ -237,13 +233,32 @@ export class TalentsComp extends CCComp { oops.gui.toast(`${TIER_TAB_TEXT[cfg.tier].lockName}投入 ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD} 点解锁本阶`); return; } - if (smc.getTalentLv(uuid) >= cfg.max_lv) { + const lv = smc.getTalentLv(uuid); + if (lv >= cfg.max_lv) { oops.gui.toast("该天赋已满级"); return; } - if (!smc.upgradeTalent(uuid)) { + const cost = getTalentUpgradeCost(lv); + if (cost <= 0) return; + if (smc.getTalentPoints() < cost) { oops.gui.toast("天赋点不足"); + return; } + + // CommonPrompt 确认加点（UIID.Window） + oops.gui.open(UIID.Window, { + title: "天赋加点", + content: `${cfg.name} Lv.${lv} → Lv.${lv + 1}\n消耗 ${cost} 点天赋点，获得 ${getTalentDisplayText(cfg, 1)}。是否加点？`, + okWord: "加点", + cancelWord: "取消", + needCancel: true, + maskClose: true, + okFunc: () => { + if (!smc.upgradeTalent(uuid)) { + oops.gui.toast("天赋点不足"); + } + }, + }); } /** 看广告重置入口：CommonPrompt 二次确认（广告接入前先直接确认重置） */