diff --git a/assets/resources/game/gui/item.prefab b/assets/resources/game/gui/item.prefab index 28df77cb..bc800faa 100644 --- a/assets/resources/game/gui/item.prefab +++ b/assets/resources/game/gui/item.prefab @@ -35,22 +35,25 @@ }, { "__id__": 32 + }, + { + "__id__": 38 } ], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 44 }, { - "__id__": 40 + "__id__": 46 }, { - "__id__": 42 + "__id__": 48 } ], "_prefab": { - "__id__": 45 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,7 +86,7 @@ }, { "__type__": "cc.Node", - "_name": "lv1", + "_name": "lv0", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -157,7 +160,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "08/hD4/ZlOkZoJDDjU95Xj" + "fileId": "26BQtmpmJLzZMWKouiVfaV" }, { "__type__": "cc.Sprite", @@ -182,7 +185,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3b9e9", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@eeece", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -202,7 +205,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e6ZZ/ngyBLE5TAa6uoynsh" + "fileId": "85AtqxZbhLsr88zJ/Gy1sk" }, { "__type__": "cc.PrefabInfo", @@ -212,21 +215,21 @@ "asset": { "__id__": 0 }, - "fileId": "0dLGvtUJJGQplUEIoE7XXw", + "fileId": "d9YwQ+IntGq5G78fDooY/f", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "lv2", + "_name": "lv1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 9 @@ -293,7 +296,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "62feOqMW1D/75K5HZSLeqG" + "fileId": "08/hD4/ZlOkZoJDDjU95Xj" }, { "__type__": "cc.Sprite", @@ -318,7 +321,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b03fe", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3b9e9", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -338,7 +341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "faGezH4lZDrJIOLH2rRoOt" + "fileId": "e6ZZ/ngyBLE5TAa6uoynsh" }, { "__type__": "cc.PrefabInfo", @@ -348,21 +351,21 @@ "asset": { "__id__": 0 }, - "fileId": "89qevUEwlO9on5MbM3PrK5", + "fileId": "0dLGvtUJJGQplUEIoE7XXw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "lv3", + "_name": "lv2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 15 @@ -429,7 +432,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "84dbzXu+BBaYqw1ujrXwQJ" + "fileId": "62feOqMW1D/75K5HZSLeqG" }, { "__type__": "cc.Sprite", @@ -454,7 +457,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@62e5d", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b03fe", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -474,7 +477,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "67baSVL8VMK6MX4kCj3e7y" + "fileId": "faGezH4lZDrJIOLH2rRoOt" }, { "__type__": "cc.PrefabInfo", @@ -484,21 +487,21 @@ "asset": { "__id__": 0 }, - "fileId": "b0aZXPRq5Nw7C+m0CPSBDo", + "fileId": "89qevUEwlO9on5MbM3PrK5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "lv4", + "_name": "lv3", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 21 @@ -565,7 +568,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9drQj5wNBLkrj0ccClfMFL" + "fileId": "84dbzXu+BBaYqw1ujrXwQJ" }, { "__type__": "cc.Sprite", @@ -589,6 +592,142 @@ "b": 255, "a": 255 }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@62e5d", + "__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": "67baSVL8VMK6MX4kCj3e7y" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0aZXPRq5Nw7C+m0CPSBDo", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv4", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 27 + }, + { + "__id__": 29 + } + ], + "_prefab": { + "__id__": 31 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9drQj5wNBLkrj0ccClfMFL" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, "_spriteFrame": { "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@419a0", "__expectedType__": "cc.SpriteFrame" @@ -637,14 +776,14 @@ "_active": true, "_components": [ { - "__id__": 27 + "__id__": 33 }, { - "__id__": 29 + "__id__": 35 } ], "_prefab": { - "__id__": 31 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", @@ -661,8 +800,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -681,16 +820,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", - "width": 95, - "height": 95 + "width": 80, + "height": 86 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -709,11 +848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -728,7 +867,7 @@ "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -770,18 +909,18 @@ "_active": true, "_components": [ { - "__id__": 33 + "__id__": 39 }, { - "__id__": 35 + "__id__": 41 } ], "_prefab": { - "__id__": 37 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", - "x": 8.246, + "x": 27.99, "y": -29.758, "z": 0 }, @@ -814,11 +953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 40 }, "_contentSize": { "__type__": "cc.Size", @@ -842,11 +981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 42 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -927,7 +1066,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -955,7 +1094,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 47 }, "_id": "" }, @@ -973,11 +1112,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 49 }, "clickEvents": [ { - "__id__": 44 + "__id__": 50 } ], "_interactable": true, diff --git a/assets/resources/gui/element/item_info.prefab b/assets/resources/gui/element/item_info.prefab index 045d9678..e9b17475 100644 --- a/assets/resources/gui/element/item_info.prefab +++ b/assets/resources/gui/element/item_info.prefab @@ -24,6 +24,9 @@ { "__id__": 8 }, + { + "__id__": 14 + }, { "__id__": 20 }, @@ -31,23 +34,35 @@ "__id__": 26 }, { - "__id__": 41 + "__id__": 32 }, { - "__id__": 47 + "__id__": 38 + }, + { + "__id__": 44 + }, + { + "__id__": 50 + }, + { + "__id__": 65 + }, + { + "__id__": 71 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 77 }, { - "__id__": 55 + "__id__": 79 } ], "_prefab": { - "__id__": 57 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -216,28 +231,24 @@ }, { "__type__": "cc.Node", - "_name": "item_bg", + "_name": "lv0", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 9 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 15 + "__id__": 9 }, { - "__id__": 17 + "__id__": 11 } ], "_prefab": { - "__id__": 19 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -268,142 +279,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 8 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - } - ], - "_prefab": { - "__id__": 14 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 9 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 50, - "height": 56 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "44UzU0bhVJ7pWTZfLo1UgW" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 9 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@b3f5a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "42dEM1coNBhIKOs89f/8OS" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "8e1IRM125CG58Vuf8pEptA", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.UITransform", "_name": "", @@ -414,7 +289,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 10 }, "_contentSize": { "__type__": "cc.Size", @@ -442,7 +317,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -492,14 +367,150 @@ }, { "__type__": "cc.Node", - "_name": "line_bg", + "_name": "lv1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, + "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -270, + "y": 163.185, + "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__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "78P6mI+9tC5o5t7Z500Y5c" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3b9e9", + "__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": "a8MjJ9dHJHdLykhRuEh6Md" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "acCJymEK5ODLdeeA4ckooG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, "_components": [ { "__id__": 21 @@ -513,8 +524,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -4.997, + "x": -270, + "y": 163.185, "z": 0 }, "_lrot": { @@ -552,6 +563,550 @@ "__prefab": { "__id__": 22 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51otgO9NxP7L4xVUmzSxw/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b03fe", + "__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": "28VP0tfMRDlJaiH/cgClfj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fjowsDPZF55OMXLJx+Y9H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 27 + }, + { + "__id__": 29 + } + ], + "_prefab": { + "__id__": 31 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -270, + "y": 163.185, + "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__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f82Y5MAitLeY54JnxWitKv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@62e5d", + "__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": "1bGhT8qM9L56cphzTPZL/k" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b5Q9X0O39CYqHw3I8H+tVl", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv4", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -270, + "y": 163.185, + "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__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5fIbs2SgJPCK92zCoGf/qb" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@419a0", + "__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": "d8wS3n+4hGurLqlgc+ea3Z" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "acAdPKERFHJqiP0BOuaLHM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 39 + }, + { + "__id__": 41 + } + ], + "_prefab": { + "__id__": 43 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -270, + "y": 163.18499999999995, + "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__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 56, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "44UzU0bhVJ7pWTZfLo1UgW" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@b3f5a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "42dEM1coNBhIKOs89f/8OS" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8e1IRM125CG58Vuf8pEptA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "line_bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 45 + }, + { + "__id__": 47 + } + ], + "_prefab": { + "__id__": 49 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -4.997, + "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__": 44 + }, + "_enabled": true, + "__prefab": { + "__id__": 46 + }, "_contentSize": { "__type__": "cc.Size", "width": 630, @@ -574,11 +1129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -636,23 +1191,23 @@ }, "_children": [ { - "__id__": 27 + "__id__": 51 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 57 }, { - "__id__": 35 + "__id__": 59 }, { - "__id__": 37 + "__id__": 61 } ], "_prefab": { - "__id__": 40 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -689,20 +1244,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 26 + "__id__": 50 }, "_children": [], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 52 }, { - "__id__": 30 + "__id__": 54 } ], "_prefab": { - "__id__": 32 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -739,16 +1294,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", - "width": 117.33984375, - "height": 54.4 + "width": 89.0048828125, + "height": 41.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -767,11 +1322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -786,10 +1341,10 @@ "_string": "确 定", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 30, + "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 30, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -809,7 +1364,7 @@ "a": 255 }, "_outlineWidth": 2, - "_enableShadow": true, + "_enableShadow": false, "_shadowColor": { "__type__": "cc.Color", "r": 0, @@ -848,16 +1403,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 114 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -876,11 +1431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -893,7 +1448,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6653d", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b2a40", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -921,15 +1476,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 62 }, "clickEvents": [ { - "__id__": 39 + "__id__": 63 } ], "_interactable": true, @@ -1010,14 +1565,14 @@ "_active": true, "_components": [ { - "__id__": 42 + "__id__": 66 }, { - "__id__": 44 + "__id__": 68 } ], "_prefab": { - "__id__": 46 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1054,11 +1609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -1082,11 +1637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1169,14 +1724,14 @@ "_active": true, "_components": [ { - "__id__": 48 + "__id__": 72 }, { - "__id__": 50 + "__id__": 74 } ], "_prefab": { - "__id__": 52 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1213,11 +1768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1241,11 +1796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1326,7 +1881,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -1354,7 +1909,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 80 }, "_id": "" }, diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist index 9cd67b47..afead0dc 100644 --- a/assets/resources/gui/gui.plist +++ b/assets/resources/gui/gui.plist @@ -17,9 +17,9 @@ spriteSourceSize {160,48} textureRect - {{457,847},{140,38}} + {{1597,146},{140,38}} textureRotated - + Artboard 27.png @@ -85,7 +85,7 @@ spriteSourceSize {32,34} textureRect - {{2008,1064},{32,34}} + {{1852,1170},{32,34}} textureRotated @@ -102,7 +102,7 @@ spriteSourceSize {175,170} textureRect - {{1305,94},{175,170}} + {{321,647},{175,170}} textureRotated @@ -119,7 +119,7 @@ spriteSourceSize {175,170} textureRect - {{1482,94},{175,170}} + {{594,665},{175,170}} textureRotated @@ -136,9 +136,9 @@ spriteSourceSize {175,170} textureRect - {{1659,79},{175,170}} + {{453,846},{175,170}} textureRotated - + Button01_l_Green.png @@ -153,7 +153,7 @@ spriteSourceSize {80,142} textureRect - {{1960,1},{80,142}} + {{1507,179},{80,142}} textureRotated @@ -170,7 +170,7 @@ spriteSourceSize {70,114} textureRect - {{1406,534},{70,114}} + {{929,573},{70,114}} textureRotated @@ -187,7 +187,7 @@ spriteSourceSize {70,114} textureRect - {{1007,625},{70,114}} + {{1001,573},{70,114}} textureRotated @@ -204,9 +204,9 @@ spriteSourceSize {70,114} textureRect - {{1585,777},{70,114}} + {{1365,425},{70,114}} textureRotated - + Button01_s_White_Bg.png @@ -221,7 +221,7 @@ spriteSourceSize {70,114} textureRect - {{355,1204},{70,114}} + {{1135,624},{70,114}} textureRotated @@ -238,7 +238,7 @@ spriteSourceSize {70,114} textureRect - {{355,1276},{70,114}} + {{1708,781},{70,114}} textureRotated @@ -255,7 +255,7 @@ spriteSourceSize {94,197} textureRect - {{781,420},{94,197}} + {{498,647},{94,197}} textureRotated @@ -272,7 +272,7 @@ spriteSourceSize {128,107} textureRect - {{1079,543},{128,107}} + {{479,1287},{128,107}} textureRotated @@ -289,7 +289,7 @@ spriteSourceSize {128,107} textureRect - {{327,965},{128,107}} + {{799,573},{128,107}} textureRotated @@ -306,9 +306,9 @@ spriteSourceSize {128,107} textureRect - {{355,1074},{128,107}} + {{1739,146},{128,107}} textureRotated - + Button_SkillBtn_Red.png @@ -323,7 +323,7 @@ spriteSourceSize {128,107} textureRect - {{1808,390},{128,107}} + {{1110,283},{128,107}} textureRotated @@ -340,7 +340,7 @@ spriteSourceSize {128,106} textureRect - {{1678,450},{128,106}} + {{1107,392},{128,106}} textureRotated @@ -357,9 +357,9 @@ spriteSourceSize {168,191} textureRect - {{588,420},{168,191}} + {{619,356},{168,191}} textureRotated - + CardFrame01_Bg_d_Pattern.png @@ -374,7 +374,7 @@ spriteSourceSize {84,84} textureRect - {{824,1373},{84,84}} + {{1911,1053},{84,84}} textureRotated @@ -408,9 +408,9 @@ spriteSourceSize {68,7} textureRect - {{867,322},{68,7}} + {{779,1022},{68,7}} textureRotated - + GradeIcon_Gem_Off.png @@ -425,7 +425,7 @@ spriteSourceSize {29,38} textureRect - {{457,989},{29,38}} + {{1883,1139},{29,38}} textureRotated @@ -442,7 +442,7 @@ spriteSourceSize {29,38} textureRect - {{457,1020},{29,38}} + {{1622,1276},{29,38}} textureRotated @@ -459,9 +459,9 @@ spriteSourceSize {83,88} textureRect - {{990,741},{83,88}} + {{1507,94},{83,88}} textureRotated - + Icon_Badge02.png @@ -476,7 +476,7 @@ spriteSourceSize {55,59} textureRect - {{1895,1005},{55,59}} + {{1751,1221},{55,59}} textureRotated @@ -493,7 +493,7 @@ spriteSourceSize {74,79} textureRect - {{1175,974},{74,79}} + {{1630,1070},{74,79}} textureRotated @@ -510,9 +510,9 @@ spriteSourceSize {74,79} textureRect - {{1288,1086},{74,79}} + {{1475,1136},{74,79}} textureRotated - + Icon_Castle.png @@ -527,9 +527,9 @@ spriteSourceSize {123,101} textureRect - {{1857,47},{123,101}} + {{923,819},{123,101}} textureRotated - + Icon_Check03_s.png @@ -544,7 +544,7 @@ spriteSourceSize {55,51} textureRect - {{1958,1192},{55,51}} + {{1934,1257},{55,51}} textureRotated @@ -561,7 +561,7 @@ spriteSourceSize {84,66} textureRect - {{910,1373},{84,66}} + {{1407,1140},{84,66}} textureRotated @@ -578,7 +578,7 @@ spriteSourceSize {128,128} textureRect - {{1087,1055},{104,102}} + {{1048,819},{104,102}} textureRotated @@ -595,9 +595,9 @@ spriteSourceSize {128,128} textureRect - {{1657,903},{96,104}} + {{1849,385},{96,104}} textureRotated - + Icon_GradeBadge_Challenger.Png @@ -612,7 +612,7 @@ spriteSourceSize {128,128} textureRect - {{327,847},{128,116}} + {{1589,186},{128,116}} textureRotated @@ -629,9 +629,9 @@ spriteSourceSize {128,128} textureRect - {{1938,315},{128,102}} + {{793,800},{128,102}} textureRotated - + Icon_GradeBadge_Gold.Png @@ -646,9 +646,9 @@ spriteSourceSize {128,128} textureRect - {{1808,499},{128,100}} + {{923,689},{128,100}} textureRotated - + Icon_GradeBadge_Grandmaster.Png @@ -663,7 +663,7 @@ spriteSourceSize {128,128} textureRect - {{1808,272},{128,116}} + {{793,682},{128,116}} textureRotated @@ -680,9 +680,9 @@ spriteSourceSize {128,128} textureRect - {{1938,445},{128,102}} + {{907,922},{128,102}} textureRotated - + Icon_GradeBadge_Master.Png @@ -697,9 +697,9 @@ spriteSourceSize {128,128} textureRect - {{1548,465},{128,106}} + {{987,1140},{128,106}} textureRotated - + Icon_GradeBadge_Platinum.Png @@ -714,7 +714,7 @@ spriteSourceSize {128,128} textureRect - {{1459,777},{124,100}} + {{1037,923},{124,100}} textureRotated @@ -731,7 +731,7 @@ spriteSourceSize {128,128} textureRect - {{1657,777},{124,104}} + {{1132,1269},{124,104}} textureRotated @@ -748,9 +748,9 @@ spriteSourceSize {105,93} textureRect - {{1193,1055},{105,93}} + {{726,1301},{105,93}} textureRotated - + Icon_Helmet.png @@ -765,7 +765,7 @@ spriteSourceSize {117,109} textureRect - {{471,1199},{117,109}} + {{1154,812},{117,109}} textureRotated @@ -782,7 +782,7 @@ spriteSourceSize {50,67} textureRect - {{1754,660},{50,67}} + {{1997,1053},{50,67}} textureRotated @@ -799,7 +799,7 @@ spriteSourceSize {50,65} textureRect - {{1861,1303},{50,65}} + {{1997,1122},{50,65}} textureRotated @@ -816,9 +816,9 @@ spriteSourceSize {83,86} textureRect - {{1945,833},{83,86}} + {{1247,727},{83,86}} textureRotated - + Icon_Lock03.png @@ -833,9 +833,9 @@ spriteSourceSize {71,93} textureRect - {{986,866},{71,93}} + {{833,1301},{71,93}} textureRotated - + Icon_Shield.png @@ -850,7 +850,7 @@ spriteSourceSize {75,76} textureRect - {{1280,1382},{75,76}} + {{339,1319},{75,76}} textureRotated @@ -867,9 +867,9 @@ spriteSourceSize {108,110} textureRect - {{1400,1099},{108,110}} + {{1609,408},{108,110}} textureRotated - + Icon_Sword02.png @@ -884,7 +884,7 @@ spriteSourceSize {78,77} textureRect - {{1945,921},{78,77}} + {{1706,1071},{78,77}} textureRotated @@ -901,7 +901,7 @@ spriteSourceSize {115,93} textureRect - {{355,1348},{115,93}} + {{609,1301},{115,93}} textureRotated @@ -918,7 +918,7 @@ spriteSourceSize {126,99} textureRect - {{730,819},{126,99}} + {{1240,292},{126,99}} textureRotated @@ -935,9 +935,9 @@ spriteSourceSize {167,89} textureRect - {{1195,339},{167,89}} + {{858,281},{167,89}} textureRotated - + Icon_Ticket_Silver.png @@ -952,9 +952,9 @@ spriteSourceSize {167,89} textureRect - {{588,590},{167,89}} + {{1372,148},{167,89}} textureRotated - + Icon_Timer.png @@ -969,9 +969,9 @@ spriteSourceSize {64,73} textureRect - {{978,1373},{64,73}} + {{1633,922},{64,73}} textureRotated - + Image_Badge_Skull.png @@ -986,7 +986,7 @@ spriteSourceSize {281,165} textureRect - {{606,155},{281,165}} + {{336,382},{281,165}} textureRotated @@ -1020,9 +1020,9 @@ spriteSourceSize {148,114} textureRect - {{1079,393},{148,114}} + {{858,165},{148,114}} textureRotated - + Image_Effect_Rotate.png @@ -1054,7 +1054,7 @@ spriteSourceSize {60,122} textureRect - {{1337,640},{60,122}} + {{1045,365},{60,122}} textureRotated @@ -1071,9 +1071,9 @@ spriteSourceSize {60,122} textureRect - {{599,1025},{60,122}} + {{1238,1269},{60,122}} textureRotated - + ItemFrame01_Single_OffWhite.png @@ -1088,9 +1088,9 @@ spriteSourceSize {60,122} textureRect - {{723,1032},{60,122}} + {{1073,565},{60,122}} textureRotated - + ItemFrame02_Single_Blue.png @@ -1105,7 +1105,7 @@ spriteSourceSize {60,62} textureRect - {{1655,1318},{60,62}} + {{417,1319},{60,62}} textureRotated @@ -1122,7 +1122,7 @@ spriteSourceSize {60,62} textureRect - {{1796,1378},{60,62}} + {{1808,1206},{60,62}} textureRotated @@ -1139,9 +1139,9 @@ spriteSourceSize {60,62} textureRect - {{1758,1049},{60,62}} + {{1870,1206},{60,62}} textureRotated - + ItemFrame02_Single_Red.png @@ -1156,9 +1156,9 @@ spriteSourceSize {60,62} textureRect - {{1952,1000},{60,62}} + {{1808,1270},{60,62}} textureRotated - + ItemFrame02_Single_Yellow.png @@ -1173,7 +1173,7 @@ spriteSourceSize {60,62} textureRect - {{1888,1066},{60,62}} + {{1872,1270},{60,62}} textureRotated @@ -1190,9 +1190,9 @@ spriteSourceSize {128,130} textureRect - {{337,717},{128,130}} + {{349,1055},{128,130}} textureRotated - + ItemFrame03_Single_Gray.png @@ -1207,7 +1207,7 @@ spriteSourceSize {128,130} textureRect - {{600,681},{128,130}} + {{349,1187},{128,130}} textureRotated @@ -1224,7 +1224,7 @@ spriteSourceSize {128,130} textureRect - {{1,1283},{128,130}} + {{479,1023},{128,130}} textureRotated @@ -1241,7 +1241,7 @@ spriteSourceSize {128,130} textureRect - {{131,1283},{128,130}} + {{479,1155},{128,130}} textureRotated @@ -1258,9 +1258,9 @@ spriteSourceSize {128,130} textureRect - {{1548,333},{128,130}} + {{609,1039},{128,130}} textureRotated - + ItemFrame03_Single_Yellow.png @@ -1275,7 +1275,7 @@ spriteSourceSize {128,130} textureRect - {{1678,318},{128,130}} + {{609,1169},{128,130}} textureRotated @@ -1292,7 +1292,7 @@ spriteSourceSize {128,128} textureRect - {{1290,1162},{108,108}} + {{1273,812},{108,108}} textureRotated @@ -1309,9 +1309,9 @@ spriteSourceSize {128,128} textureRect - {{599,911},{124,112}} + {{906,1270},{124,112}} textureRotated - + ItemIcon_Bag_Brown.Png @@ -1326,7 +1326,7 @@ spriteSourceSize {128,128} textureRect - {{1310,980},{110,104}} + {{1835,725},{110,104}} textureRotated @@ -1343,7 +1343,7 @@ spriteSourceSize {128,128} textureRect - {{1422,993},{110,104}} + {{1708,965},{110,104}} textureRotated @@ -1360,7 +1360,7 @@ spriteSourceSize {128,128} textureRect - {{1678,558},{128,100}} + {{1719,255},{128,100}} textureRotated @@ -1377,9 +1377,9 @@ spriteSourceSize {128,128} textureRect - {{1638,675},{100,114}} + {{1008,165},{100,114}} textureRotated - + ItemIcon_Book_1_Wine.Png @@ -1394,9 +1394,9 @@ spriteSourceSize {128,128} textureRect - {{497,967},{100,114}} + {{1603,520},{100,114}} textureRotated - + ItemIcon_Calendar.Png @@ -1411,7 +1411,7 @@ spriteSourceSize {128,128} textureRect - {{948,1155},{100,110}} + {{1163,923},{100,110}} textureRotated @@ -1428,7 +1428,7 @@ spriteSourceSize {128,128} textureRect - {{1624,1111},{100,110}} + {{1275,922},{100,110}} textureRotated @@ -1445,92 +1445,7 @@ spriteSourceSize {128,128} textureRect - {{590,1315},{114,106}} - textureRotated - - - ItemIcon_Chest_Gold.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {-1,1} - spriteSize - {120,98} - spriteSourceSize - {128,128} - textureRect - {{847,1055},{120,98}} - textureRotated - - - ItemIcon_Chest_Premium.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,1} - spriteSize - {124,100} - spriteSourceSize - {128,128} - textureRect - {{497,841},{124,100}} - textureRotated - - - ItemIcon_Chest_Wood.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {122,98} - spriteSourceSize - {128,128} - textureRect - {{1836,172},{122,98}} - textureRotated - - - ItemIcon_Clover_Gold.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {114,116} - spriteSourceSize - {128,128} - textureRect - {{590,1197},{114,116}} - textureRotated - - - ItemIcon_Clover_Green.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {114,116} - spriteSourceSize - {128,128} - textureRect - {{826,1257},{114,116}} + {{1839,609},{114,106}} textureRotated @@ -1547,7 +1462,7 @@ spriteSourceSize {128,128} textureRect - {{757,619},{118,100}} + {{1719,565},{118,100}} textureRotated @@ -1564,7 +1479,7 @@ spriteSourceSize {128,128} textureRect - {{584,1087},{120,108}} + {{1481,510},{120,108}} textureRotated @@ -1581,9 +1496,9 @@ spriteSourceSize {128,128} textureRect - {{1938,575},{128,102}} + {{1589,304},{128,102}} textureRotated - + ItemIcon_Gear.Png @@ -1598,9 +1513,9 @@ spriteSourceSize {128,128} textureRect - {{725,920},{110,124}} + {{1020,1270},{110,124}} textureRotated - + ItemIcon_Gear_Armor_Bottom.Png @@ -1615,7 +1530,7 @@ spriteSourceSize {128,128} textureRect - {{464,1083},{118,114}} + {{1127,696},{118,114}} textureRotated @@ -1632,9 +1547,9 @@ spriteSourceSize {128,128} textureRect - {{851,939},{122,114}} + {{1135,500},{122,114}} textureRotated - + ItemIcon_Gear_Hat_Witch.Png @@ -1649,7 +1564,7 @@ spriteSourceSize {128,128} textureRect - {{1808,601},{128,112}} + {{852,1026},{128,112}} textureRotated @@ -1666,7 +1581,7 @@ spriteSourceSize {128,128} textureRect - {{1392,1272},{108,106}} + {{1373,617},{108,106}} textureRotated @@ -1683,7 +1598,7 @@ spriteSourceSize {128,128} textureRect - {{1534,994},{110,110}} + {{1708,853},{110,110}} textureRotated @@ -1700,9 +1615,9 @@ spriteSourceSize {128,128} textureRect - {{969,1055},{116,98}} + {{1847,491},{116,98}} textureRotated - + ItemIcon_Gem_Ellipse_Red.Png @@ -1717,58 +1632,7 @@ spriteSourceSize {128,128} textureRect - {{261,1318},{92,112}} - textureRotated - - - ItemIcon_Gift_Blue.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {-1,1} - spriteSize - {110,108} - spriteSourceSize - {128,128} - textureRect - {{1178,1162},{110,108}} - textureRotated - - - ItemIcon_Gift_Green.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {-1,1} - spriteSize - {110,108} - spriteSourceSize - {128,128} - textureRect - {{1646,1001},{110,108}} - textureRotated - - - ItemIcon_Gift_Red.Png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {-1,1} - spriteSize - {110,108} - spriteSourceSize - {128,128} - textureRect - {{1280,1272},{110,108}} + {{982,1026},{92,112}} textureRotated @@ -1785,7 +1649,7 @@ spriteSourceSize {128,128} textureRect - {{944,1257},{114,98}} + {{1312,1024},{114,98}} textureRotated @@ -1802,9 +1666,9 @@ spriteSourceSize {128,128} textureRect - {{472,1310},{114,116}} + {{1291,1140},{114,116}} textureRotated - + ItemIcon_Mail.Png @@ -1819,9 +1683,9 @@ spriteSourceSize {128,128} textureRect - {{828,1155},{118,100}} + {{1947,647},{118,100}} textureRotated - + ItemIcon_Map.Png @@ -1836,7 +1700,7 @@ spriteSourceSize {128,128} textureRect - {{706,1318},{116,108}} + {{1481,620},{116,108}} textureRotated @@ -1853,9 +1717,9 @@ spriteSourceSize {128,128} textureRect - {{468,583},{122,118}} + {{1251,497},{122,118}} textureRotated - + ItemIcon_Medal_Bronze_1.png @@ -1870,9 +1734,9 @@ spriteSourceSize {128,128} textureRect - {{858,837},{100,126}} + {{1947,135},{100,126}} textureRotated - + ItemIcon_Medal_Bronze_2.png @@ -1887,9 +1751,9 @@ spriteSourceSize {128,128} textureRect - {{1545,573},{100,126}} + {{1947,263},{100,126}} textureRotated - + ItemIcon_Medal_Gold_1.png @@ -1904,9 +1768,9 @@ spriteSourceSize {128,128} textureRect - {{1510,675},{100,126}} + {{1947,391},{100,126}} textureRotated - + ItemIcon_Medal_Gold_2.png @@ -1921,7 +1785,7 @@ spriteSourceSize {128,128} textureRect - {{1075,754},{100,126}} + {{1481,408},{100,126}} textureRotated @@ -1938,7 +1802,7 @@ spriteSourceSize {128,128} textureRect - {{1203,758},{100,126}} + {{1719,463},{100,126}} textureRotated @@ -1955,9 +1819,9 @@ spriteSourceSize {128,128} textureRect - {{1331,764},{100,126}} + {{1947,519},{100,126}} textureRotated - + ItemIcon_Medalstand.Png @@ -1972,7 +1836,7 @@ spriteSourceSize {128,128} textureRect - {{1276,534},{128,104}} + {{1719,357},{128,104}} textureRotated @@ -1989,7 +1853,7 @@ spriteSourceSize {128,128} textureRect - {{975,939},{102,114}} + {{1526,1018},{102,114}} textureRotated @@ -2006,7 +1870,7 @@ spriteSourceSize {128,128} textureRect - {{706,1094},{108,120}} + {{1251,617},{108,120}} textureRotated @@ -2023,9 +1887,9 @@ spriteSourceSize {128,128} textureRect - {{877,625},{128,112}} + {{873,1140},{128,112}} textureRotated - + ItemIcon_Shop.Png @@ -2040,7 +1904,7 @@ spriteSourceSize {128,128} textureRect - {{1081,856},{116,106}} + {{1599,622},{116,106}} textureRotated @@ -2057,9 +1921,9 @@ spriteSourceSize {128,128} textureRect - {{1938,705},{126,102}} + {{1237,393},{126,102}} textureRotated - + ItemIcon_Star_Blue.Png @@ -2074,7 +1938,7 @@ spriteSourceSize {128,128} textureRect - {{1199,860},{116,112}} + {{1076,1025},{116,112}} textureRotated @@ -2091,7 +1955,7 @@ spriteSourceSize {128,128} textureRect - {{1317,866},{116,112}} + {{1194,1025},{116,112}} textureRotated @@ -2108,7 +1972,7 @@ spriteSourceSize {128,128} textureRect - {{1435,879},{116,112}} + {{1717,667},{116,112}} textureRotated @@ -2125,9 +1989,9 @@ spriteSourceSize {128,128} textureRect - {{1060,1159},{116,112}} + {{1412,1018},{116,112}} textureRotated - + ItemIcon_Star_Red.Png @@ -2142,7 +2006,7 @@ spriteSourceSize {128,128} textureRect - {{1044,1273},{116,112}} + {{1499,730},{116,112}} textureRotated @@ -2159,7 +2023,7 @@ spriteSourceSize {128,128} textureRect - {{1162,1273},{116,112}} + {{1489,844},{116,112}} textureRotated @@ -2176,9 +2040,9 @@ spriteSourceSize {128,128} textureRect - {{706,1204},{112,118}} + {{1300,1258},{112,118}} textureRotated - + ItemIcon_Ticket_Gold.Png @@ -2193,9 +2057,9 @@ spriteSourceSize {128,128} textureRect - {{1079,652},{128,100}} + {{1025,689},{128,100}} textureRotated - + ItemIcon_Ticket_Red.Png @@ -2210,7 +2074,7 @@ spriteSourceSize {128,128} textureRect - {{1209,640},{126,116}} + {{779,904},{126,116}} textureRotated @@ -2227,9 +2091,9 @@ spriteSourceSize {128,128} textureRect - {{730,721},{128,96}} + {{1095,1139},{128,96}} textureRotated - + ItemIcon_Trophy_Gold.Png @@ -2244,9 +2108,9 @@ spriteSourceSize {128,128} textureRect - {{860,739},{128,96}} + {{1193,1139},{128,96}} textureRotated - + ItemIcon_Trophy_Silver.Png @@ -2261,9 +2125,9 @@ spriteSourceSize {128,128} textureRect - {{600,813},{128,96}} + {{1849,255},{128,96}} textureRotated - + ItemIcon_Video.Png @@ -2278,9 +2142,9 @@ spriteSourceSize {128,128} textureRect - {{1512,1106},{104,110}} + {{1375,497},{104,110}} textureRotated - + Label_Badge01_Green.png @@ -2295,7 +2159,7 @@ spriteSourceSize {129,132} textureRect - {{337,583},{129,132}} + {{1903,1},{129,132}} textureRotated @@ -2312,7 +2176,7 @@ spriteSourceSize {129,132} textureRect - {{1286,342},{129,132}} + {{847,372},{129,132}} textureRotated @@ -2329,7 +2193,7 @@ spriteSourceSize {129,132} textureRect - {{1417,342},{129,132}} + {{1110,149},{129,132}} textureRotated @@ -2346,7 +2210,7 @@ spriteSourceSize {129,132} textureRect - {{469,707},{129,132}} + {{1241,148},{129,132}} textureRotated @@ -2363,9 +2227,9 @@ spriteSourceSize {99,102} textureRect - {{1553,893},{99,102}} + {{1947,767},{99,102}} textureRotated - + ListFrame00_03~04_Bg.png @@ -2380,7 +2244,7 @@ spriteSourceSize {80,80} textureRect - {{1854,806},{80,80}} + {{1417,730},{80,80}} textureRotated @@ -2397,7 +2261,7 @@ spriteSourceSize {80,83} textureRect - {{1960,145},{80,83}} + {{1507,323},{80,83}} textureRotated @@ -2414,7 +2278,7 @@ spriteSourceSize {80,83} textureRect - {{1960,230},{80,83}} + {{1335,727},{80,83}} textureRotated @@ -2431,7 +2295,7 @@ spriteSourceSize {35,32} textureRect - {{1466,1209},{35,32}} + {{1786,1071},{35,32}} textureRotated @@ -2448,7 +2312,7 @@ spriteSourceSize {71,70} textureRect - {{1044,1387},{71,70}} + {{1414,1299},{71,70}} textureRotated @@ -2465,9 +2329,9 @@ spriteSourceSize {63,67} textureRect - {{1796,1309},{63,67}} + {{1056,500},{63,67}} textureRotated - + MenuIcon_Hat.png @@ -2482,7 +2346,7 @@ spriteSourceSize {73,58} textureRect - {{1580,1322},{73,58}} + {{1558,958},{73,58}} textureRotated @@ -2499,7 +2363,7 @@ spriteSourceSize {66,70} textureRect - {{1117,1387},{66,70}} + {{1487,1217},{66,70}} textureRotated @@ -2516,7 +2380,7 @@ spriteSourceSize {65,70} textureRect - {{1185,1387},{65,70}} + {{1487,1289},{65,70}} textureRotated @@ -2533,7 +2397,7 @@ spriteSourceSize {65,69} textureRect - {{1661,1382},{65,69}} + {{1555,1208},{65,69}} textureRotated @@ -2550,9 +2414,9 @@ spriteSourceSize {42,43} textureRect - {{194,1415},{42,43}} + {{1972,1314},{42,43}} textureRotated - + ResourceBar_Single_Btn_Blue1.png @@ -2567,9 +2431,9 @@ spriteSourceSize {60,62} textureRect - {{1889,1130},{60,62}} + {{1624,1334},{60,62}} textureRotated - + ResourceBar_Single_Btn_Blue2.png @@ -2584,7 +2448,7 @@ spriteSourceSize {33,34} textureRect - {{1763,771},{33,34}} + {{13,1343},{33,34}} textureRotated @@ -2601,9 +2465,9 @@ spriteSourceSize {60,62} textureRect - {{1896,1194},{60,62}} + {{1688,1334},{60,62}} textureRotated - + ResourceBar_Single_Btn_Purple2.png @@ -2618,7 +2482,7 @@ spriteSourceSize {33,34} textureRect - {{1858,1424},{33,34}} + {{2013,1359},{33,34}} textureRotated @@ -2635,7 +2499,7 @@ spriteSourceSize {60,62} textureRect - {{1913,1296},{60,62}} + {{1752,1332},{60,62}} textureRotated @@ -2652,9 +2516,9 @@ spriteSourceSize {33,34} textureRect - {{1894,1424},{33,34}} + {{1886,1170},{33,34}} textureRotated - + ResourceBar_Single_Icon_Coin.png @@ -2669,9 +2533,9 @@ spriteSourceSize {67,75} textureRect - {{1358,1382},{67,75}} + {{979,504},{67,75}} textureRotated - + ResourceBar_Single_Icon_Energy.png @@ -2686,9 +2550,9 @@ spriteSourceSize {57,79} textureRect - {{1251,974},{57,79}} + {{1630,1151},{57,79}} textureRotated - + ResourceBar_Single_Icon_Gem.png @@ -2703,7 +2567,7 @@ spriteSourceSize {77,69} textureRect - {{1717,1309},{77,69}} + {{1711,1150},{77,69}} textureRotated @@ -2720,9 +2584,9 @@ spriteSourceSize {60,62} textureRect - {{1913,1360},{60,62}} + {{1872,1334},{60,62}} textureRotated - + ResourceBar_White_Icon1.png @@ -2737,7 +2601,7 @@ spriteSourceSize {28,28} textureRect - {{2012,1138},{28,28}} + {{873,1270},{28,28}} textureRotated @@ -2754,9 +2618,9 @@ spriteSourceSize {39,40} textureRect - {{1478,608},{39,40}} + {{1869,214},{39,40}} textureRotated - + RoleIcon_Boots.png @@ -2771,7 +2635,7 @@ spriteSourceSize {35,39} textureRect - {{1975,1408},{35,39}} + {{1972,1359},{35,39}} textureRotated @@ -2788,7 +2652,7 @@ spriteSourceSize {33,36} textureRect - {{1033,831},{33,36}} + {{1530,1361},{33,36}} textureRotated @@ -2805,9 +2669,9 @@ spriteSourceSize {39,34} textureRect - {{652,1423},{39,34}} + {{1911,214},{39,34}} textureRotated - + RoleIcon_Heart.png @@ -2822,9 +2686,9 @@ spriteSourceSize {37,35} textureRect - {{1996,1249},{37,35}} + {{1662,1277},{37,35}} textureRotated - + RoleIcon_Helmet.png @@ -2839,7 +2703,7 @@ spriteSourceSize {30,39} textureRect - {{1930,1424},{30,39}} + {{1988,1228},{30,39}} textureRotated @@ -2856,7 +2720,7 @@ spriteSourceSize {29,40} textureRect - {{1369,1086},{29,40}} + {{1786,1108},{29,40}} textureRotated @@ -2873,7 +2737,7 @@ spriteSourceSize {33,41} textureRect - {{990,831},{33,41}} + {{1487,1361},{33,41}} textureRotated @@ -2890,9 +2754,9 @@ spriteSourceSize {37,40} textureRect - {{1754,729},{37,40}} + {{1997,1189},{37,40}} textureRotated - + RoleIcon_Shield.png @@ -2907,9 +2771,9 @@ spriteSourceSize {36,40} textureRect - {{1954,1258},{36,40}} + {{2011,929},{36,40}} textureRotated - + RoleIcon_Sword.png @@ -2924,9 +2788,9 @@ spriteSourceSize {36,39} textureRect - {{1861,1370},{36,39}} + {{1987,1260},{36,39}} textureRotated - + Rounded Rectangle 1029 copy 10.png @@ -2941,7 +2805,7 @@ spriteSourceSize {361,44} textureRect - {{1597,1},{361,44}} + {{878,103},{361,44}} textureRotated @@ -2958,7 +2822,7 @@ spriteSourceSize {108,234} textureRect - {{1195,103},{108,234}} + {{343,819},{108,234}} textureRotated @@ -2975,9 +2839,9 @@ spriteSourceSize {36,56} textureRect - {{1896,1258},{36,56}} + {{2011,871},{36,56}} textureRotated - + SkillIcon02_3.png @@ -2992,9 +2856,9 @@ spriteSourceSize {82,81} textureRect - {{271,1235},{82,81}} + {{1027,281},{82,81}} textureRotated - + Slider_Level02_Icon_Up_Green.png @@ -3009,7 +2873,7 @@ spriteSourceSize {54,64} textureRect - {{1763,993},{54,64}} + {{1685,1221},{54,64}} textureRotated @@ -3026,7 +2890,7 @@ spriteSourceSize {54,64} textureRect - {{1829,1005},{54,64}} + {{1817,1114},{54,64}} textureRotated @@ -3043,7 +2907,7 @@ spriteSourceSize {89,89} textureRect - {{1763,902},{89,89}} + {{1920,871},{89,89}} textureRotated @@ -3060,7 +2924,7 @@ spriteSourceSize {89,89} textureRect - {{1854,888},{89,89}} + {{1911,962},{89,89}} textureRotated @@ -3077,7 +2941,7 @@ spriteSourceSize {54,54} textureRect - {{1975,1296},{54,54}} + {{1568,1340},{54,54}} textureRotated @@ -3094,7 +2958,7 @@ spriteSourceSize {54,54} textureRect - {{1975,1352},{54,54}} + {{1932,1201},{54,54}} textureRotated @@ -3111,9 +2975,9 @@ spriteSourceSize {304,143} textureRect - {{889,103},{304,143}} + {{49,1090},{304,143}} textureRotated - + Title_Ribbon01_Sky.png @@ -3128,9 +2992,9 @@ spriteSourceSize {304,143} textureRect - {{889,248},{304,143}} + {{194,1090},{304,143}} textureRotated - + Title_Ribbon01_Yellow.png @@ -3145,7 +3009,7 @@ spriteSourceSize {304,143} textureRect - {{49,1090},{304,143}} + {{1597,1},{304,143}} textureRotated @@ -3162,7 +3026,7 @@ spriteSourceSize {58,78} textureRect - {{1500,1322},{58,78}} + {{1478,958},{58,78}} textureRotated @@ -3179,9 +3043,9 @@ spriteSourceSize {4,32} textureRect - {{1,1453},{4,32}} + {{321,585},{4,32}} textureRotated - + UI-02.png @@ -3196,9 +3060,9 @@ spriteSourceSize {105,10} textureRect - {{1606,1306},{105,10}} + {{1,1281},{105,10}} textureRotated - + UI-03.png @@ -3213,7 +3077,7 @@ spriteSourceSize {111,16} textureRect - {{472,1426},{111,16}} + {{1300,1378},{111,16}} textureRotated @@ -3230,9 +3094,9 @@ spriteSourceSize {190,56} textureRect - {{1286,476},{190,56}} + {{789,356},{190,56}} textureRotated - + bg1.png @@ -3264,7 +3128,7 @@ spriteSourceSize {259,96} textureRect - {{606,322},{259,96}} + {{336,549},{259,96}} textureRotated @@ -3281,7 +3145,7 @@ spriteSourceSize {71,71} textureRect - {{1588,1382},{71,71}} + {{1414,1226},{71,71}} textureRotated @@ -3298,7 +3162,7 @@ spriteSourceSize {200,114} textureRect - {{877,393},{200,114}} + {{597,549},{200,114}} textureRotated @@ -3315,9 +3179,9 @@ spriteSourceSize {200,114} textureRect - {{877,509},{200,114}} + {{625,837},{200,114}} textureRotated - + character_grade_label_blue.png @@ -3332,9 +3196,9 @@ spriteSourceSize {34,60} textureRect - {{590,1423},{34,60}} + {{13,1281},{34,60}} textureRotated - + character_grade_label_green.png @@ -3349,7 +3213,7 @@ spriteSourceSize {34,60} textureRect - {{1902,715},{34,60}} + {{2002,971},{34,60}} textureRotated @@ -3366,7 +3230,7 @@ spriteSourceSize {34,60} textureRect - {{1822,1061},{34,60}} + {{1790,1170},{34,60}} textureRotated @@ -3383,9 +3247,9 @@ spriteSourceSize {34,60} textureRect - {{1827,1162},{34,60}} + {{1936,1314},{34,60}} textureRotated - + character_list_frame_blue.png @@ -3400,9 +3264,9 @@ spriteSourceSize {65,130} textureRect - {{1528,266},{65,130}} + {{739,1169},{65,130}} textureRotated - + character_list_frame_dim.png @@ -3417,9 +3281,9 @@ spriteSourceSize {65,130} textureRect - {{1660,251},{65,130}} + {{806,1169},{65,130}} textureRotated - + character_list_frame_green.png @@ -3434,7 +3298,7 @@ spriteSourceSize {65,130} textureRect - {{1209,508},{65,130}} + {{978,372},{65,130}} textureRotated @@ -3451,9 +3315,9 @@ spriteSourceSize {65,130} textureRect - {{1478,476},{65,130}} + {{847,506},{65,130}} textureRotated - + character_lv_bar_bg.png @@ -3468,9 +3332,9 @@ spriteSourceSize {24,72} textureRect - {{1854,979},{24,72}} + {{1461,319},{24,72}} textureRotated - + character_select_frame.png @@ -3485,9 +3349,9 @@ spriteSourceSize {64,221} textureRect - {{1305,266},{64,221}} + {{277,862},{64,221}} textureRotated - + common_tab_bg.png @@ -3502,9 +3366,9 @@ spriteSourceSize {28,36} textureRect - {{2012,1100},{28,36}} + {{1701,1277},{28,36}} textureRotated - + common_tab_focus.png @@ -3519,7 +3383,7 @@ spriteSourceSize {21,14} textureRect - {{132,1443},{21,14}} + {{453,1023},{21,14}} textureRotated @@ -3536,7 +3400,7 @@ spriteSourceSize {112,109} textureRect - {{1399,650},{112,109}} + {{741,1055},{112,109}} textureRotated @@ -3553,9 +3417,9 @@ spriteSourceSize {89,94} textureRect - {{1079,964},{89,94}} + {{1387,922},{89,94}} textureRotated - + equipment_frame_brown.png @@ -3570,7 +3434,7 @@ spriteSourceSize {89,94} textureRect - {{1736,1111},{89,94}} + {{1617,730},{89,94}} textureRotated @@ -3587,7 +3451,7 @@ spriteSourceSize {89,94} textureRect - {{1714,1213},{89,94}} + {{1617,826},{89,94}} textureRotated @@ -3604,9 +3468,9 @@ spriteSourceSize {89,94} textureRect - {{1805,1207},{89,94}} + {{1824,831},{89,94}} textureRotated - + equipment_frame_red.png @@ -3621,9 +3485,9 @@ spriteSourceSize {89,94} textureRect - {{1806,715},{89,94}} + {{1820,922},{89,94}} textureRotated - + equipment_frame_yellow.png @@ -3638,7 +3502,7 @@ spriteSourceSize {89,94} textureRect - {{1763,806},{89,94}} + {{1820,1018},{89,94}} textureRotated @@ -3655,7 +3519,7 @@ spriteSourceSize {166,20} textureRect - {{305,862},{166,20}} + {{771,665},{166,20}} textureRotated @@ -3672,7 +3536,7 @@ spriteSourceSize {212,26} textureRect - {{277,862},{212,26}} + {{741,837},{212,26}} textureRotated @@ -3689,7 +3553,7 @@ spriteSourceSize {250,199} textureRect - {{336,382},{250,199}} + {{606,155},{250,199}} textureRotated @@ -3723,9 +3587,9 @@ spriteSourceSize {106,91} textureRect - {{1606,1213},{106,91}} + {{1368,317},{106,91}} textureRotated - + pause_btn_icon_exit.png @@ -3740,9 +3604,9 @@ spriteSourceSize {80,72} textureRect - {{1427,1382},{80,72}} + {{1633,988},{80,72}} textureRotated - + play_character_hp_bar_front.png @@ -3757,7 +3621,7 @@ spriteSourceSize {20,26} textureRect - {{305,1030},{20,26}} + {{321,819},{20,26}} textureRotated @@ -3774,7 +3638,7 @@ spriteSourceSize {13,20} textureRect - {{1597,79},{13,20}} + {{321,847},{13,20}} textureRotated @@ -3791,7 +3655,7 @@ spriteSourceSize {129,8} textureRect - {{1,1443},{129,8}} + {{1241,282},{129,8}} textureRotated @@ -3808,9 +3672,9 @@ spriteSourceSize {191,26} textureRect - {{1,1415},{191,26}} + {{1463,126},{191,26}} textureRotated - + redbg.png @@ -3825,9 +3689,9 @@ spriteSourceSize {216,8} textureRect - {{1305,332},{216,8}} + {{769,837},{216,8}} textureRotated - + redbg1.png @@ -3842,7 +3706,7 @@ spriteSourceSize {258,30} textureRect - {{1597,47},{258,30}} + {{1245,94},{258,30}} textureRotated @@ -3859,7 +3723,7 @@ spriteSourceSize {32,12} textureRect - {{1195,508},{32,12}} + {{779,833},{32,12}} textureRotated @@ -3876,7 +3740,7 @@ spriteSourceSize {128,128} textureRect - {{1500,1212},{104,108}} + {{1383,812},{104,108}} textureRotated @@ -3893,7 +3757,7 @@ spriteSourceSize {220,20} textureRect - {{49,1235},{220,20}} + {{1241,126},{220,20}} textureRotated @@ -3910,9 +3774,9 @@ spriteSourceSize {219,8} textureRect - {{49,1273},{219,8}} + {{339,1085},{219,8}} textureRotated - + slider_fill_yellow.png @@ -3927,7 +3791,7 @@ spriteSourceSize {220,14} textureRect - {{49,1257},{220,14}} + {{878,149},{220,14}} textureRotated @@ -3944,9 +3808,9 @@ spriteSourceSize {4,12} textureRect - {{1317,860},{4,12}} + {{343,1055},{4,12}} textureRotated - + tb.png @@ -3961,7 +3825,7 @@ spriteSourceSize {56,62} textureRect - {{1950,1066},{56,62}} + {{1814,1332},{56,62}} textureRotated @@ -3978,9 +3842,9 @@ spriteSourceSize {63,59} textureRect - {{1827,1097},{63,59}} + {{1555,1279},{63,59}} textureRotated - + userinfo_icon_boss.png @@ -3995,9 +3859,9 @@ spriteSourceSize {66,76} textureRect - {{1728,1380},{66,76}} + {{1869,146},{66,76}} textureRotated - + userinfo_icon_crown.png @@ -4012,7 +3876,7 @@ spriteSourceSize {59,60} textureRect - {{1951,1130},{59,60}} + {{1936,1139},{59,60}} textureRotated @@ -4029,9 +3893,9 @@ spriteSourceSize {61,64} textureRect - {{1400,1209},{61,64}} + {{1622,1210},{61,64}} textureRotated - + userinfo_icon_vs.png @@ -4046,7 +3910,7 @@ spriteSourceSize {72,77} textureRect - {{1509,1382},{72,77}} + {{1551,1134},{72,77}} textureRotated @@ -4063,9 +3927,9 @@ spriteSourceSize {35,14} textureRect - {{321,803},{35,14}} + {{453,819},{35,14}} textureRotated - + ybg.png @@ -4080,7 +3944,7 @@ spriteSourceSize {216,14} textureRect - {{321,585},{216,14}} + {{1491,126},{216,14}} textureRotated @@ -4096,9 +3960,9 @@ realTextureFileName gui.png size - {2041,1458} + {2048,1395} smartupdate - $TexturePacker:SmartUpdate:da7b498f4fb8443f7e8aa39e2b9e46de:f7bf40cd8cf244259e77a398a5defc0d:5f86533554b8a62fd9d2a17dd9533d7c$ + $TexturePacker:SmartUpdate:78cb9e8f6900a226d1caf10023bca381:9a41a61cb7b08e252dac83581f44b5ec:5f86533554b8a62fd9d2a17dd9533d7c$ textureFileName gui.png diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index 5a67b30b..d1bcf985 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -16,11 +16,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 706, - "trimY": 1204, + "trimX": 1300, + "trimY": 1258, "width": 112, "height": 118, "rawWidth": 128, @@ -62,11 +62,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1545, - "trimY": 573, + "trimX": 1947, + "trimY": 263, "width": 100, "height": 126, "rawWidth": 128, @@ -108,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1288, - "trimY": 1086, + "trimX": 1475, + "trimY": 1136, "width": 74, "height": 79, "rawWidth": 74, @@ -145,52 +145,6 @@ ], "subMetas": {} }, - "30941": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@30941", - "displayName": "", - "id": "30941", - "name": "ItemIcon_Chest_Premium", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 1, - "trimX": 497, - "trimY": 841, - "width": 124, - "height": 100, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "34410": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34410", @@ -200,11 +154,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 599, - "trimY": 1025, + "trimX": 1238, + "trimY": 1269, "width": 60, "height": 122, "rawWidth": 60, @@ -249,8 +203,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1075, - "trimY": 754, + "trimX": 1481, + "trimY": 408, "width": 100, "height": 126, "rawWidth": 128, @@ -295,8 +249,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1822, - "trimY": 1061, + "trimX": 1790, + "trimY": 1170, "width": 34, "height": 60, "rawWidth": 34, @@ -341,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1199, - "trimY": 860, + "trimX": 1076, + "trimY": 1025, "width": 116, "height": 112, "rawWidth": 128, @@ -387,8 +341,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1754, - "trimY": 660, + "trimX": 1997, + "trimY": 1053, "width": 50, "height": 67, "rawWidth": 50, @@ -430,11 +384,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1512, - "trimY": 1106, + "trimX": 1375, + "trimY": 497, "width": 104, "height": 110, "rawWidth": 128, @@ -476,11 +430,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1660, - "trimY": 251, + "trimX": 806, + "trimY": 1169, "width": 65, "height": 130, "rawWidth": 65, @@ -522,11 +476,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1938, - "trimY": 315, + "trimX": 793, + "trimY": 800, "width": 128, "height": 102, "rawWidth": 128, @@ -571,8 +525,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1888, - "trimY": 1066, + "trimX": 1872, + "trimY": 1270, "width": 60, "height": 62, "rawWidth": 60, @@ -617,8 +571,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1714, - "trimY": 1213, + "trimX": 1617, + "trimY": 826, "width": 89, "height": 94, "rawWidth": 89, @@ -651,52 +605,6 @@ ], "subMetas": {} }, - "69706": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69706", - "displayName": "", - "id": "69706", - "name": "ItemIcon_Gift_Green", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 1646, - "trimY": 1001, - "width": 110, - "height": 108, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "69993": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993", @@ -706,11 +614,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1861, - "trimY": 1370, + "trimX": 1987, + "trimY": 1260, "width": 36, "height": 39, "rawWidth": 36, @@ -755,8 +663,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1597, - "trimY": 47, + "trimX": 1245, + "trimY": 94, "width": 258, "height": 30, "rawWidth": 258, @@ -801,8 +709,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1895, - "trimY": 1005, + "trimX": 1751, + "trimY": 1221, "width": 55, "height": 59, "rawWidth": 55, @@ -847,8 +755,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 902, + "trimX": 1920, + "trimY": 871, "width": 89, "height": 89, "rawWidth": 89, @@ -881,52 +789,6 @@ ], "subMetas": {} }, - "87538": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@87538", - "displayName": "", - "id": "87538", - "name": "ItemIcon_Clover_Green", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 826, - "trimY": 1257, - "width": 114, - "height": 116, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "97766": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@97766", @@ -936,11 +798,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1400, - "trimY": 1209, + "trimX": 1622, + "trimY": 1210, "width": 61, "height": 64, "rawWidth": 61, @@ -982,11 +844,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 858, - "trimY": 837, + "trimX": 1947, + "trimY": 135, "width": 100, "height": 126, "rawWidth": 128, @@ -1028,11 +890,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 457, - "trimY": 847, + "trimX": 1597, + "trimY": 146, "width": 140, "height": 38, "rawWidth": 160, @@ -1215,8 +1077,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2008, - "trimY": 1064, + "trimX": 1852, + "trimY": 1170, "width": 32, "height": 34, "rawWidth": 32, @@ -1261,8 +1123,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1305, - "trimY": 94, + "trimX": 321, + "trimY": 647, "width": 175, "height": 170, "rawWidth": 175, @@ -1307,8 +1169,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1482, - "trimY": 94, + "trimX": 594, + "trimY": 665, "width": 175, "height": 170, "rawWidth": 175, @@ -1350,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1659, - "trimY": 79, + "trimX": 453, + "trimY": 846, "width": 175, "height": 170, "rawWidth": 175, @@ -1399,16 +1261,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1960, - "trimY": 1, + "trimX": 1507, + "trimY": 179, "width": 80, "height": 142, "rawWidth": 80, "rawHeight": 142, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 78, + "borderBottom": 59, + "borderLeft": 37, + "borderRight": 38, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1445,8 +1307,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1406, - "trimY": 534, + "trimX": 929, + "trimY": 573, "width": 70, "height": 114, "rawWidth": 70, @@ -1491,8 +1353,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1007, - "trimY": 625, + "trimX": 1001, + "trimY": 573, "width": 70, "height": 114, "rawWidth": 70, @@ -1534,11 +1396,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1585, - "trimY": 777, + "trimX": 1365, + "trimY": 425, "width": 70, "height": 114, "rawWidth": 70, @@ -1583,8 +1445,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 355, - "trimY": 1204, + "trimX": 1135, + "trimY": 624, "width": 70, "height": 114, "rawWidth": 70, @@ -1629,16 +1491,16 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 355, - "trimY": 1276, + "trimX": 1708, + "trimY": 781, "width": 70, "height": 114, "rawWidth": 70, "rawHeight": 114, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 33, + "borderRight": 32, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1675,16 +1537,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 781, - "trimY": 420, + "trimX": 498, + "trimY": 647, "width": 94, "height": 197, "rawWidth": 94, "rawHeight": 197, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 48, + "borderRight": 42, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1721,8 +1583,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 543, + "trimX": 479, + "trimY": 1287, "width": 128, "height": 107, "rawWidth": 128, @@ -1767,8 +1629,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 327, - "trimY": 965, + "trimX": 799, + "trimY": 573, "width": 128, "height": 107, "rawWidth": 128, @@ -1810,11 +1672,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 355, - "trimY": 1074, + "trimX": 1739, + "trimY": 146, "width": 128, "height": 107, "rawWidth": 128, @@ -1859,8 +1721,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1808, - "trimY": 390, + "trimX": 1110, + "trimY": 283, "width": 128, "height": 107, "rawWidth": 128, @@ -1905,8 +1767,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1678, - "trimY": 450, + "trimX": 1107, + "trimY": 392, "width": 128, "height": 106, "rawWidth": 128, @@ -1948,11 +1810,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 588, - "trimY": 420, + "trimX": 619, + "trimY": 356, "width": 168, "height": 191, "rawWidth": 168, @@ -1997,8 +1859,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 824, - "trimY": 1373, + "trimX": 1911, + "trimY": 1053, "width": 84, "height": 84, "rawWidth": 84, @@ -2086,11 +1948,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 867, - "trimY": 322, + "trimX": 779, + "trimY": 1022, "width": 68, "height": 7, "rawWidth": 68, @@ -2135,8 +1997,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 457, - "trimY": 989, + "trimX": 1883, + "trimY": 1139, "width": 29, "height": 38, "rawWidth": 29, @@ -2181,8 +2043,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 457, - "trimY": 1020, + "trimX": 1622, + "trimY": 1276, "width": 29, "height": 38, "rawWidth": 29, @@ -2224,11 +2086,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 990, - "trimY": 741, + "trimX": 1507, + "trimY": 94, "width": 83, "height": 88, "rawWidth": 83, @@ -2273,8 +2135,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1175, - "trimY": 974, + "trimX": 1630, + "trimY": 1070, "width": 74, "height": 79, "rawWidth": 74, @@ -2316,11 +2178,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1857, - "trimY": 47, + "trimX": 923, + "trimY": 819, "width": 123, "height": 101, "rawWidth": 123, @@ -2365,8 +2227,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1958, - "trimY": 1192, + "trimX": 1934, + "trimY": 1257, "width": 55, "height": 51, "rawWidth": 55, @@ -2411,8 +2273,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 910, - "trimY": 1373, + "trimX": 1407, + "trimY": 1140, "width": 84, "height": 66, "rawWidth": 84, @@ -2457,8 +2319,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1087, - "trimY": 1055, + "trimX": 1048, + "trimY": 819, "width": 104, "height": 102, "rawWidth": 128, @@ -2500,11 +2362,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1657, - "trimY": 903, + "trimX": 1849, + "trimY": 385, "width": 96, "height": 104, "rawWidth": 128, @@ -2549,8 +2411,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 327, - "trimY": 847, + "trimX": 1589, + "trimY": 186, "width": 128, "height": 116, "rawWidth": 128, @@ -2592,11 +2454,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1808, - "trimY": 499, + "trimX": 923, + "trimY": 689, "width": 128, "height": 100, "rawWidth": 128, @@ -2641,8 +2503,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1808, - "trimY": 272, + "trimX": 793, + "trimY": 682, "width": 128, "height": 116, "rawWidth": 128, @@ -2684,11 +2546,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1938, - "trimY": 445, + "trimX": 907, + "trimY": 922, "width": 128, "height": 102, "rawWidth": 128, @@ -2730,11 +2592,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1548, - "trimY": 465, + "trimX": 987, + "trimY": 1140, "width": 128, "height": 106, "rawWidth": 128, @@ -2779,8 +2641,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1459, - "trimY": 777, + "trimX": 1037, + "trimY": 923, "width": 124, "height": 100, "rawWidth": 128, @@ -2825,8 +2687,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1657, - "trimY": 777, + "trimX": 1132, + "trimY": 1269, "width": 124, "height": 104, "rawWidth": 128, @@ -2868,11 +2730,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1193, - "trimY": 1055, + "trimX": 726, + "trimY": 1301, "width": 105, "height": 93, "rawWidth": 105, @@ -2917,8 +2779,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 471, - "trimY": 1199, + "trimX": 1154, + "trimY": 812, "width": 117, "height": 109, "rawWidth": 117, @@ -2963,8 +2825,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1861, - "trimY": 1303, + "trimX": 1997, + "trimY": 1122, "width": 50, "height": 65, "rawWidth": 50, @@ -3006,11 +2868,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1945, - "trimY": 833, + "trimX": 1247, + "trimY": 727, "width": 83, "height": 86, "rawWidth": 83, @@ -3052,11 +2914,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 986, - "trimY": 866, + "trimX": 833, + "trimY": 1301, "width": 71, "height": 93, "rawWidth": 71, @@ -3101,8 +2963,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1280, - "trimY": 1382, + "trimX": 339, + "trimY": 1319, "width": 75, "height": 76, "rawWidth": 75, @@ -3144,11 +3006,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1400, - "trimY": 1099, + "trimX": 1609, + "trimY": 408, "width": 108, "height": 110, "rawWidth": 108, @@ -3193,8 +3055,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1945, - "trimY": 921, + "trimX": 1706, + "trimY": 1071, "width": 78, "height": 77, "rawWidth": 78, @@ -3239,8 +3101,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 355, - "trimY": 1348, + "trimX": 609, + "trimY": 1301, "width": 115, "height": 93, "rawWidth": 115, @@ -3285,8 +3147,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 730, - "trimY": 819, + "trimX": 1240, + "trimY": 292, "width": 126, "height": 99, "rawWidth": 126, @@ -3328,11 +3190,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1195, - "trimY": 339, + "trimX": 858, + "trimY": 281, "width": 167, "height": 89, "rawWidth": 167, @@ -3374,11 +3236,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 588, - "trimY": 590, + "trimX": 1372, + "trimY": 148, "width": 167, "height": 89, "rawWidth": 167, @@ -3420,11 +3282,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 978, - "trimY": 1373, + "trimX": 1633, + "trimY": 922, "width": 64, "height": 73, "rawWidth": 64, @@ -3469,8 +3331,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 606, - "trimY": 155, + "trimX": 336, + "trimY": 382, "width": 281, "height": 165, "rawWidth": 281, @@ -3558,11 +3420,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 393, + "trimX": 858, + "trimY": 165, "width": 148, "height": 114, "rawWidth": 148, @@ -3653,8 +3515,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1337, - "trimY": 640, + "trimX": 1045, + "trimY": 365, "width": 60, "height": 122, "rawWidth": 60, @@ -3696,11 +3558,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 723, - "trimY": 1032, + "trimX": 1073, + "trimY": 565, "width": 60, "height": 122, "rawWidth": 60, @@ -3745,8 +3607,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1655, - "trimY": 1318, + "trimX": 417, + "trimY": 1319, "width": 60, "height": 62, "rawWidth": 60, @@ -3791,8 +3653,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1796, - "trimY": 1378, + "trimX": 1808, + "trimY": 1206, "width": 60, "height": 62, "rawWidth": 60, @@ -3834,11 +3696,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1758, - "trimY": 1049, + "trimX": 1870, + "trimY": 1206, "width": 60, "height": 62, "rawWidth": 60, @@ -3880,11 +3742,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1952, - "trimY": 1000, + "trimX": 1808, + "trimY": 1270, "width": 60, "height": 62, "rawWidth": 60, @@ -3926,11 +3788,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 337, - "trimY": 717, + "trimX": 349, + "trimY": 1055, "width": 128, "height": 130, "rawWidth": 128, @@ -3975,8 +3837,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 600, - "trimY": 681, + "trimX": 349, + "trimY": 1187, "width": 128, "height": 130, "rawWidth": 128, @@ -4021,8 +3883,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1283, + "trimX": 479, + "trimY": 1023, "width": 128, "height": 130, "rawWidth": 128, @@ -4067,8 +3929,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 131, - "trimY": 1283, + "trimX": 479, + "trimY": 1155, "width": 128, "height": 130, "rawWidth": 128, @@ -4110,11 +3972,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1548, - "trimY": 333, + "trimX": 609, + "trimY": 1039, "width": 128, "height": 130, "rawWidth": 128, @@ -4159,8 +4021,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1678, - "trimY": 318, + "trimX": 609, + "trimY": 1169, "width": 128, "height": 130, "rawWidth": 128, @@ -4205,8 +4067,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1290, - "trimY": 1162, + "trimX": 1273, + "trimY": 812, "width": 108, "height": 108, "rawWidth": 128, @@ -4248,11 +4110,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 599, - "trimY": 911, + "trimX": 906, + "trimY": 1270, "width": 124, "height": 112, "rawWidth": 128, @@ -4297,8 +4159,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1310, - "trimY": 980, + "trimX": 1835, + "trimY": 725, "width": 110, "height": 104, "rawWidth": 128, @@ -4343,8 +4205,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1422, - "trimY": 993, + "trimX": 1708, + "trimY": 965, "width": 110, "height": 104, "rawWidth": 128, @@ -4389,8 +4251,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1678, - "trimY": 558, + "trimX": 1719, + "trimY": 255, "width": 128, "height": 100, "rawWidth": 128, @@ -4432,11 +4294,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1638, - "trimY": 675, + "trimX": 1008, + "trimY": 165, "width": 100, "height": 114, "rawWidth": 128, @@ -4478,11 +4340,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 497, - "trimY": 967, + "trimX": 1603, + "trimY": 520, "width": 100, "height": 114, "rawWidth": 128, @@ -4527,8 +4389,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 948, - "trimY": 1155, + "trimX": 1163, + "trimY": 923, "width": 100, "height": 110, "rawWidth": 128, @@ -4573,8 +4435,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1624, - "trimY": 1111, + "trimX": 1275, + "trimY": 922, "width": 100, "height": 110, "rawWidth": 128, @@ -4616,11 +4478,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 590, - "trimY": 1315, + "trimX": 1839, + "trimY": 609, "width": 114, "height": 106, "rawWidth": 128, @@ -4653,144 +4515,6 @@ ], "subMetas": {} }, - "c47a9": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c47a9", - "displayName": "", - "id": "c47a9", - "name": "ItemIcon_Chest_Gold", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 847, - "trimY": 1055, - "width": 120, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "6d75a": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6d75a", - "displayName": "", - "id": "6d75a", - "name": "ItemIcon_Chest_Wood", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1836, - "trimY": 172, - "width": 122, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "e6946": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e6946", - "displayName": "", - "id": "e6946", - "name": "ItemIcon_Clover_Gold", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 590, - "trimY": 1197, - "width": 114, - "height": 116, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "b5bcd": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b5bcd", @@ -4803,8 +4527,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 757, - "trimY": 619, + "trimX": 1719, + "trimY": 565, "width": 118, "height": 100, "rawWidth": 128, @@ -4849,8 +4573,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 584, - "trimY": 1087, + "trimX": 1481, + "trimY": 510, "width": 120, "height": 108, "rawWidth": 128, @@ -4892,11 +4616,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1938, - "trimY": 575, + "trimX": 1589, + "trimY": 304, "width": 128, "height": 102, "rawWidth": 128, @@ -4938,11 +4662,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 725, - "trimY": 920, + "trimX": 1020, + "trimY": 1270, "width": 110, "height": 124, "rawWidth": 128, @@ -4987,8 +4711,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 464, - "trimY": 1083, + "trimX": 1127, + "trimY": 696, "width": 118, "height": 114, "rawWidth": 128, @@ -5030,11 +4754,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 851, - "trimY": 939, + "trimX": 1135, + "trimY": 500, "width": 122, "height": 114, "rawWidth": 128, @@ -5079,8 +4803,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1808, - "trimY": 601, + "trimX": 852, + "trimY": 1026, "width": 128, "height": 112, "rawWidth": 128, @@ -5125,8 +4849,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1392, - "trimY": 1272, + "trimX": 1373, + "trimY": 617, "width": 108, "height": 106, "rawWidth": 128, @@ -5171,8 +4895,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1534, - "trimY": 994, + "trimX": 1708, + "trimY": 853, "width": 110, "height": 110, "rawWidth": 128, @@ -5214,11 +4938,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 969, - "trimY": 1055, + "trimX": 1847, + "trimY": 491, "width": 116, "height": 98, "rawWidth": 128, @@ -5263,8 +4987,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 261, - "trimY": 1318, + "trimX": 982, + "trimY": 1026, "width": 92, "height": 112, "rawWidth": 128, @@ -5297,98 +5021,6 @@ ], "subMetas": {} }, - "d408d": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d408d", - "displayName": "", - "id": "d408d", - "name": "ItemIcon_Gift_Blue", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 1178, - "trimY": 1162, - "width": 110, - "height": 108, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "299e0": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@299e0", - "displayName": "", - "id": "299e0", - "name": "ItemIcon_Gift_Red", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 1280, - "trimY": 1272, - "width": 110, - "height": 108, - "rawWidth": 128, - "rawHeight": 128, - "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "de571": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@de571", @@ -5401,8 +5033,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 944, - "trimY": 1257, + "trimX": 1312, + "trimY": 1024, "width": 114, "height": 98, "rawWidth": 128, @@ -5444,11 +5076,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 472, - "trimY": 1310, + "trimX": 1291, + "trimY": 1140, "width": 114, "height": 116, "rawWidth": 128, @@ -5490,11 +5122,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 828, - "trimY": 1155, + "trimX": 1947, + "trimY": 647, "width": 118, "height": 100, "rawWidth": 128, @@ -5539,8 +5171,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 706, - "trimY": 1318, + "trimX": 1481, + "trimY": 620, "width": 116, "height": 108, "rawWidth": 128, @@ -5582,11 +5214,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 468, - "trimY": 583, + "trimX": 1251, + "trimY": 497, "width": 122, "height": 118, "rawWidth": 128, @@ -5628,11 +5260,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1510, - "trimY": 675, + "trimX": 1947, + "trimY": 391, "width": 100, "height": 126, "rawWidth": 128, @@ -5677,8 +5309,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1203, - "trimY": 758, + "trimX": 1719, + "trimY": 463, "width": 100, "height": 126, "rawWidth": 128, @@ -5720,11 +5352,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1331, - "trimY": 764, + "trimX": 1947, + "trimY": 519, "width": 100, "height": 126, "rawWidth": 128, @@ -5769,8 +5401,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1276, - "trimY": 534, + "trimX": 1719, + "trimY": 357, "width": 128, "height": 104, "rawWidth": 128, @@ -5815,8 +5447,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 975, - "trimY": 939, + "trimX": 1526, + "trimY": 1018, "width": 102, "height": 114, "rawWidth": 128, @@ -5861,8 +5493,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 706, - "trimY": 1094, + "trimX": 1251, + "trimY": 617, "width": 108, "height": 120, "rawWidth": 128, @@ -5904,11 +5536,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 877, - "trimY": 625, + "trimX": 873, + "trimY": 1140, "width": 128, "height": 112, "rawWidth": 128, @@ -5953,8 +5585,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1081, - "trimY": 856, + "trimX": 1599, + "trimY": 622, "width": 116, "height": 106, "rawWidth": 128, @@ -5996,11 +5628,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1938, - "trimY": 705, + "trimX": 1237, + "trimY": 393, "width": 126, "height": 102, "rawWidth": 128, @@ -6045,8 +5677,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1317, - "trimY": 866, + "trimX": 1194, + "trimY": 1025, "width": 116, "height": 112, "rawWidth": 128, @@ -6091,8 +5723,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1435, - "trimY": 879, + "trimX": 1717, + "trimY": 667, "width": 116, "height": 112, "rawWidth": 128, @@ -6134,11 +5766,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1060, - "trimY": 1159, + "trimX": 1412, + "trimY": 1018, "width": 116, "height": 112, "rawWidth": 128, @@ -6183,8 +5815,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1044, - "trimY": 1273, + "trimX": 1499, + "trimY": 730, "width": 116, "height": 112, "rawWidth": 128, @@ -6229,8 +5861,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1162, - "trimY": 1273, + "trimX": 1489, + "trimY": 844, "width": 116, "height": 112, "rawWidth": 128, @@ -6272,11 +5904,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 652, + "trimX": 1025, + "trimY": 689, "width": 128, "height": 100, "rawWidth": 128, @@ -6321,8 +5953,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1209, - "trimY": 640, + "trimX": 779, + "trimY": 904, "width": 126, "height": 116, "rawWidth": 128, @@ -6364,11 +5996,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 730, - "trimY": 721, + "trimX": 1095, + "trimY": 1139, "width": 128, "height": 96, "rawWidth": 128, @@ -6410,11 +6042,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 860, - "trimY": 739, + "trimX": 1193, + "trimY": 1139, "width": 128, "height": 96, "rawWidth": 128, @@ -6456,11 +6088,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 600, - "trimY": 813, + "trimX": 1849, + "trimY": 255, "width": 128, "height": 96, "rawWidth": 128, @@ -6505,8 +6137,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 337, - "trimY": 583, + "trimX": 1903, + "trimY": 1, "width": 129, "height": 132, "rawWidth": 129, @@ -6551,8 +6183,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1286, - "trimY": 342, + "trimX": 847, + "trimY": 372, "width": 129, "height": 132, "rawWidth": 129, @@ -6597,8 +6229,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1417, - "trimY": 342, + "trimX": 1110, + "trimY": 149, "width": 129, "height": 132, "rawWidth": 129, @@ -6643,8 +6275,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 469, - "trimY": 707, + "trimX": 1241, + "trimY": 148, "width": 129, "height": 132, "rawWidth": 129, @@ -6686,11 +6318,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1553, - "trimY": 893, + "trimX": 1947, + "trimY": 767, "width": 99, "height": 102, "rawWidth": 99, @@ -6735,8 +6367,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1854, - "trimY": 806, + "trimX": 1417, + "trimY": 730, "width": 80, "height": 80, "rawWidth": 80, @@ -6781,8 +6413,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1960, - "trimY": 145, + "trimX": 1507, + "trimY": 323, "width": 80, "height": 83, "rawWidth": 80, @@ -6827,8 +6459,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1960, - "trimY": 230, + "trimX": 1335, + "trimY": 727, "width": 80, "height": 83, "rawWidth": 80, @@ -6873,8 +6505,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1466, - "trimY": 1209, + "trimX": 1786, + "trimY": 1071, "width": 35, "height": 32, "rawWidth": 35, @@ -6919,8 +6551,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1044, - "trimY": 1387, + "trimX": 1414, + "trimY": 1299, "width": 71, "height": 70, "rawWidth": 71, @@ -6962,11 +6594,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1796, - "trimY": 1309, + "trimX": 1056, + "trimY": 500, "width": 63, "height": 67, "rawWidth": 63, @@ -7011,8 +6643,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1580, - "trimY": 1322, + "trimX": 1558, + "trimY": 958, "width": 73, "height": 58, "rawWidth": 73, @@ -7057,8 +6689,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1117, - "trimY": 1387, + "trimX": 1487, + "trimY": 1217, "width": 66, "height": 70, "rawWidth": 66, @@ -7103,8 +6735,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1185, - "trimY": 1387, + "trimX": 1487, + "trimY": 1289, "width": 65, "height": 70, "rawWidth": 65, @@ -7149,8 +6781,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1661, - "trimY": 1382, + "trimX": 1555, + "trimY": 1208, "width": 65, "height": 69, "rawWidth": 65, @@ -7192,11 +6824,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 194, - "trimY": 1415, + "trimX": 1972, + "trimY": 1314, "width": 42, "height": 43, "rawWidth": 42, @@ -7238,11 +6870,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1889, - "trimY": 1130, + "trimX": 1624, + "trimY": 1334, "width": 60, "height": 62, "rawWidth": 60, @@ -7287,8 +6919,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 771, + "trimX": 13, + "trimY": 1343, "width": 33, "height": 34, "rawWidth": 33, @@ -7330,11 +6962,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1896, - "trimY": 1194, + "trimX": 1688, + "trimY": 1334, "width": 60, "height": 62, "rawWidth": 60, @@ -7379,8 +7011,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1858, - "trimY": 1424, + "trimX": 2013, + "trimY": 1359, "width": 33, "height": 34, "rawWidth": 33, @@ -7425,8 +7057,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1913, - "trimY": 1296, + "trimX": 1752, + "trimY": 1332, "width": 60, "height": 62, "rawWidth": 60, @@ -7468,11 +7100,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1894, - "trimY": 1424, + "trimX": 1886, + "trimY": 1170, "width": 33, "height": 34, "rawWidth": 33, @@ -7514,11 +7146,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1358, - "trimY": 1382, + "trimX": 979, + "trimY": 504, "width": 67, "height": 75, "rawWidth": 67, @@ -7560,11 +7192,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1251, - "trimY": 974, + "trimX": 1630, + "trimY": 1151, "width": 57, "height": 79, "rawWidth": 57, @@ -7609,8 +7241,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1717, - "trimY": 1309, + "trimX": 1711, + "trimY": 1150, "width": 77, "height": 69, "rawWidth": 77, @@ -7652,11 +7284,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1913, - "trimY": 1360, + "trimX": 1872, + "trimY": 1334, "width": 60, "height": 62, "rawWidth": 60, @@ -7701,8 +7333,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2012, - "trimY": 1138, + "trimX": 873, + "trimY": 1270, "width": 28, "height": 28, "rawWidth": 28, @@ -7744,11 +7376,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1478, - "trimY": 608, + "trimX": 1869, + "trimY": 214, "width": 39, "height": 40, "rawWidth": 39, @@ -7793,8 +7425,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1975, - "trimY": 1408, + "trimX": 1972, + "trimY": 1359, "width": 35, "height": 39, "rawWidth": 35, @@ -7839,8 +7471,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1033, - "trimY": 831, + "trimX": 1530, + "trimY": 1361, "width": 33, "height": 36, "rawWidth": 33, @@ -7882,11 +7514,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 652, - "trimY": 1423, + "trimX": 1911, + "trimY": 214, "width": 39, "height": 34, "rawWidth": 39, @@ -7928,11 +7560,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1996, - "trimY": 1249, + "trimX": 1662, + "trimY": 1277, "width": 37, "height": 35, "rawWidth": 37, @@ -7977,8 +7609,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1930, - "trimY": 1424, + "trimX": 1988, + "trimY": 1228, "width": 30, "height": 39, "rawWidth": 30, @@ -8023,8 +7655,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1369, - "trimY": 1086, + "trimX": 1786, + "trimY": 1108, "width": 29, "height": 40, "rawWidth": 29, @@ -8069,8 +7701,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 990, - "trimY": 831, + "trimX": 1487, + "trimY": 1361, "width": 33, "height": 41, "rawWidth": 33, @@ -8112,11 +7744,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1754, - "trimY": 729, + "trimX": 1997, + "trimY": 1189, "width": 37, "height": 40, "rawWidth": 37, @@ -8158,11 +7790,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1954, - "trimY": 1258, + "trimX": 2011, + "trimY": 929, "width": 36, "height": 40, "rawWidth": 36, @@ -8207,8 +7839,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1597, - "trimY": 1, + "trimX": 878, + "trimY": 103, "width": 361, "height": 44, "rawWidth": 361, @@ -8253,8 +7885,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1195, - "trimY": 103, + "trimX": 343, + "trimY": 819, "width": 108, "height": 234, "rawWidth": 108, @@ -8296,11 +7928,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1896, - "trimY": 1258, + "trimX": 2011, + "trimY": 871, "width": 36, "height": 56, "rawWidth": 36, @@ -8342,11 +7974,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 271, - "trimY": 1235, + "trimX": 1027, + "trimY": 281, "width": 82, "height": 81, "rawWidth": 82, @@ -8391,8 +8023,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 993, + "trimX": 1685, + "trimY": 1221, "width": 54, "height": 64, "rawWidth": 54, @@ -8437,8 +8069,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1829, - "trimY": 1005, + "trimX": 1817, + "trimY": 1114, "width": 54, "height": 64, "rawWidth": 54, @@ -8483,8 +8115,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1854, - "trimY": 888, + "trimX": 1911, + "trimY": 962, "width": 89, "height": 89, "rawWidth": 89, @@ -8529,8 +8161,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1975, - "trimY": 1296, + "trimX": 1568, + "trimY": 1340, "width": 54, "height": 54, "rawWidth": 54, @@ -8575,8 +8207,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1975, - "trimY": 1352, + "trimX": 1932, + "trimY": 1201, "width": 54, "height": 54, "rawWidth": 54, @@ -8618,11 +8250,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 889, - "trimY": 103, + "trimX": 49, + "trimY": 1090, "width": 304, "height": 143, "rawWidth": 304, @@ -8664,11 +8296,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 889, - "trimY": 248, + "trimX": 194, + "trimY": 1090, "width": 304, "height": 143, "rawWidth": 304, @@ -8713,16 +8345,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 49, - "trimY": 1090, + "trimX": 1597, + "trimY": 1, "width": 304, "height": 143, "rawWidth": 304, "rawHeight": 143, "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderBottom": 1, + "borderLeft": 146, + "borderRight": 146, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -8759,8 +8391,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1500, - "trimY": 1322, + "trimX": 1478, + "trimY": 958, "width": 58, "height": 78, "rawWidth": 58, @@ -8802,11 +8434,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1453, + "trimX": 321, + "trimY": 585, "width": 4, "height": 32, "rawWidth": 4, @@ -8848,11 +8480,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1606, - "trimY": 1306, + "trimX": 1, + "trimY": 1281, "width": 105, "height": 10, "rawWidth": 105, @@ -8897,8 +8529,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 472, - "trimY": 1426, + "trimX": 1300, + "trimY": 1378, "width": 111, "height": 16, "rawWidth": 111, @@ -8940,11 +8572,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1286, - "trimY": 476, + "trimX": 789, + "trimY": 356, "width": 190, "height": 56, "rawWidth": 190, @@ -9035,8 +8667,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 606, - "trimY": 322, + "trimX": 336, + "trimY": 549, "width": 259, "height": 96, "rawWidth": 259, @@ -9081,8 +8713,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1588, - "trimY": 1382, + "trimX": 1414, + "trimY": 1226, "width": 71, "height": 71, "rawWidth": 71, @@ -9127,8 +8759,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 877, - "trimY": 393, + "trimX": 597, + "trimY": 549, "width": 200, "height": 114, "rawWidth": 200, @@ -9170,11 +8802,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 877, - "trimY": 509, + "trimX": 625, + "trimY": 837, "width": 200, "height": 114, "rawWidth": 200, @@ -9216,11 +8848,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 590, - "trimY": 1423, + "trimX": 13, + "trimY": 1281, "width": 34, "height": 60, "rawWidth": 34, @@ -9265,8 +8897,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1902, - "trimY": 715, + "trimX": 2002, + "trimY": 971, "width": 34, "height": 60, "rawWidth": 34, @@ -9308,11 +8940,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1827, - "trimY": 1162, + "trimX": 1936, + "trimY": 1314, "width": 34, "height": 60, "rawWidth": 34, @@ -9354,11 +8986,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1528, - "trimY": 266, + "trimX": 739, + "trimY": 1169, "width": 65, "height": 130, "rawWidth": 65, @@ -9403,8 +9035,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1209, - "trimY": 508, + "trimX": 978, + "trimY": 372, "width": 65, "height": 130, "rawWidth": 65, @@ -9446,11 +9078,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1478, - "trimY": 476, + "trimX": 847, + "trimY": 506, "width": 65, "height": 130, "rawWidth": 65, @@ -9492,11 +9124,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1854, - "trimY": 979, + "trimX": 1461, + "trimY": 319, "width": 24, "height": 72, "rawWidth": 24, @@ -9538,11 +9170,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1305, - "trimY": 266, + "trimX": 277, + "trimY": 862, "width": 64, "height": 221, "rawWidth": 64, @@ -9584,11 +9216,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 2012, - "trimY": 1100, + "trimX": 1701, + "trimY": 1277, "width": 28, "height": 36, "rawWidth": 28, @@ -9633,8 +9265,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 132, - "trimY": 1443, + "trimX": 453, + "trimY": 1023, "width": 21, "height": 14, "rawWidth": 21, @@ -9679,8 +9311,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1399, - "trimY": 650, + "trimX": 741, + "trimY": 1055, "width": 112, "height": 109, "rawWidth": 112, @@ -9722,11 +9354,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 964, + "trimX": 1387, + "trimY": 922, "width": 89, "height": 94, "rawWidth": 89, @@ -9771,8 +9403,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1736, - "trimY": 1111, + "trimX": 1617, + "trimY": 730, "width": 89, "height": 94, "rawWidth": 89, @@ -9814,11 +9446,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1805, - "trimY": 1207, + "trimX": 1824, + "trimY": 831, "width": 89, "height": 94, "rawWidth": 89, @@ -9860,11 +9492,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1806, - "trimY": 715, + "trimX": 1820, + "trimY": 922, "width": 89, "height": 94, "rawWidth": 89, @@ -9909,8 +9541,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1763, - "trimY": 806, + "trimX": 1820, + "trimY": 1018, "width": 89, "height": 94, "rawWidth": 89, @@ -9955,8 +9587,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 305, - "trimY": 862, + "trimX": 771, + "trimY": 665, "width": 166, "height": 20, "rawWidth": 166, @@ -10001,8 +9633,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 277, - "trimY": 862, + "trimX": 741, + "trimY": 837, "width": 212, "height": 26, "rawWidth": 212, @@ -10047,8 +9679,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 336, - "trimY": 382, + "trimX": 606, + "trimY": 155, "width": 250, "height": 199, "rawWidth": 250, @@ -10136,11 +9768,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1606, - "trimY": 1213, + "trimX": 1368, + "trimY": 317, "width": 106, "height": 91, "rawWidth": 106, @@ -10182,11 +9814,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1427, - "trimY": 1382, + "trimX": 1633, + "trimY": 988, "width": 80, "height": 72, "rawWidth": 80, @@ -10231,8 +9863,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 305, - "trimY": 1030, + "trimX": 321, + "trimY": 819, "width": 20, "height": 26, "rawWidth": 20, @@ -10277,8 +9909,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1597, - "trimY": 79, + "trimX": 321, + "trimY": 847, "width": 13, "height": 20, "rawWidth": 13, @@ -10323,8 +9955,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1443, + "trimX": 1241, + "trimY": 282, "width": 129, "height": 8, "rawWidth": 129, @@ -10366,11 +9998,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1415, + "trimX": 1463, + "trimY": 126, "width": 191, "height": 26, "rawWidth": 191, @@ -10412,11 +10044,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1305, - "trimY": 332, + "trimX": 769, + "trimY": 837, "width": 216, "height": 8, "rawWidth": 216, @@ -10461,8 +10093,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1195, - "trimY": 508, + "trimX": 779, + "trimY": 833, "width": 32, "height": 12, "rawWidth": 32, @@ -10507,8 +10139,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1500, - "trimY": 1212, + "trimX": 1383, + "trimY": 812, "width": 104, "height": 108, "rawWidth": 128, @@ -10553,8 +10185,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 49, - "trimY": 1235, + "trimX": 1241, + "trimY": 126, "width": 220, "height": 20, "rawWidth": 220, @@ -10596,11 +10228,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 49, - "trimY": 1273, + "trimX": 339, + "trimY": 1085, "width": 219, "height": 8, "rawWidth": 219, @@ -10645,8 +10277,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 49, - "trimY": 1257, + "trimX": 878, + "trimY": 149, "width": 220, "height": 14, "rawWidth": 220, @@ -10688,11 +10320,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1317, - "trimY": 860, + "trimX": 343, + "trimY": 1055, "width": 4, "height": 12, "rawWidth": 4, @@ -10737,8 +10369,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1950, - "trimY": 1066, + "trimX": 1814, + "trimY": 1332, "width": 56, "height": 62, "rawWidth": 56, @@ -10780,11 +10412,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1827, - "trimY": 1097, + "trimX": 1555, + "trimY": 1279, "width": 63, "height": 59, "rawWidth": 63, @@ -10826,11 +10458,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1728, - "trimY": 1380, + "trimX": 1869, + "trimY": 146, "width": 66, "height": 76, "rawWidth": 66, @@ -10875,8 +10507,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1951, - "trimY": 1130, + "trimX": 1936, + "trimY": 1139, "width": 59, "height": 60, "rawWidth": 59, @@ -10921,8 +10553,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1509, - "trimY": 1382, + "trimX": 1551, + "trimY": 1134, "width": 72, "height": 77, "rawWidth": 72, @@ -10964,11 +10596,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 321, - "trimY": 803, + "trimX": 453, + "trimY": 819, "width": 35, "height": 14, "rawWidth": 35, @@ -11013,8 +10645,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 321, - "trimY": 585, + "trimX": 1491, + "trimY": 126, "width": 216, "height": 14, "rawWidth": 216, diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png index ee8c6954..87cb7f84 100644 Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ diff --git a/assets/resources/gui/items.plist b/assets/resources/gui/items.plist index 837b1254..4e2a8a8c 100644 --- a/assets/resources/gui/items.plist +++ b/assets/resources/gui/items.plist @@ -13,11 +13,11 @@ spriteOffset {0,0} spriteSize - {50,56} + {56,62} spriteSourceSize - {64,64} + {70,70} textureRect - {{542,204},{50,56}} + {{181,1},{56,62}} textureRotated @@ -30,13 +30,13 @@ spriteOffset {0,0} spriteSize - {50,56} + {56,62} spriteSourceSize - {64,64} + {70,70} textureRect - {{804,127},{50,56}} + {{245,1},{56,62}} textureRotated - + 1003.png @@ -47,13 +47,13 @@ spriteOffset {0,0} spriteSize - {50,56} + {56,62} spriteSourceSize - {64,64} + {70,70} textureRect - {{767,1},{50,56}} + {{309,1},{56,62}} textureRotated - + 1004.png @@ -62,13 +62,13 @@ anchor {0.5,0.5} spriteOffset - {0,-2} + {0,-3} spriteSize - {56,50} + {73,65} spriteSourceSize - {64,64} + {83,83} textureRect - {{1,205},{56,50}} + {{151,187},{73,65}} textureRotated @@ -79,13 +79,13 @@ anchor {0.5,0.5} spriteOffset - {0,-2} + {0,-3} spriteSize - {56,50} + {73,65} spriteSourceSize - {64,64} + {83,83} textureRect - {{59,205},{56,50}} + {{226,188},{73,65}} textureRotated @@ -96,13 +96,13 @@ anchor {0.5,0.5} spriteOffset - {0,-2} + {0,-3} spriteSize - {56,50} + {73,65} spriteSourceSize - {64,64} + {83,83} textureRect - {{484,204},{56,50}} + {{301,192},{73,65}} textureRotated @@ -113,15 +113,15 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,-1} spriteSize - {48,56} + {68,78} spriteSourceSize - {64,64} + {90,90} textureRect - {{869,179},{48,56}} + {{239,259},{68,78}} textureRotated - + 1008.png @@ -130,13 +130,13 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,-1} spriteSize - {48,56} + {68,78} spriteSourceSize - {64,64} + {90,90} textureRect - {{908,123},{48,56}} + {{319,262},{68,78}} textureRotated @@ -147,15 +147,15 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,-1} spriteSize - {48,56} + {68,78} spriteSourceSize - {64,64} + {90,90} textureRect - {{919,173},{48,56}} + {{399,262},{68,78}} textureRotated - + 1010.png @@ -166,11 +166,11 @@ spriteOffset {0,0} spriteSize - {50,54} + {80,86} spriteSourceSize - {64,64} + {102,102} textureRect - {{819,1},{50,54}} + {{1,393},{80,86}} textureRotated @@ -183,13 +183,13 @@ spriteOffset {0,0} spriteSize - {50,54} + {80,86} spriteSourceSize - {64,64} + {102,102} textureRect - {{871,1},{50,54}} + {{83,403},{80,86}} textureRotated - + 1012.png @@ -200,13 +200,13 @@ spriteOffset {0,0} spriteSize - {50,54} + {80,86} spriteSourceSize - {64,64} + {102,102} textureRect - {{856,123},{50,54}} + {{171,408},{80,86}} textureRotated - + 2003.png @@ -221,9 +221,9 @@ spriteSourceSize {64,64} textureRect - {{761,61},{64,62}} + {{417,64},{64,62}} textureRotated - + 2004.png @@ -238,7 +238,7 @@ spriteSourceSize {64,64} textureRect - {{653,1},{58,58}} + {{373,1},{58,58}} textureRotated @@ -255,9 +255,9 @@ spriteSourceSize {83,83} textureRect - {{197,1},{75,77}} + {{83,323},{75,77}} textureRotated - + 2006.Png @@ -272,7 +272,7 @@ spriteSourceSize {83,83} textureRect - {{258,80},{75,77}} + {{162,324},{75,77}} textureRotated @@ -285,11 +285,11 @@ spriteOffset {0,0} spriteSize - {81,65} + {92,74} spriteSourceSize - {81,65} + {92,74} textureRect - {{274,1},{81,65}} + {{239,332},{92,74}} textureRotated @@ -300,13 +300,13 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,1} spriteSize - {76,61} + {102,86} spriteSourceSize - {76,61} + {102,102} textureRect - {{403,67},{76,61}} + {{97,490},{102,86}} textureRotated @@ -317,13 +317,13 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,1} spriteSize - {76,61} + {102,86} spriteSourceSize - {76,61} + {102,102} textureRect - {{433,1},{76,61}} + {{201,493},{102,86}} textureRotated @@ -334,15 +334,15 @@ anchor {0.5,0.5} spriteOffset - {0,0} + {0,1} spriteSize - {76,61} + {102,86} spriteSourceSize - {76,61} + {102,102} textureRect - {{421,130},{76,61}} + {{305,496},{102,86}} textureRotated - + 2021.png @@ -357,9 +357,9 @@ spriteSourceSize {79,66} textureRect - {{806,185},{61,64}} + {{433,1},{61,64}} textureRotated - + 2022.png @@ -374,9 +374,9 @@ spriteSourceSize {79,66} textureRect - {{825,57},{61,64}} + {{285,59},{61,64}} textureRotated - + 2023.png @@ -391,9 +391,9 @@ spriteSourceSize {79,66} textureRect - {{888,57},{61,64}} + {{351,61},{61,64}} textureRotated - + 2031.png @@ -408,9 +408,9 @@ spriteSourceSize {64,64} textureRect - {{713,1},{52,58}} + {{1,1},{52,58}} textureRotated - + 2032.png @@ -425,9 +425,9 @@ spriteSourceSize {64,64} textureRect - {{696,129},{52,58}} + {{61,1},{52,58}} textureRotated - + 2033.png @@ -442,9 +442,9 @@ spriteSourceSize {64,64} textureRect - {{750,129},{52,58}} + {{121,1},{52,58}} textureRotated - + 2301.png @@ -459,7 +459,7 @@ spriteSourceSize {128,128} textureRect - {{555,63},{64,70}} + {{143,121},{64,70}} textureRotated @@ -476,7 +476,7 @@ spriteSourceSize {102,102} textureRect - {{202,183},{68,80}} + {{1,323},{68,80}} textureRotated @@ -493,7 +493,7 @@ spriteSourceSize {96,96} textureRect - {{481,64},{64,72}} + {{417,128},{64,72}} textureRotated @@ -510,9 +510,9 @@ spriteSourceSize {96,96} textureRect - {{335,68},{66,74}} + {{376,194},{66,74}} textureRotated - + 2305.png @@ -527,9 +527,9 @@ spriteSourceSize {90,90} textureRect - {{672,191},{64,66}} + {{77,117},{64,66}} textureRotated - + 2306.png @@ -544,7 +544,7 @@ spriteSourceSize {96,96} textureRect - {{550,130},{62,74}} + {{1,117},{62,74}} textureRotated @@ -561,7 +561,7 @@ spriteSourceSize {96,96} textureRect - {{357,1},{64,74}} + {{1,181},{64,74}} textureRotated @@ -578,9 +578,9 @@ spriteSourceSize {96,96} textureRect - {{484,130},{64,72}} + {{77,187},{64,72}} textureRotated - + 2309.png @@ -595,9 +595,9 @@ spriteSourceSize {96,96} textureRect - {{353,144},{66,74}} + {{1,247},{66,74}} textureRotated - + 2310.png @@ -612,7 +612,7 @@ spriteSourceSize {90,90} textureRect - {{627,63},{64,66}} + {{215,121},{64,66}} textureRotated @@ -629,7 +629,7 @@ spriteSourceSize {90,90} textureRect - {{626,129},{60,68}} + {{1,55},{60,68}} textureRotated @@ -646,7 +646,7 @@ spriteSourceSize {90,90} textureRect - {{511,1},{60,70}} + {{71,55},{60,70}} textureRotated @@ -663,9 +663,9 @@ spriteSourceSize {90,90} textureRect - {{695,61},{64,66}} + {{283,122},{64,66}} textureRotated - + 2314.png @@ -680,7 +680,7 @@ spriteSourceSize {90,90} textureRect - {{583,1},{60,68}} + {{143,59},{60,68}} textureRotated @@ -697,7 +697,7 @@ spriteSourceSize {90,90} textureRect - {{600,194},{60,70}} + {{213,59},{60,70}} textureRotated @@ -714,7 +714,7 @@ spriteSourceSize {90,90} textureRect - {{740,189},{64,66}} + {{351,124},{64,66}} textureRotated @@ -731,9 +731,9 @@ spriteSourceSize {102,106} textureRect - {{1,1},{96,100}} + {{185,581},{96,100}} textureRotated - + 3012.png @@ -748,9 +748,9 @@ spriteSourceSize {102,106} textureRect - {{1,103},{96,100}} + {{287,584},{96,100}} textureRotated - + 3013.png @@ -765,9 +765,9 @@ spriteSourceSize {102,106} textureRect - {{99,1},{96,100}} + {{389,588},{96,100}} textureRotated - + 5007.Png @@ -782,7 +782,7 @@ spriteSourceSize {90,90} textureRect - {{178,103},{78,78}} + {{418,332},{78,78}} textureRotated @@ -799,7 +799,7 @@ spriteSourceSize {83,83} textureRect - {{117,188},{83,67}} + {{77,254},{83,67}} textureRotated @@ -816,9 +816,9 @@ spriteSourceSize {83,83} textureRect - {{99,103},{83,77}} + {{333,332},{83,77}} textureRotated - + 9001.png @@ -833,7 +833,109 @@ spriteSourceSize {67,75} textureRect - {{284,159},{67,75}} + {{162,255},{67,75}} + textureRotated + + + 9002.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {94,84} + spriteSourceSize + {102,102} + textureRect + {{1,485},{94,84}} + textureRotated + + + 9003.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {-1,1} + spriteSize + {98,80} + spriteSourceSize + {102,102} + textureRect + {{259,411},{98,80}} + textureRotated + + + 9004.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,1} + spriteSize + {100,82} + spriteSourceSize + {102,102} + textureRect + {{359,412},{100,82}} + textureRotated + + + 9005.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {-1,1} + spriteSize + {90,88} + spriteSourceSize + {102,102} + textureRect + {{409,496},{90,88}} + textureRotated + + + 9006.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {-1,1} + spriteSize + {90,88} + spriteSourceSize + {102,102} + textureRect + {{1,571},{90,88}} + textureRotated + + + 9007.Png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {-1,1} + spriteSize + {90,88} + spriteSourceSize + {102,102} + textureRect + {{93,578},{90,88}} textureRotated @@ -849,9 +951,9 @@ realTextureFileName items.png size - {968,256} + {498,685} smartupdate - $TexturePacker:SmartUpdate:fc596d6a6f6f00940744b6bd2e1d48bd:a16ddc21f117a9d0c687ed0f7db84809:9b2c40378ce3448cae3ca053079d3001$ + $TexturePacker:SmartUpdate:065ac64c00010e66f45b29b8d1e529d8:d4da42f77380ca535abe1edcca2fbc55:9b2c40378ce3448cae3ca053079d3001$ textureFileName items.png diff --git a/assets/resources/gui/items.plist.meta b/assets/resources/gui/items.plist.meta index fc978cf8..bd8ff451 100644 --- a/assets/resources/gui/items.plist.meta +++ b/assets/resources/gui/items.plist.meta @@ -18,13 +18,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -2, - "trimX": 59, - "trimY": 205, - "width": 56, - "height": 50, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -3, + "trimX": 226, + "trimY": 188, + "width": 73, + "height": 65, + "rawWidth": 83, + "rawHeight": 83, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,11 +62,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -1, - "trimX": 1, - "trimY": 103, + "trimX": 287, + "trimY": 584, "width": 96, "height": 100, "rawWidth": 102, @@ -108,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 888, - "trimY": 57, + "trimX": 351, + "trimY": 61, "width": 61, "height": 64, "rawWidth": 79, @@ -145,6 +145,52 @@ ], "subMetas": {} }, + "80343": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@80343", + "displayName": "", + "id": "80343", + "name": "9006", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 1, + "trimX": 1, + "trimY": 571, + "width": 90, + "height": 88, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "94586": { "importer": "sprite-frame", "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@94586", @@ -156,13 +202,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -2, - "trimX": 484, - "trimY": 204, - "width": 56, - "height": 50, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -3, + "trimX": 301, + "trimY": 192, + "width": 73, + "height": 65, + "rawWidth": 83, + "rawHeight": 83, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -203,12 +249,12 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 542, - "trimY": 204, - "width": 50, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "trimX": 181, + "trimY": 1, + "width": 56, + "height": 62, + "rawWidth": 70, + "rawHeight": 70, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -246,15 +292,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 804, - "trimY": 127, - "width": 50, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "trimX": 245, + "trimY": 1, + "width": 56, + "height": 62, + "rawWidth": 70, + "rawHeight": 70, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -292,15 +338,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 767, + "trimX": 309, "trimY": 1, - "width": 50, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "width": 56, + "height": 62, + "rawWidth": 70, + "rawHeight": 70, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -340,13 +386,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -2, - "trimX": 1, - "trimY": 205, - "width": 56, - "height": 50, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -3, + "trimX": 151, + "trimY": 187, + "width": 73, + "height": 65, + "rawWidth": 83, + "rawHeight": 83, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -384,15 +430,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 869, - "trimY": 179, - "width": 48, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -1, + "trimX": 239, + "trimY": 259, + "width": 68, + "height": 78, + "rawWidth": 90, + "rawHeight": 90, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -432,13 +478,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 908, - "trimY": 123, - "width": 48, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -1, + "trimX": 319, + "trimY": 262, + "width": 68, + "height": 78, + "rawWidth": 90, + "rawHeight": 90, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -476,15 +522,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 919, - "trimY": 173, - "width": 48, - "height": 56, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -1, + "trimX": 399, + "trimY": 262, + "width": 68, + "height": 78, + "rawWidth": 90, + "rawHeight": 90, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -525,12 +571,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 819, - "trimY": 1, - "width": 50, - "height": 54, - "rawWidth": 64, - "rawHeight": 64, + "trimX": 1, + "trimY": 393, + "width": 80, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -568,15 +614,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 871, - "trimY": 1, - "width": 50, - "height": 54, - "rawWidth": 64, - "rawHeight": 64, + "trimX": 83, + "trimY": 403, + "width": 80, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -614,15 +660,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 856, - "trimY": 123, - "width": 50, - "height": 54, - "rawWidth": 64, - "rawHeight": 64, + "trimX": 171, + "trimY": 408, + "width": 80, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -660,11 +706,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 761, - "trimY": 61, + "trimX": 417, + "trimY": 64, "width": 64, "height": 62, "rawWidth": 64, @@ -709,7 +755,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 653, + "trimX": 373, "trimY": 1, "width": 58, "height": 58, @@ -752,11 +798,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 197, - "trimY": 1, + "trimX": 83, + "trimY": 323, "width": 75, "height": 77, "rawWidth": 83, @@ -801,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 258, - "trimY": 80, + "trimX": 162, + "trimY": 324, "width": 75, "height": 77, "rawWidth": 83, @@ -847,12 +893,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 274, - "trimY": 1, - "width": 81, - "height": 65, - "rawWidth": 81, - "rawHeight": 65, + "trimX": 239, + "trimY": 332, + "width": 92, + "height": 74, + "rawWidth": 92, + "rawHeight": 74, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -892,13 +938,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 403, - "trimY": 67, - "width": 76, - "height": 61, - "rawWidth": 76, - "rawHeight": 61, + "offsetY": 1, + "trimX": 97, + "trimY": 490, + "width": 102, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -938,13 +984,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 433, - "trimY": 1, - "width": 76, - "height": 61, - "rawWidth": 76, - "rawHeight": 61, + "offsetY": 1, + "trimX": 201, + "trimY": 493, + "width": 102, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -982,15 +1028,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 421, - "trimY": 130, - "width": 76, - "height": 61, - "rawWidth": 76, - "rawHeight": 61, + "offsetY": 1, + "trimX": 305, + "trimY": 496, + "width": 102, + "height": 86, + "rawWidth": 102, + "rawHeight": 102, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1028,11 +1074,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 806, - "trimY": 185, + "trimX": 433, + "trimY": 1, "width": 61, "height": 64, "rawWidth": 79, @@ -1074,11 +1120,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 825, - "trimY": 57, + "trimX": 285, + "trimY": 59, "width": 61, "height": 64, "rawWidth": 79, @@ -1120,10 +1166,10 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 713, + "trimX": 1, "trimY": 1, "width": 52, "height": 58, @@ -1166,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 696, - "trimY": 129, + "trimX": 61, + "trimY": 1, "width": 52, "height": 58, "rawWidth": 64, @@ -1212,11 +1258,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 750, - "trimY": 129, + "trimX": 121, + "trimY": 1, "width": 52, "height": 58, "rawWidth": 64, @@ -1261,8 +1307,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 555, - "trimY": 63, + "trimX": 143, + "trimY": 121, "width": 64, "height": 70, "rawWidth": 128, @@ -1307,8 +1353,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 202, - "trimY": 183, + "trimX": 1, + "trimY": 323, "width": 68, "height": 80, "rawWidth": 102, @@ -1353,8 +1399,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 481, - "trimY": 64, + "trimX": 417, + "trimY": 128, "width": 64, "height": 72, "rawWidth": 96, @@ -1396,11 +1442,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": -3, - "trimX": 335, - "trimY": 68, + "trimX": 376, + "trimY": 194, "width": 66, "height": 74, "rawWidth": 96, @@ -1442,11 +1488,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -3, - "trimX": 672, - "trimY": 191, + "trimX": 77, + "trimY": 117, "width": 64, "height": 66, "rawWidth": 90, @@ -1491,8 +1537,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 550, - "trimY": 130, + "trimX": 1, + "trimY": 117, "width": 62, "height": 74, "rawWidth": 96, @@ -1537,8 +1583,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 357, - "trimY": 1, + "trimX": 1, + "trimY": 181, "width": 64, "height": 74, "rawWidth": 96, @@ -1580,11 +1626,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 484, - "trimY": 130, + "trimX": 77, + "trimY": 187, "width": 64, "height": 72, "rawWidth": 96, @@ -1626,11 +1672,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": -3, - "trimX": 353, - "trimY": 144, + "trimX": 1, + "trimY": 247, "width": 66, "height": 74, "rawWidth": 96, @@ -1675,8 +1721,8 @@ "rotated": true, "offsetX": -1, "offsetY": -3, - "trimX": 627, - "trimY": 63, + "trimX": 215, + "trimY": 121, "width": 64, "height": 66, "rawWidth": 90, @@ -1721,8 +1767,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 626, - "trimY": 129, + "trimX": 1, + "trimY": 55, "width": 60, "height": 68, "rawWidth": 90, @@ -1767,8 +1813,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 511, - "trimY": 1, + "trimX": 71, + "trimY": 55, "width": 60, "height": 70, "rawWidth": 90, @@ -1810,11 +1856,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": -3, - "trimX": 695, - "trimY": 61, + "trimX": 283, + "trimY": 122, "width": 64, "height": 66, "rawWidth": 90, @@ -1859,8 +1905,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 583, - "trimY": 1, + "trimX": 143, + "trimY": 59, "width": 60, "height": 68, "rawWidth": 90, @@ -1905,8 +1951,8 @@ "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 600, - "trimY": 194, + "trimX": 213, + "trimY": 59, "width": 60, "height": 70, "rawWidth": 90, @@ -1951,8 +1997,8 @@ "rotated": false, "offsetX": -1, "offsetY": -3, - "trimX": 740, - "trimY": 189, + "trimX": 351, + "trimY": 124, "width": 64, "height": 66, "rawWidth": 90, @@ -1994,11 +2040,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -1, - "trimX": 1, - "trimY": 1, + "trimX": 185, + "trimY": 581, "width": 96, "height": 100, "rawWidth": 102, @@ -2040,11 +2086,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -1, - "trimX": 99, - "trimY": 1, + "trimX": 389, + "trimY": 588, "width": 96, "height": 100, "rawWidth": 102, @@ -2089,8 +2135,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 178, - "trimY": 103, + "trimX": 418, + "trimY": 332, "width": 78, "height": 78, "rawWidth": 90, @@ -2135,8 +2181,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 117, - "trimY": 188, + "trimX": 77, + "trimY": 254, "width": 83, "height": 67, "rawWidth": 83, @@ -2178,11 +2224,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 99, - "trimY": 103, + "trimX": 333, + "trimY": 332, "width": 83, "height": 77, "rawWidth": 83, @@ -2224,11 +2270,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 284, - "trimY": 159, + "trimX": 162, + "trimY": 255, "width": 67, "height": 75, "rawWidth": 67, @@ -2260,6 +2306,236 @@ ".json" ], "subMetas": {} + }, + "fa39c": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@fa39c", + "displayName": "", + "id": "fa39c", + "name": "9002", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 485, + "width": 94, + "height": 84, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "5c4dd": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@5c4dd", + "displayName": "", + "id": "5c4dd", + "name": "9003", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 1, + "trimX": 259, + "trimY": 411, + "width": 98, + "height": 80, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "3e072": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@3e072", + "displayName": "", + "id": "3e072", + "name": "9004", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 359, + "trimY": 412, + "width": 100, + "height": 82, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "675ef": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@675ef", + "displayName": "", + "id": "675ef", + "name": "9005", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 1, + "trimX": 409, + "trimY": 496, + "width": 90, + "height": 88, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "618a6": { + "importer": "sprite-frame", + "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@618a6", + "displayName": "", + "id": "618a6", + "name": "9007", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 1, + "trimX": 93, + "trimY": 578, + "width": 90, + "height": 88, + "rawWidth": 102, + "rawHeight": 102, + "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a", + "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/gui/items.png b/assets/resources/gui/items.png index d642d427..64cf08b5 100644 Binary files a/assets/resources/gui/items.png and b/assets/resources/gui/items.png differ diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 238e2f0f..2469ee98 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -184,7 +184,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 271.033, - "y": 179.964, + "y": 171.429, "z": 0 }, "_lrot": { @@ -2255,7 +2255,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -34.03, "z": 0 }, "_lrot": { @@ -2267,8 +2267,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -2332,7 +2332,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c0043", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b86f8", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -3215,7 +3215,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 345.791, + "y": 349.252, "z": 0 }, "_lrot": { @@ -3292,7 +3292,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f0ffb", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d9d3f", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -3572,7 +3572,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -85.753, + "x": -83.029, "y": 21.233, "z": 0 }, @@ -4018,7 +4018,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 300, - "height": 114 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4054,7 +4054,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@946c8", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d27fa", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -4416,7 +4416,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 114 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4452,7 +4452,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@946c8", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b2a40", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -4607,7 +4607,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -2.247, + "y": 6.222, "z": 0 }, "_lrot": { @@ -4673,20 +4673,20 @@ "__prefab": { "__id__": 226 }, - "_resizeMode": 0, + "_resizeMode": 2, "_layoutType": 3, "_cellSize": { "__type__": "cc.Size", - "width": 40, - "height": 40 + "width": 125, + "height": 125 }, "_startAxis": 0, - "_paddingLeft": 10, + "_paddingLeft": 0, "_paddingRight": 0, - "_paddingTop": 10, - "_paddingBottom": 10, - "_spacingX": 89.9, - "_spacingY": 50, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 0, + "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 2, @@ -5466,7 +5466,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, + "width": 200, "height": 100 }, "_anchorPoint": { @@ -5498,12 +5498,12 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 220, - "b": 34, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c0043", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d27fa", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -5561,8 +5561,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 3.716, - "y": -2.679, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -5603,7 +5603,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 124, - "height": 54.4 + "height": 41.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5644,7 +5644,7 @@ "_actualFontSize": 30, "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 30, "_overflow": 0, "_enableWrapText": true, "_font": null, diff --git a/assets/resources/gui/victory.prefab b/assets/resources/gui/victory.prefab index 17f46c6d..15208866 100644 --- a/assets/resources/gui/victory.prefab +++ b/assets/resources/gui/victory.prefab @@ -301,7 +301,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -34.03, "z": 0 }, "_lrot": { @@ -313,8 +313,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -341,8 +341,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 660, - "height": 700 + "width": 320, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -378,7 +378,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b86f8", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1261,7 +1261,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 345.791, + "y": 349.252, "z": 0 }, "_lrot": { @@ -1338,7 +1338,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f0ffb", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d9d3f", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1618,7 +1618,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -85.753, + "x": -83.029, "y": 21.233, "z": 0 }, @@ -2064,7 +2064,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 300, - "height": 114 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2100,7 +2100,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@946c8", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d27fa", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -2436,7 +2436,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 114 + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2472,7 +2472,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@946c8", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b2a40", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -2601,7 +2601,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -2.247, + "y": 6.222, "z": 0 }, "_lrot": { diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts index 5178ea32..e3ba66df 100644 --- a/assets/script/game/common/config/Items.ts +++ b/assets/script/game/common/config/Items.ts @@ -6,21 +6,20 @@ type: */ export const Items={ - 1001:{uuid: 1001,path: "5017",type: 1,r_num:10,name: "训练凭证",info:"通过训练,提升普等级", }, - 1002:{uuid: 1002,path: "2009",type: 1,r_num:10,name: "高级训练凭证",info:"通过高等级训练,提升高50级以上英雄等级", }, - 1003:{uuid: 1003,path: "1002",type: 1,r_num:10,name: "英雄原石",info:"一星英雄升星", }, - 1004:{uuid: 1004,path: "1005",type: 1,r_num:1,name: "高级英雄原石",info:"二星英雄升星", }, - 1005:{uuid: 1005,path: "1008",type: 1,r_num:1,name: "稀有英雄原石",info:"三星英雄升星", }, - 1006:{uuid: 1006,path: "1011",type: 1,r_num:1,name: "传说英雄原石",info:"四星英雄升星", }, - 1007:{uuid: 1007,path: "5017",type: 1,r_num:1,name: "招募券",info:"招募英雄", }, - 1021:{uuid: 1021,path: "2301",type: 1,r_num:1,name: "普通攻击石",info:"增加装备攻击力", }, - 1022:{uuid: 1022,path: "2302",type: 1,r_num:1,name: "高级攻击石",info:"增加装备攻击力", }, - 1023:{uuid: 1023,path: "2303",type: 1,r_num:1,name: "稀有攻击石",info:"增加装备攻击力", }, - 1024:{uuid: 1024,path: "2304",type: 1,r_num:1,name: "传说攻击石",info:"增加装备攻击力", }, - 1025:{uuid: 1025,path: "2306",type: 1,r_num:1,name: "普通生命石",info:"增加装备生命值", }, - 1026:{uuid: 1026,path: "2307",type: 1,r_num:1,name: "高级生命石",info:"增加装备生命值", }, - 1027:{uuid: 1027,path: "2308",type: 1,r_num:1,name: "稀有生命石",info:"增加装备生命值", }, - 1028:{uuid: 1028,path: "2309",type: 1,r_num:1,name: "传说生命石",info:"增加装备生命值", }, - 9001:{uuid: 9001,path: "9001",type: 1,r_num:1,name: "金币",info:"金币不是万能的,但是没有金币是万万不能的", }, + 1001:{uuid: 1001,path: "3011",type:1,lv:1,r_num:10,name: "近战卷轴",info:"提升近战英雄等级", }, + 1002:{uuid: 1002,path: "3012",type:1,lv:1,r_num:10,name: "远程卷轴",info:"提升远程英雄等级", }, + 1003:{uuid: 1003,path: "3013",type:1,lv:1,r_num:10,name: "辅助卷轴",info:"提升辅助英雄等级", }, + 1004:{uuid: 1004,path: "2011",type:1,lv:2,r_num:10,name: "近战凭证",info:"提升近战英雄星级", }, + 1005:{uuid: 1005,path: "2012",type:1,lv:2,r_num:10,name: "远程凭证",info:"提升远程英雄星级", }, + 1006:{uuid: 1006,path: "2013",type:1,lv:2,r_num:10,name: "辅助凭证",info:"提升辅助英雄星级", }, + 1021:{uuid: 1021,path: "1001",type:1,lv:1,r_num:1,name: "普通攻击石",info:"增加装备攻击力10,成功几率20%", }, + 1022:{uuid: 1022,path: "1004",type:1,lv:2,r_num:1,name: "高级攻击石",info:"增加装备攻击力10,成功几率30%", }, + 1023:{uuid: 1023,path: "1007",type:1,lv:3,r_num:1,name: "稀有攻击石",info:"增加装备攻击力10,成功几率40%", }, + 1024:{uuid: 1024,path: "1010",type:1,lv:4,r_num:1,name: "传说攻击石",info:"增加装备攻击力10,成功几率50%", }, + 1025:{uuid: 1025,path: "1002",type:1,lv:1,r_num:1,name: "普通生命石",info:"增加装备生命值50,成功几率20%", }, + 1026:{uuid: 1026,path: "1005",type:1,lv:2,r_num:1,name: "高级生命石",info:"增加装备生命值50,成功几率30%", }, + 1027:{uuid: 1027,path: "1008",type:1,lv:3,r_num:1,name: "稀有生命石",info:"增加装备生命值50,成功几率40%", }, + 1028:{uuid: 1028,path: "1011",type:1,lv:4,r_num:1,name: "传说生命石",info:"增加装备生命值50,成功几率50%", }, + 9001:{uuid: 9001,path: "9001",type:1,lv:0,r_num:1,name: "金币",info:"金币不是万能的,但是没有金币是万万不能的", }, } diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts index 07c13737..63de50db 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/MissionSet.ts @@ -20,7 +20,7 @@ export const MissionSet = [ export const MissionReward = { - 1:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028], - 2:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028], - 3:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028], + 1:[1001,1002,1003,1004,1005,1006,1021,1022,1023,1024,1025,1026,1027,1028], + 2:[1001,1002,1003,1004,1005,1006,1021,1022,1023,1024,1025,1026,1027,1028], + 3:[1001,1002,1003,1004,1005,1006,1021,1022,1023,1024,1025,1026,1027,1028], } diff --git a/assets/script/game/map/Item.ts b/assets/script/game/map/Item.ts index b8df9954..56e87658 100644 --- a/assets/script/game/map/Item.ts +++ b/assets/script/game/map/Item.ts @@ -16,8 +16,23 @@ export class Item extends ecs.Entity { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); node.getChildByName("num").getComponent(Label).string = num.toString(); + let url = "gui/items"; let pathName= Items[uuid].path; + switch(Items[uuid].lv){ + case 1: + node.getChildByName("lv1").active = true; + break; + case 2: + node.getChildByName("lv2").active = true; + break; + case 3: + node.getChildByName("lv3").active = true; + break; + case 4: + node.getChildByName("lv4").active = true; + break; + } resources.load(url, SpriteAtlas, (err: any, atlas) => { const sprite = node.getChildByName("icon").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(pathName); diff --git a/assets/script/game/map/ItemInfoComp.ts b/assets/script/game/map/ItemInfoComp.ts index ad07727a..f8d2fc8f 100644 --- a/assets/script/game/map/ItemInfoComp.ts +++ b/assets/script/game/map/ItemInfoComp.ts @@ -3,6 +3,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { UIID } from "../common/config/GameUIConfig"; +import { Items } from "../common/config/Items"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -14,8 +15,27 @@ export class ItemInfoComp extends CCComp { this.node.getChildByName("info").getComponent(Label).string=args.info let url = "gui/items"; let pathName= args.path; + this.node.getChildByName("lv1").active = false; + this.node.getChildByName("lv2").active = false; + this.node.getChildByName("lv3").active = false; + this.node.getChildByName("lv4").active = false; + + switch(Items[args.uuid].lv){ + case 1: + this.node.getChildByName("lv1").active = true; + break; + case 2: + this.node.getChildByName("lv2").active = true; + break; + case 3: + this.node.getChildByName("lv3").active = true; + break; + case 4: + this.node.getChildByName("lv4").active = true; + break; + } resources.load(url, SpriteAtlas, (err: any, atlas) => { - const sprite = this.node.getChildByName("item_bg").getChildByName("icon").getComponent(Sprite); + const sprite = this.node.getChildByName("icon").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(pathName); }); } diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index ef5cf617..18043a06 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -45,10 +45,10 @@ export class VictoryComp extends CCComp { this.rewards[0]={uuid:9001,num:gold} for (let x = 1; x <= conut; x++) { let item=ecs.getEntity(Item) - let r_i:any = RandomManager.instance.getRandomInt(0,MissionReward[this.reward_lv].length); + let r_i:any = RandomManager.instance.getRandomInt(0,MissionReward[this.reward_lv].length-1); let ii = MissionReward[this.reward_lv][r_i]; let im = Items[ii]; - // console.log("reward",r_i,ii,im) + console.log("reward",r_i,ii,im) item.load(im.uuid,im.r_num,parent) this.rewards[x]={uuid:im.uuid,num:im.r_num} }