diff --git a/assets/resources/game/player/fk/skeleton.atlas b/assets/resources/game/player/fk/skeleton.atlas index 4fd3dd9a..62d1b55c 100644 --- a/assets/resources/game/player/fk/skeleton.atlas +++ b/assets/resources/game/player/fk/skeleton.atlas @@ -1,13 +1,34 @@ skeleton.png -size: 364,364 +size: 1271,324 format: RGBA8888 filter: Linear,Linear repeat: none -hero_background +hb_01 rotate: false xy: 2, 2 - size: 360, 360 - orig: 360, 360 + size: 320, 320 + orig: 320, 320 offset: 0, 0 index: -1 +hb_02 + rotate: false + xy: 645, 10 + size: 312, 312 + orig: 320, 320 + offset: 1, 4 + index: -1 +hb_03 + rotate: true + xy: 324, 2 + size: 320, 319 + orig: 320, 320 + offset: 0, 1 + index: -1 +hb_04 + rotate: false + xy: 959, 12 + size: 310, 310 + orig: 320, 320 + offset: 2, 8 + index: -1 diff --git a/assets/resources/game/player/fk/skeleton.atlas.meta b/assets/resources/game/player/fk/skeleton.atlas.meta index 519dde27..3b303483 100644 --- a/assets/resources/game/player/fk/skeleton.atlas.meta +++ b/assets/resources/game/player/fk/skeleton.atlas.meta @@ -2,7 +2,7 @@ "ver": "1.0.1", "importer": "*", "imported": true, - "uuid": "93685f85-d30e-4742-a5eb-8f0fb56c31ff", + "uuid": "38260c33-9864-45a7-8466-fbd9f5d6a7ad", "files": [ ".atlas", ".json" diff --git a/assets/resources/game/player/fk/skeleton.json b/assets/resources/game/player/fk/skeleton.json index 87d4df1d..5e50b22b 100644 --- a/assets/resources/game/player/fk/skeleton.json +++ b/assets/resources/game/player/fk/skeleton.json @@ -1,26 +1,50 @@ { "skeleton": { - "hash": "BFYpWuPyJPD1uLygF02DT/tWthE", + "hash": "BqkERUfZ1kQrwXEY5UeJd5+IgNo", "spine": "3.8.99", - "x": -180, - "y": -180, - "width": 360, - "height": 360, + "x": -170, + "y": -170, + "width": 320, + "height": 320, "images": "", "audio": "" }, "bones": [ - { "name": "root" } + { "name": "root", "x": -10, "y": -10 } ], "slots": [ - { "name": "hero_background", "bone": "root", "attachment": "hero_background" } + { "name": "hero_background", "bone": "root", "attachment": "hb_03" } ], "skins": [ { - "name": "default", + "name": "act", "attachments": { "hero_background": { - "hero_background": { "width": 360, "height": 360 } + "hb_03": { "name": "hb_02", "width": 320, "height": 320 } + } + } + }, + { + "name": "def", + "attachments": { + "hero_background": { + "hb_03": { "width": 320, "height": 320 } + } + } + }, + { + "name": "heath", + "attachments": { + "hero_background": { + "hb_03": { "name": "hb_04", "width": 320, "height": 320 } + } + } + }, + { + "name": "magic", + "attachments": { + "hero_background": { + "hb_03": { "name": "hb_01", "x": -0.1, "y": 0.19, "width": 320, "height": 320 } } } } diff --git a/assets/resources/game/player/fk/skeleton.json.meta b/assets/resources/game/player/fk/skeleton.json.meta index c8961c8b..220d4d35 100644 --- a/assets/resources/game/player/fk/skeleton.json.meta +++ b/assets/resources/game/player/fk/skeleton.json.meta @@ -2,7 +2,7 @@ "ver": "1.2.6", "importer": "spine-data", "imported": true, - "uuid": "c1f1dfb6-bc44-4ebc-82de-e61f9608087f", + "uuid": "52673d05-5225-4ac6-98e4-efe6494452ce", "files": [ ".json" ], diff --git a/assets/resources/game/player/fk/skeleton.png b/assets/resources/game/player/fk/skeleton.png index d50d4d20..60444402 100644 Binary files a/assets/resources/game/player/fk/skeleton.png and b/assets/resources/game/player/fk/skeleton.png differ diff --git a/assets/resources/game/player/fk/skeleton.png.meta b/assets/resources/game/player/fk/skeleton.png.meta index d11a4381..9dbd9e57 100644 --- a/assets/resources/game/player/fk/skeleton.png.meta +++ b/assets/resources/game/player/fk/skeleton.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "4d0e369e-dc9a-49c6-a047-b8a8bb5b49e2", + "uuid": "3669d8be-4c43-42b7-b9d0-fe990d77db8b", "files": [ ".json", ".png" @@ -10,7 +10,7 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "4d0e369e-dc9a-49c6-a047-b8a8bb5b49e2@6c48a", + "uuid": "3669d8be-4c43-42b7-b9d0-fe990d77db8b@6c48a", "displayName": "skeleton", "id": "6c48a", "name": "texture", @@ -19,10 +19,10 @@ "wrapModeT": "repeat", "minfilter": "linear", "magfilter": "linear", - "mipfilter": "nearest", + "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "4d0e369e-dc9a-49c6-a047-b8a8bb5b49e2", + "imageUuidOrDatabaseUri": "3669d8be-4c43-42b7-b9d0-fe990d77db8b", "visible": false }, "ver": "1.0.22", @@ -37,6 +37,6 @@ "hasAlpha": true, "type": "texture", "fixAlphaTransparencyArtifacts": false, - "redirect": "4d0e369e-dc9a-49c6-a047-b8a8bb5b49e2@6c48a" + "redirect": "3669d8be-4c43-42b7-b9d0-fe990d77db8b@6c48a" } } diff --git a/assets/resources/game/player/player.prefab b/assets/resources/game/player/player.prefab index 5869d3ec..32ec5b1d 100644 --- a/assets/resources/game/player/player.prefab +++ b/assets/resources/game/player/player.prefab @@ -250,8 +250,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.3, + "y": 0.3, "z": 1 }, "_mobility": 0, @@ -278,13 +278,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 360, - "height": 360 + "width": 320, + "height": 320 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "x": 0.53125, + "y": 0.53125 }, "_id": "" }, @@ -315,10 +315,10 @@ "a": 255 }, "_skeletonData": { - "__uuid__": "c1f1dfb6-bc44-4ebc-82de-e61f9608087f", + "__uuid__": "52673d05-5225-4ac6-98e4-efe6494452ce", "__expectedType__": "sp.SkeletonData" }, - "defaultSkin": "default", + "defaultSkin": "act", "defaultAnimation": "idle", "_premultipliedAlpha": false, "_timeScale": 1, diff --git a/assets/scene/main.scene b/assets/scene/main.scene index d35620e2..4abefec8 100644 --- a/assets/scene/main.scene +++ b/assets/scene/main.scene @@ -179,8 +179,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 640, - "y": 360, + "x": 360, + "y": 640, "z": 0 }, "_lrot": { @@ -265,7 +265,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 360, + "_orthoHeight": 640, "_near": 1, "_far": 2000, "_color": { @@ -311,8 +311,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1280, - "height": 720 + "width": 720, + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -432,6 +432,9 @@ "lightProbeInfo": { "__id__": 22 }, + "postSettings": { + "__id__": 23 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, @@ -494,6 +497,7 @@ "z": 0 }, "_distance": 0, + "_planeBias": 1, "_shadowColor": { "__type__": "cc.Color", "r": 0, @@ -576,5 +580,9 @@ "_showConvex": false, "_data": null, "_lightProbeSphereVolume": 1 + }, + { + "__type__": "cc.PostSettingsInfo", + "_toneMappingType": 0 } ] \ No newline at end of file