From b4abb4df21fee5baaef399cad4b50a0f9f1486e8 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 21 Dec 2022 12:02:08 +0100 Subject: [PATCH] Added auto atlas --- assets/Media/Images/auto-atlas.pac | 3 + assets/Media/Images/auto-atlas.pac.meta | 36 +++ assets/Media/Images/background.png | Bin 6691 -> 0 bytes assets/Media/Images/background.png.meta | 134 ----------- .../Game/Background/background-001.prefab | 94 ++++---- .../Game/Background/background-002.prefab | 99 ++++----- .../Game/Background/background-003.prefab | 139 ++++++------ .../Game/Background/background-004.prefab | 209 +++++++++++------- .../Game/Background/background-005.prefab | 99 ++++----- assets/Media/Prefabs/Game/Drops/Chest.prefab | 10 +- assets/Media/Prefabs/Game/Drops/Gold.prefab | 10 +- .../Prefabs/Game/Drops/HealthPotion.prefab | 10 +- assets/Media/Prefabs/Game/Drops/Magnet.prefab | 10 +- assets/Media/Prefabs/Game/Drops/XP.prefab | 14 +- .../Prefabs/Game/Effects/DamageFlash.prefab | 7 +- .../Prefabs/Game/Effects/PickBonus.prefab | 5 +- assets/Media/Prefabs/Game/Player.prefab | 45 +++- .../Projectiles/DiagonalProjectile.prefab | 5 +- .../Game/Projectiles/EnemyProjectile.prefab | 5 +- .../Game/Projectiles/HaloProjectile.prefab | 7 +- .../Projectiles/HorizontalProjectile.prefab | 5 +- .../Game/Projectiles/PlayerProjectile.prefab | 5 +- .../Prefabs/Game/Projectiles/ThrowAxe.prefab | 5 +- 23 files changed, 472 insertions(+), 484 deletions(-) create mode 100644 assets/Media/Images/auto-atlas.pac create mode 100644 assets/Media/Images/auto-atlas.pac.meta delete mode 100644 assets/Media/Images/background.png delete mode 100644 assets/Media/Images/background.png.meta diff --git a/assets/Media/Images/auto-atlas.pac b/assets/Media/Images/auto-atlas.pac new file mode 100644 index 0000000..39b3c02 --- /dev/null +++ b/assets/Media/Images/auto-atlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} diff --git a/assets/Media/Images/auto-atlas.pac.meta b/assets/Media/Images/auto-atlas.pac.meta new file mode 100644 index 0000000..40297f7 --- /dev/null +++ b/assets/Media/Images/auto-atlas.pac.meta @@ -0,0 +1,36 @@ +{ + "ver": "1.0.8", + "importer": "auto-atlas", + "imported": true, + "uuid": "c4872559-07b2-44e5-9613-5f22506b1989", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": true, + "powerOfTwo": true, + "algorithm": "MaxRects", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": true, + "removeTextureInBundle": true, + "removeImageInBundle": true, + "removeSpriteAtlasInBundle": true, + "compressSettings": {}, + "textureSetting": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "nearest", + "magfilter": "nearest", + "mipfilter": "none", + "anisotropy": 0 + } + } +} diff --git a/assets/Media/Images/background.png b/assets/Media/Images/background.png deleted file mode 100644 index f8e1cf940fbfb2226df253247745e298e4ffb988..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6691 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 P8E|o%;>q=IzIWoEG|6Y$ diff --git a/assets/Media/Images/background.png.meta b/assets/Media/Images/background.png.meta deleted file mode 100644 index 2b914df..0000000 --- a/assets/Media/Images/background.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.25", - "importer": "image", - "imported": true, - "uuid": "b522fec0-43ad-4f82-b496-79b67de5690e", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "b522fec0-43ad-4f82-b496-79b67de5690e@6c48a", - "displayName": "background", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "b522fec0-43ad-4f82-b496-79b67de5690e", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "displayName": "background", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 512, - "height": 512, - "rawWidth": 512, - "rawHeight": 512, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -256, - -256, - 0, - 256, - -256, - 0, - -256, - 256, - 0, - 256, - 256, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 512, - 512, - 512, - 0, - 0, - 512, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -256, - -256, - 0 - ], - "maxPos": [ - 256, - 256, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "b522fec0-43ad-4f82-b496-79b67de5690e@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.11", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": true, - "hasAlpha": true, - "redirect": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941" - } -} diff --git a/assets/Media/Prefabs/Game/Background/background-001.prefab b/assets/Media/Prefabs/Game/Background/background-001.prefab index 3fc331c..e95f2d3 100644 --- a/assets/Media/Prefabs/Game/Background/background-001.prefab +++ b/assets/Media/Prefabs/Game/Background/background-001.prefab @@ -50,13 +50,10 @@ "_components": [ { "__id__": 56 - }, - { - "__id__": 58 } ], "_prefab": { - "__id__": 60 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -198,7 +195,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -327,7 +327,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -456,7 +459,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -585,7 +591,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -714,7 +723,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -843,7 +855,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -972,7 +987,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1101,7 +1119,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1230,7 +1251,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1274,50 +1298,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a543e4ngZOuJDldEp7USz4" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 59 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 58, - "g": 58, - "b": 58, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3TST28D1MAYYNOTjXCu9X" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Background/background-002.prefab b/assets/Media/Prefabs/Game/Background/background-002.prefab index b7fe87d..4dfd648 100644 --- a/assets/Media/Prefabs/Game/Background/background-002.prefab +++ b/assets/Media/Prefabs/Game/Background/background-002.prefab @@ -53,13 +53,10 @@ "_components": [ { "__id__": 62 - }, - { - "__id__": 64 } ], "_prefab": { - "__id__": 66 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -201,7 +198,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -330,7 +330,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -459,7 +462,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -588,7 +594,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -717,7 +726,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -846,7 +858,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -975,7 +990,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1104,7 +1122,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1233,7 +1254,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1362,7 +1386,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1406,50 +1433,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a543e4ngZOuJDldEp7USz4" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 65 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 58, - "g": 58, - "b": 58, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3TST28D1MAYYNOTjXCu9X" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Background/background-003.prefab b/assets/Media/Prefabs/Game/Background/background-003.prefab index 29347f9..2888021 100644 --- a/assets/Media/Prefabs/Game/Background/background-003.prefab +++ b/assets/Media/Prefabs/Game/Background/background-003.prefab @@ -77,13 +77,10 @@ "_components": [ { "__id__": 110 - }, - { - "__id__": 112 } ], "_prefab": { - "__id__": 114 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -225,7 +222,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -354,7 +354,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -483,7 +486,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -612,7 +618,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -741,7 +750,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -870,7 +882,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -999,7 +1014,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1128,7 +1146,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1257,7 +1278,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1386,7 +1410,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1515,7 +1542,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1644,7 +1674,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1773,7 +1806,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1902,7 +1938,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2031,7 +2070,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2160,7 +2202,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2289,7 +2334,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2418,7 +2466,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2462,50 +2513,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a543e4ngZOuJDldEp7USz4" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 113 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 58, - "g": 58, - "b": 58, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3TST28D1MAYYNOTjXCu9X" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Background/background-004.prefab b/assets/Media/Prefabs/Game/Background/background-004.prefab index b25f715..a97a885 100644 --- a/assets/Media/Prefabs/Game/Background/background-004.prefab +++ b/assets/Media/Prefabs/Game/Background/background-004.prefab @@ -119,13 +119,10 @@ "_components": [ { "__id__": 194 - }, - { - "__id__": 196 } ], "_prefab": { - "__id__": 198 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -267,7 +264,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -396,7 +396,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -525,7 +528,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -654,7 +660,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -783,7 +792,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -912,7 +924,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1041,7 +1056,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1170,7 +1188,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1299,7 +1320,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1428,7 +1452,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1557,7 +1584,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1686,7 +1716,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1815,7 +1848,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1944,7 +1980,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2073,7 +2112,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2202,7 +2244,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2331,7 +2376,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2460,7 +2508,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2589,7 +2640,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2718,7 +2772,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2847,7 +2904,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2976,7 +3036,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3105,7 +3168,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3234,7 +3300,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3363,7 +3432,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3492,7 +3564,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3621,7 +3696,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3750,7 +3828,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -3879,7 +3960,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -4008,7 +4092,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -4137,7 +4224,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -4266,7 +4356,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -4310,50 +4403,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a543e4ngZOuJDldEp7USz4" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 197 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 58, - "g": 58, - "b": 58, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3TST28D1MAYYNOTjXCu9X" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Background/background-005.prefab b/assets/Media/Prefabs/Game/Background/background-005.prefab index d33d0d0..62e2e02 100644 --- a/assets/Media/Prefabs/Game/Background/background-005.prefab +++ b/assets/Media/Prefabs/Game/Background/background-005.prefab @@ -53,13 +53,10 @@ "_components": [ { "__id__": 62 - }, - { - "__id__": 64 } ], "_prefab": { - "__id__": 66 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -201,7 +198,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -330,7 +330,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -459,7 +462,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -588,7 +594,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -717,7 +726,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -846,7 +858,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -975,7 +990,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1104,7 +1122,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1233,7 +1254,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1362,7 +1386,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1406,50 +1433,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a543e4ngZOuJDldEp7USz4" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 65 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 58, - "g": 58, - "b": 58, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b522fec0-43ad-4f82-b496-79b67de5690e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3TST28D1MAYYNOTjXCu9X" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Drops/Chest.prefab b/assets/Media/Prefabs/Game/Drops/Chest.prefab index bfb1837..3a6d88b 100644 --- a/assets/Media/Prefabs/Game/Drops/Chest.prefab +++ b/assets/Media/Prefabs/Game/Drops/Chest.prefab @@ -186,7 +186,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -295,7 +298,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Drops/Gold.prefab b/assets/Media/Prefabs/Game/Drops/Gold.prefab index 302fd72..775d951 100644 --- a/assets/Media/Prefabs/Game/Drops/Gold.prefab +++ b/assets/Media/Prefabs/Game/Drops/Gold.prefab @@ -186,7 +186,10 @@ "_fillRange": 0, "_isTrimmedMode": false, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -295,7 +298,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Drops/HealthPotion.prefab b/assets/Media/Prefabs/Game/Drops/HealthPotion.prefab index be6ff8b..ea9e89a 100644 --- a/assets/Media/Prefabs/Game/Drops/HealthPotion.prefab +++ b/assets/Media/Prefabs/Game/Drops/HealthPotion.prefab @@ -186,7 +186,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -295,7 +298,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Drops/Magnet.prefab b/assets/Media/Prefabs/Game/Drops/Magnet.prefab index d6a879f..c198d5d 100644 --- a/assets/Media/Prefabs/Game/Drops/Magnet.prefab +++ b/assets/Media/Prefabs/Game/Drops/Magnet.prefab @@ -183,7 +183,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -264,7 +267,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Drops/XP.prefab b/assets/Media/Prefabs/Game/Drops/XP.prefab index 070f4b9..ed0f34b 100644 --- a/assets/Media/Prefabs/Game/Drops/XP.prefab +++ b/assets/Media/Prefabs/Game/Drops/XP.prefab @@ -176,7 +176,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -186,7 +186,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -285,7 +288,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -295,7 +298,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Effects/DamageFlash.prefab b/assets/Media/Prefabs/Game/Effects/DamageFlash.prefab index 6295107..56147dc 100644 --- a/assets/Media/Prefabs/Game/Effects/DamageFlash.prefab +++ b/assets/Media/Prefabs/Game/Effects/DamageFlash.prefab @@ -115,7 +115,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -125,7 +125,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Effects/PickBonus.prefab b/assets/Media/Prefabs/Game/Effects/PickBonus.prefab index 4b4d849..e7f2e73 100644 --- a/assets/Media/Prefabs/Game/Effects/PickBonus.prefab +++ b/assets/Media/Prefabs/Game/Effects/PickBonus.prefab @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Player.prefab b/assets/Media/Prefabs/Game/Player.prefab index 6e6a2e1..bfa48ce 100644 --- a/assets/Media/Prefabs/Game/Player.prefab +++ b/assets/Media/Prefabs/Game/Player.prefab @@ -186,7 +186,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -454,7 +457,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -635,7 +641,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1195,7 +1204,10 @@ "_fillRange": 1, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1494,7 +1506,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -1793,7 +1808,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2092,7 +2110,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2391,7 +2412,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -2690,7 +2714,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab index 183e4d5..ce24806 100644 --- a/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/EnemyProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/EnemyProjectile.prefab index ca15429..ca4c01e 100644 --- a/assets/Media/Prefabs/Game/Projectiles/EnemyProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/EnemyProjectile.prefab @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/HaloProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/HaloProjectile.prefab index a856fde..26a577e 100644 --- a/assets/Media/Prefabs/Game/Projectiles/HaloProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/HaloProjectile.prefab @@ -118,7 +118,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/HorizontalProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/HorizontalProjectile.prefab index 367ced2..ce35c48 100644 --- a/assets/Media/Prefabs/Game/Projectiles/HorizontalProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/HorizontalProjectile.prefab @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/PlayerProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/PlayerProjectile.prefab index 62e074f..700881a 100644 --- a/assets/Media/Prefabs/Game/Projectiles/PlayerProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/PlayerProjectile.prefab @@ -128,7 +128,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/Game/Projectiles/ThrowAxe.prefab b/assets/Media/Prefabs/Game/Projectiles/ThrowAxe.prefab index faee639..6af74b3 100644 --- a/assets/Media/Prefabs/Game/Projectiles/ThrowAxe.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/ThrowAxe.prefab @@ -264,7 +264,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, {