From c67a14962059fdd21a04a104c9f5ccb9afd04805 Mon Sep 17 00:00:00 2001 From: walkpan Date: Thu, 15 Aug 2024 20:07:21 +0800 Subject: [PATCH] dd --- assets/resources/common/prefab/window.prefab | 14 +- assets/resources/game/heros/hero.prefab | 20 +- assets/resources/game/heros/hero_card.prefab | 495 +++++++++++------- assets/resources/gui/gui.plist.meta | 373 ++++++------- assets/resources/gui/role_controller.prefab | 103 ++-- .../script/game/monster/HeroCardViewComp.ts | 29 +- assets/script/game/monster/MonsterViewComp.ts | 2 +- assets/script/game/skills/Skill.ts | 2 + assets/script/game/skills/SkillCom.ts | 1 + doc/ecs/ecs.md | 2 +- 10 files changed, 574 insertions(+), 467 deletions(-) diff --git a/assets/resources/common/prefab/window.prefab b/assets/resources/common/prefab/window.prefab index 8c458dbe..1cbb8a26 100644 --- a/assets/resources/common/prefab/window.prefab +++ b/assets/resources/common/prefab/window.prefab @@ -173,9 +173,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 3, + "g": 3, + "b": 3, "a": 255 }, "_string": "标题", @@ -355,9 +355,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 5, + "g": 5, + "b": 5, "a": 255 }, "_string": "内容", @@ -1362,7 +1362,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@47364", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index adf2af24..d00e6637 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -115,7 +115,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -30.505, + "y": 0, "z": 0 }, "_lrot": { @@ -216,7 +216,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -23.316, + "y": -23, "z": 0 }, "_lrot": { @@ -392,7 +392,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.22430072889736086 + "y": 0 }, "_id": "" }, @@ -645,7 +645,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@dfad9", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@dfad9", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -731,7 +731,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@cf09c", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@cf09c", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -949,7 +949,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@44c8a", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1035,7 +1035,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@0e130", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0e130", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1295,7 +1295,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -1405,12 +1405,12 @@ "_offset": { "__type__": "cc.Vec2", "x": -8.2, - "y": 27.9 + "y": 44.8 }, "_size": { "__type__": "cc.Size", "width": 58.4, - "height": 135.2 + "height": 101.5 }, "_id": "" }, diff --git a/assets/resources/game/heros/hero_card.prefab b/assets/resources/game/heros/hero_card.prefab index 24ed38d0..a290b56b 100644 --- a/assets/resources/game/heros/hero_card.prefab +++ b/assets/resources/game/heros/hero_card.prefab @@ -28,26 +28,26 @@ "__id__": 17 }, { - "__id__": 29 + "__id__": 27 }, { - "__id__": 33 + "__id__": 39 }, { - "__id__": 47 + "__id__": 54 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 68 }, { - "__id__": 63 + "__id__": 70 } ], "_prefab": { - "__id__": 65 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -179,7 +179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@c7034", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c7034", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -425,7 +425,7 @@ }, { "__type__": "cc.Node", - "_name": "level", + "_name": "active", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -436,22 +436,19 @@ "__id__": 18 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 24 - }, - { - "__id__": 26 } ], "_prefab": { - "__id__": 28 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", - "x": 10, - "y": 85, + "x": 47.5, + "y": 47.5, "z": 0 }, "_lrot": { @@ -479,7 +476,7 @@ }, { "__type__": "cc.Node", - "_name": "level", + "_name": "menu_focus", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -500,7 +497,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -2, "y": 0, "z": 0 }, @@ -539,6 +536,237 @@ "__prefab": { "__id__": 20 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 127, + "height": 127 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8egqgksgxKD4NlpI5FZUO5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_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@768cd", + "__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": "06cp6SebtJzJxYCvIIo/o1" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a0o37xQVZJlYDqlcePyq4X", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6dXzPh2dJNapyAy6zJaHBo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5565a2qcVBeofOrnv6zBx1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "level", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 28 + } + ], + "_active": true, + "_components": [ + { + "__id__": 34 + }, + { + "__id__": 36 + } + ], + "_prefab": { + "__id__": 38 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 10, + "y": 85, + "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.Node", + "_name": "level", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 27 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 29 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 33 + }, + "_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__": 28 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, "_contentSize": { "__type__": "cc.Size", "width": 15.123046875, @@ -561,11 +789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -642,11 +870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -670,11 +898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -687,7 +915,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@a6b9d", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -722,94 +950,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "avtive", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 30 - } - ], - "_prefab": { - "__id__": 32 - }, - "_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__": 29 - }, - "_enabled": true, - "__prefab": { - "__id__": 31 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6dXzPh2dJNapyAy6zJaHBo" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5565a2qcVBeofOrnv6zBx1", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "use", @@ -820,23 +960,23 @@ }, "_children": [ { - "__id__": 34 + "__id__": 40 } ], "_active": false, "_components": [ { - "__id__": 40 + "__id__": 46 }, { - "__id__": 42 + "__id__": 48 }, { - "__id__": 44 + "__id__": 50 } ], "_prefab": { - "__id__": 46 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -873,20 +1013,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 41 }, { - "__id__": 37 + "__id__": 43 } ], "_prefab": { - "__id__": 39 + "__id__": 45 }, "_lpos": { "__type__": "cc.Vec3", @@ -923,11 +1063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -951,11 +1091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -967,7 +1107,7 @@ "b": 0, "a": 255 }, - "_string": "button", + "_string": "使用", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, @@ -1032,11 +1172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1060,11 +1200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1077,7 +1217,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1b1f2", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1105,15 +1245,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 51 }, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 52 + } + ], "_interactable": true, - "_transition": 2, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 214, @@ -1143,7 +1287,7 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1b1f2", "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { @@ -1161,7 +1305,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 33 + "__id__": 39 }, "_id": "" }, @@ -1169,6 +1313,16 @@ "__type__": "cc.CompPrefabInfo", "fileId": "67y/LzMQlI/7kZ9ZTkSbYf" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "ad422rQFOdFR4cDG7TVsQ0B", + "handler": "use_card", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1192,23 +1346,23 @@ }, "_children": [ { - "__id__": 48 + "__id__": 55 } ], "_active": false, "_components": [ { - "__id__": 54 + "__id__": 61 }, { - "__id__": 56 + "__id__": 63 }, { - "__id__": 58 + "__id__": 65 } ], "_prefab": { - "__id__": 60 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -1245,20 +1399,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 54 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 56 }, { - "__id__": 51 + "__id__": 58 } ], "_prefab": { - "__id__": 53 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -1295,11 +1449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1323,11 +1477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1339,7 +1493,7 @@ "b": 0, "a": 255 }, - "_string": "button", + "_string": "暂存", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, @@ -1404,11 +1558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1432,11 +1586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1449,7 +1603,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5d1ce", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1477,15 +1631,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 66 }, "clickEvents": [], "_interactable": true, - "_transition": 2, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 214, @@ -1515,25 +1669,16 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5d1ce", "__expectedType__": "cc.SpriteFrame" }, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 47 + "__id__": 54 }, "_id": "" }, @@ -1564,7 +1709,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1592,7 +1737,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 71 }, "_id": "" }, diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index 6597b448..74d73cc6 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -2,14 +2,14 @@ "ver": "1.0.8", "importer": "sprite-atlas", "imported": true, - "uuid": "475189e3-a159-45bc-90f5-57864087d290", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2", "files": [ ".json" ], "subMetas": { "13590": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@13590", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@13590", "displayName": "", "id": "13590", "name": "Artboard 9", @@ -44,7 +44,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -55,7 +55,7 @@ }, "22385": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@22385", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "displayName": "", "id": "22385", "name": "data_bg", @@ -90,7 +90,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -101,7 +101,7 @@ }, "33690": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@33690", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@33690", "displayName": "", "id": "33690", "name": "Shop_icon", @@ -136,7 +136,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -147,7 +147,7 @@ }, "34767": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@34767", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34767", "displayName": "", "id": "34767", "name": "Artboard 17", @@ -182,7 +182,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -191,58 +191,9 @@ ], "subMetas": {} }, -<<<<<<< HEAD - "47364": { - "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@47364", - "displayName": "", - "id": "47364", - "name": "Options_box(1)", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1155, - "trimY": 668, - "width": 360, - "height": 224, - "rawWidth": 360, - "rawHeight": 224, - "borderTop": 42, - "borderBottom": 22, - "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": "475189e3-a159-45bc-90f5-57864087d290" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, -======= ->>>>>>> efe5c18b3e4ea9f0fdff969717e6ed36f98164c7 "63816": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@63816", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@63816", "displayName": "", "id": "63816", "name": "Artboard 18", @@ -277,7 +228,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -288,7 +239,7 @@ }, "68569": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@68569", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@68569", "displayName": "", "id": "68569", "name": "Artboard 51", @@ -323,7 +274,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -334,7 +285,7 @@ }, "80689": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@80689", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@80689", "displayName": "", "id": "80689", "name": "UI_Diamond", @@ -369,7 +320,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -380,7 +331,7 @@ }, "90878": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@90878", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@90878", "displayName": "", "id": "90878", "name": "green", @@ -415,7 +366,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -426,7 +377,7 @@ }, "93043": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@93043", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@93043", "displayName": "", "id": "93043", "name": "01", @@ -461,7 +412,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -472,7 +423,7 @@ }, "a6b9d": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@a6b9d", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d", "displayName": "", "id": "a6b9d", "name": "02", @@ -507,7 +458,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -518,7 +469,7 @@ }, "ecffe": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@ecffe", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ecffe", "displayName": "", "id": "ecffe", "name": "03", @@ -553,7 +504,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -564,7 +515,7 @@ }, "6f893": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@6f893", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6f893", "displayName": "", "id": "6f893", "name": "18", @@ -599,7 +550,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -610,7 +561,7 @@ }, "303c9": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@303c9", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@303c9", "displayName": "", "id": "303c9", "name": "21", @@ -645,7 +596,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -656,7 +607,7 @@ }, "3fe99": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@3fe99", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3fe99", "displayName": "", "id": "3fe99", "name": "28", @@ -691,7 +642,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -702,7 +653,7 @@ }, "6113b": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@6113b", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6113b", "displayName": "", "id": "6113b", "name": "29", @@ -737,7 +688,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -748,7 +699,7 @@ }, "3bd1f": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@3bd1f", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3bd1f", "displayName": "", "id": "3bd1f", "name": "30", @@ -783,7 +734,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -794,7 +745,7 @@ }, "aed46": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@aed46", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@aed46", "displayName": "", "id": "aed46", "name": "42", @@ -829,7 +780,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -840,7 +791,7 @@ }, "16a7b": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@16a7b", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@16a7b", "displayName": "", "id": "16a7b", "name": "43", @@ -875,7 +826,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -886,7 +837,7 @@ }, "b32c1": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@b32c1", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b32c1", "displayName": "", "id": "b32c1", "name": "55", @@ -921,7 +872,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -932,7 +883,7 @@ }, "719bf": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@719bf", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@719bf", "displayName": "", "id": "719bf", "name": "57", @@ -967,7 +918,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -978,7 +929,7 @@ }, "6e089": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@6e089", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6e089", "displayName": "", "id": "6e089", "name": "58", @@ -1013,7 +964,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1024,7 +975,7 @@ }, "7b698": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@7b698", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@7b698", "displayName": "", "id": "7b698", "name": "67", @@ -1059,7 +1010,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1070,7 +1021,7 @@ }, "2750e": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@2750e", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@2750e", "displayName": "", "id": "2750e", "name": "77", @@ -1105,7 +1056,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1116,7 +1067,7 @@ }, "4c1bc": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@4c1bc", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4c1bc", "displayName": "", "id": "4c1bc", "name": "Artboard 13", @@ -1151,7 +1102,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1162,7 +1113,7 @@ }, "ccd66": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@ccd66", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ccd66", "displayName": "", "id": "ccd66", "name": "Artboard 15", @@ -1197,7 +1148,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1208,7 +1159,7 @@ }, "b361d": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@b361d", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b361d", "displayName": "", "id": "b361d", "name": "Artboard 16", @@ -1243,7 +1194,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1254,7 +1205,7 @@ }, "5a627": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@5a627", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5a627", "displayName": "", "id": "5a627", "name": "Artboard 27", @@ -1289,7 +1240,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1300,7 +1251,7 @@ }, "323fb": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@323fb", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@323fb", "displayName": "", "id": "323fb", "name": "Artboard 28", @@ -1335,7 +1286,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1346,7 +1297,7 @@ }, "5d1ce": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@5d1ce", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5d1ce", "displayName": "", "id": "5d1ce", "name": "Artboard 32 copy 2", @@ -1381,7 +1332,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1392,7 +1343,7 @@ }, "6094d": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@6094d", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@6094d", "displayName": "", "id": "6094d", "name": "Artboard 32 copy 3", @@ -1427,7 +1378,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1438,7 +1389,7 @@ }, "1b1f2": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@1b1f2", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1b1f2", "displayName": "", "id": "1b1f2", "name": "Artboard 32 copy 4", @@ -1473,7 +1424,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1484,7 +1435,7 @@ }, "a0105": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@a0105", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a0105", "displayName": "", "id": "a0105", "name": "Artboard 32 copy 5", @@ -1519,7 +1470,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1530,7 +1481,7 @@ }, "542fd": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@542fd", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@542fd", "displayName": "", "id": "542fd", "name": "Artboard 32 copy", @@ -1565,7 +1516,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1576,7 +1527,7 @@ }, "791ed": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@791ed", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@791ed", "displayName": "", "id": "791ed", "name": "Artboard 32", @@ -1611,7 +1562,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1622,7 +1573,7 @@ }, "3f37d": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@3f37d", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3f37d", "displayName": "", "id": "3f37d", "name": "Artboard 5", @@ -1657,7 +1608,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1668,7 +1619,7 @@ }, "01a46": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@01a46", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@01a46", "displayName": "", "id": "01a46", "name": "Artboard 50", @@ -1703,7 +1654,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1714,7 +1665,7 @@ }, "b049e": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@b049e", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b049e", "displayName": "", "id": "b049e", "name": "Artboard 69", @@ -1749,7 +1700,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1760,7 +1711,7 @@ }, "bf1e2": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@bf1e2", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@bf1e2", "displayName": "", "id": "bf1e2", "name": "Artboard 70", @@ -1795,7 +1746,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1806,7 +1757,7 @@ }, "713f5": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@713f5", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@713f5", "displayName": "", "id": "713f5", "name": "BtnBrown", @@ -1841,7 +1792,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1852,7 +1803,7 @@ }, "3d870": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@3d870", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3d870", "displayName": "", "id": "3d870", "name": "BtnSmallAqua", @@ -1887,7 +1838,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1898,7 +1849,7 @@ }, "ddc14": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@ddc14", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ddc14", "displayName": "", "id": "ddc14", "name": "BtnSmallBlue", @@ -1933,7 +1884,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1944,7 +1895,7 @@ }, "c1b16": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@c1b16", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c1b16", "displayName": "", "id": "c1b16", "name": "BtnSmallDarkGray", @@ -1979,7 +1930,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -1990,7 +1941,7 @@ }, "9623b": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@9623b", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@9623b", "displayName": "", "id": "9623b", "name": "BtnSmallGray", @@ -2025,7 +1976,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2036,7 +1987,7 @@ }, "c7034": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@c7034", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c7034", "displayName": "", "id": "c7034", "name": "BtnSmallOrange", @@ -2071,7 +2022,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2082,7 +2033,7 @@ }, "d3524": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@d3524", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d3524", "displayName": "", "id": "d3524", "name": "Heroes_icon", @@ -2117,7 +2068,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2128,7 +2079,7 @@ }, "1c519": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@1c519", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1c519", "displayName": "", "id": "1c519", "name": "LvlMapAvailable", @@ -2163,7 +2114,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2174,7 +2125,7 @@ }, "ed8ea": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@ed8ea", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ed8ea", "displayName": "", "id": "ed8ea", "name": "Option_icon", @@ -2209,7 +2160,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2220,7 +2171,7 @@ }, "57d74": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@57d74", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "displayName": "", "id": "57d74", "name": "UI-02", @@ -2255,7 +2206,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2266,7 +2217,7 @@ }, "91cea": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@91cea", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", "displayName": "", "id": "91cea", "name": "UI-03", @@ -2284,8 +2235,8 @@ "rawHeight": 16, "borderTop": 0, "borderBottom": 0, - "borderLeft": 4, - "borderRight": 5, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2301,7 +2252,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2312,7 +2263,7 @@ }, "8aff2": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@8aff2", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8aff2", "displayName": "", "id": "8aff2", "name": "baoxiang", @@ -2347,7 +2298,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2358,7 +2309,7 @@ }, "58cb7": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@58cb7", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", "displayName": "", "id": "58cb7", "name": "bg", @@ -2374,10 +2325,10 @@ "height": 308, "rawWidth": 231, "rawHeight": 308, - "borderTop": 14, - "borderBottom": 14, - "borderLeft": 15, - "borderRight": 13, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2393,7 +2344,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2404,7 +2355,7 @@ }, "176a9": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@176a9", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@176a9", "displayName": "", "id": "176a9", "name": "black", @@ -2439,7 +2390,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2450,7 +2401,7 @@ }, "512f6": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "displayName": "", "id": "512f6", "name": "cardbg", @@ -2466,10 +2417,10 @@ "height": 97, "rawWidth": 97, "rawHeight": 97, - "borderTop": 23, - "borderBottom": 20, - "borderLeft": 22, - "borderRight": 22, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2485,7 +2436,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2496,7 +2447,7 @@ }, "f572f": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "displayName": "", "id": "f572f", "name": "data_bg1", @@ -2531,7 +2482,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2542,7 +2493,7 @@ }, "5c4a5": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@5c4a5", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", "displayName": "", "id": "5c4a5", "name": "gbar", @@ -2577,7 +2528,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2588,7 +2539,7 @@ }, "9e883": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@9e883", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@9e883", "displayName": "", "id": "9e883", "name": "gbg", @@ -2623,7 +2574,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2634,7 +2585,7 @@ }, "1b702": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@1b702", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1b702", "displayName": "", "id": "1b702", "name": "gold1", @@ -2669,7 +2620,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2680,7 +2631,7 @@ }, "4b4e8": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@4b4e8", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4b4e8", "displayName": "", "id": "4b4e8", "name": "grep", @@ -2715,7 +2666,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2726,7 +2677,7 @@ }, "a7985": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@a7985", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a7985", "displayName": "", "id": "a7985", "name": "infobox", @@ -2742,10 +2693,10 @@ "height": 106, "rawWidth": 273, "rawHeight": 106, - "borderTop": 27, - "borderBottom": 25, - "borderLeft": 22, - "borderRight": 22, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2761,7 +2712,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2772,7 +2723,7 @@ }, "f3b10": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@f3b10", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f3b10", "displayName": "", "id": "f3b10", "name": "kuang", @@ -2807,7 +2758,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2818,7 +2769,7 @@ }, "8c1af": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@8c1af", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8c1af", "displayName": "", "id": "8c1af", "name": "life2", @@ -2853,7 +2804,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2864,7 +2815,7 @@ }, "2aa03": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@2aa03", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@2aa03", "displayName": "", "id": "2aa03", "name": "light", @@ -2899,7 +2850,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2910,7 +2861,7 @@ }, "2c5d5": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@2c5d5", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@2c5d5", "displayName": "", "id": "2c5d5", "name": "magic", @@ -2945,7 +2896,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -2956,7 +2907,7 @@ }, "768cd": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@768cd", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@768cd", "displayName": "", "id": "768cd", "name": "menu_focus", @@ -2972,10 +2923,10 @@ "height": 157, "rawWidth": 157, "rawHeight": 157, - "borderTop": 49, - "borderBottom": 46, - "borderLeft": 43, - "borderRight": 44, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2991,7 +2942,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3002,7 +2953,7 @@ }, "b3a44": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@b3a44", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b3a44", "displayName": "", "id": "b3a44", "name": "red", @@ -3037,7 +2988,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3048,7 +2999,7 @@ }, "dfad9": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@dfad9", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@dfad9", "displayName": "", "id": "dfad9", "name": "redbar", @@ -3083,7 +3034,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3094,7 +3045,7 @@ }, "cf09c": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@cf09c", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@cf09c", "displayName": "", "id": "cf09c", "name": "redbg", @@ -3112,8 +3063,8 @@ "rawHeight": 8, "borderTop": 0, "borderBottom": 0, - "borderLeft": 5, - "borderRight": 5, + "borderLeft": 0, + "borderRight": 0, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -3129,7 +3080,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3140,7 +3091,7 @@ }, "44c8a": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@44c8a", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", "displayName": "", "id": "44c8a", "name": "ybar", @@ -3175,7 +3126,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3186,7 +3137,7 @@ }, "0e130": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@0e130", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0e130", "displayName": "", "id": "0e130", "name": "ybg", @@ -3221,7 +3172,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3232,7 +3183,7 @@ }, "54e09": { "importer": "sprite-frame", - "uuid": "475189e3-a159-45bc-90f5-57864087d290@54e09", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@54e09", "displayName": "", "id": "54e09", "name": "zhujiemian-6", @@ -3267,7 +3218,7 @@ }, "isUuid": true, "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290" + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" }, "ver": "1.0.12", "imported": true, @@ -3280,7 +3231,7 @@ "userData": { "atlasTextureName": "gui.png", "format": 3, - "uuid": "475189e3-a159-45bc-90f5-57864087d290", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2", "textureUuid": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a" } } diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 748ad92d..9a162e2f 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -332,7 +332,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -468,7 +468,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1048,7 +1048,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1184,7 +1184,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1764,7 +1764,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1900,7 +1900,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2480,7 +2480,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2616,7 +2616,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3196,7 +3196,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3332,7 +3332,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3912,7 +3912,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4048,7 +4048,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4702,7 +4702,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@58cb7", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -4951,7 +4951,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@a7985", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a7985", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -5290,7 +5290,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -5633,7 +5633,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6122,7 +6122,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6465,7 +6465,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@f572f", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6871,7 +6871,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@44c8a", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", "__expectedType__": "cc.SpriteFrame" }, "_type": 3, @@ -7179,7 +7179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@1b702", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1b702", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -7509,7 +7509,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@2aa03", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@2aa03", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -7595,7 +7595,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@22385", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22385", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -8513,7 +8513,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@54e09", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@54e09", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -8599,7 +8599,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@c7034", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c7034", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -8926,7 +8926,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9062,7 +9062,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9198,7 +9198,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9334,7 +9334,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9470,7 +9470,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9606,7 +9606,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -9742,7 +9742,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -10178,10 +10178,10 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@1b702", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c7034", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 0, "_fillCenter": { @@ -10317,7 +10317,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@719bf", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@719bf", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -10386,10 +10386,7 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@719bf", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, @@ -10478,7 +10475,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@c7034", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c7034", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -10719,7 +10716,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -10855,7 +10852,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -10991,7 +10988,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -11127,7 +11124,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -11263,7 +11260,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@512f6", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@512f6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -11678,7 +11675,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@7b698", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@7b698", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -11747,10 +11744,7 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@7b698", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, @@ -11892,7 +11886,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@7b698", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@7b698", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -11961,10 +11955,7 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@7b698", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, @@ -12333,7 +12324,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@57d74", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 3, @@ -12419,7 +12410,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "475189e3-a159-45bc-90f5-57864087d290@cf09c", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index 363e1058..b5505f88 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -5,6 +5,7 @@ import { data } from "../data/data"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; import { CardSet } from "../common/config/CardSet"; +import { HeroCard } from "./HeroCard"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -30,19 +31,35 @@ export class HeroCardViewComp extends CCComp { if(this.ent.eid != args.eid){ this.no_active() } - } - do_active(){ } + do_active(){ + // console.log(this.node.getChildByName("active"),this.node.getChildByName("use"), this.node.getChildByName("bag")) + let active = this.node.getChildByName("active") + let use = this.node.getChildByName("use") + let bag = this.node.getChildByName("bag") + active.active = !active.active + use.active = !use.active + bag.active = !bag.active + } no_active(){ - // this.node.getChildByName("active").active=false; - // this.node.getChildByName("use").active=false; - // this.node.getChildByName("bag").active=false; + let active = this.node.getChildByName("active") + let use = this.node.getChildByName("use") + let bag = this.node.getChildByName("bag") + active.active = false + use.active = false + bag.active = false } doit(){ // this.do_active() - console.log("doit",this.ent) smc.vm_data.cards.eid = this.ent.eid; + this.do_active() + let hero_cards = ecs.query(ecs.allOf(HeroCardViewComp)) + hero_cards.forEach(element => { + if(element.eid != this.ent.eid) + element.get(HeroCardViewComp).no_active() + }); + // console.log("doit",hero_cards) // oops.message.dispatchEvent("active_card_eid",{eid:this.ent.eid}) } diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 0e586851..4d6e1727 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -247,7 +247,7 @@ export class MonsterViewComp extends CCComp { load_skill(skill_name){ // console.log("load_skill"); let skill = ecs.getEntity(Skill); - let pos = v3(0,0) + let pos = v3(0,30) let speed =150 let scale = this.camp let range = 80 diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index dd5fd022..5db666b3 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -32,7 +32,9 @@ export class Skill extends ecs.Entity { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); node.parent = parent; + node.setScale(scale,1) node.setPosition(pos) + var sv = node.getComponent(SkillCom)!; sv.speed = speed; sv.range = range; diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 0d3ca6f9..3fbd29c9 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -20,6 +20,7 @@ export class SkillCom extends CCComp { atk:number = 10; is_destroy:boolean = false; start() { + this.node.active=true let collider = this.getComponent(Collider2D); if (collider) { // collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); diff --git a/doc/ecs/ecs.md b/doc/ecs/ecs.md index 5b3c1735..50b1f859 100644 --- a/doc/ecs/ecs.md +++ b/doc/ecs/ecs.md @@ -89,7 +89,7 @@ entity.destroy() // 销毁实体时会先删除实体身上的所有组件，然 ## 实体筛选 目前提供了四种类型的筛选能力，但是这四种筛选能力可以组合从而提供更强大的筛选功能。 - anyOf: 用来描述包含任意一个这些组件的实体； -- allOf: 用来描述同时包含了这些组件的实体； +- allOf: 用来；描述同时包含了这些组件的实体 - onlyOf: 用来描述只包含了这些组件的实体；不是特殊情况不建议使用onlyOf，因为onlyOf会监听所有组件的添加和删除事件； - excludeOf: 表示不包含所有这里面的组件（与关系）；