Merge branch '4.1-beta' into spine-godot

# Conflicts:
#	.gitignore
#	formatters/build.gradle
This commit is contained in:
Mario Zechner 2022-04-04 11:47:55 +02:00
commit d9e1d05e1b
955 changed files with 34857 additions and 60383 deletions

31
.gitignore vendored
View File

@ -60,13 +60,6 @@ spine-monogame/example/obj
spine-monogame/example/Content/bin/
spine-monogame/example/Content/obj/
spine-xna/bin
spine-xna/obj
spine-xna/example/bin
spine-xna/example/obj
spine-xna/example-content/obj/
spine-xna/.vs/
spine-unity/Assets/spine-csharp*
!spine-unity/Assets/spine-csharp/Place spine-csharp src here.*
!spine-unity/Assets/spine-csharp/add spine-csharp src here.*
@ -152,8 +145,22 @@ spine-ts/spine-canvas/dist
spine-ts/spine-webgl/dist
spine-ts/spine-player/dist
spine-ts/spine-threejs/dist
spine-godot/godot
spine-godot/spine_godot/spine-cpp
spine-godot/spine_godot/__pycache__
spine-godot/example/.import
spine-godot/spine_godot/*.o
spine-libgdx/gradle
spine-libgdx/gradlew
spine-libgdx/gradlew.bat
spine-monogame/packages
spine-monogame/spine-monogame/bin
spine-monogame/spine-monogame/obj
spine-monogame/spine-monogame-example/Content/bin
spine-monogame/spine-monogame-example/Content/obj
spine-monogame/spine-monogame-example/bin
spine-monogame/spine-monogame-example/obj
spine-libgdx/spine-libgdx/out
spine-libgdx/spine-skeletonviewer/out
spine-cocos2d-objc/cocos2d/
cmake-build-release
spine-cocos2dx/example-v4/build-ios
spine-cocos2dx/example-v4/build-macos
spine-cocos2dx/example/build-ios
spine-cocos2dx/example/proj.android/app/.cxx
spine-cocos2dx/example/build-win

View File

@ -1,3 +1,142 @@
# 4.1
## C
* **Additions**
* Support for sequences.
* Support for `shortestRotation` in animation state. See https://github.com/esotericsoftware/spine-runtimes/issues/2027.
* Added CMake parameter `SPINE_SANITIZE` which will enable sanitizers on macOS and Linux.
* Added `SPINE_MAJOR_VERSION`, `SPINE_MINOR_VERSION`, and `SPINE_VERSION_STRING`. Parsing skeleton .JSON and .skel files will report an error if the skeleton version does not match the runtime version.
* **Breaking changes**
* `spRegionAttachment` and `spMeshAttachment` now contain a `spTextureRegion*` instead of encoding region fields directly.
* `sp_AttachmentLoader_newRegionAttachment()` and `spAttachmentLoader_newMeshAttachment()` now take an additional `Sequence*` parameter.
* `spMeshAttachment_updateUVs()` was renamed to `spMeshAttachment_updateRegion()`.
* `spRegionAttachment_updateOffset()` was renamed to `spRegionAttachment_updateRegion()`, `spRegionAttachment_setUVs()` was merged into `spRegionAttachment_updateRegion()`.
* `spSlot_getAttachmentTime()` and `spSlot_setAttachmentTime()` have been removed.
* `spVertexAttachment->deformAttachment` was renamed to `spVertexAttachment->timelineAttachment`.
* `spSkeleton_update()` has been removed.
* `spSkeleton->time` has been removed.
### SFML
* Updated example to use SFML 2.5.1.
* Added dragon example.
## C++
* **Additions**
* Support for sequences.
* Support for `shortestRotation` in animation state. See https://github.com/esotericsoftware/spine-runtimes/issues/2027.
* Added CMake parameter `SPINE_SANITIZE` which will enable sanitizers on macOS and Linux.
* Added `SPINE_MAJOR_VERSION`, `SPINE_MINOR_VERSION`, and `SPINE_VERSION_STRING`. Parsing skeleton .JSON and .skel files will report an error if the skeleton version does not match the runtime version.
* **Breaking changes**
* `RegionAttachment` and `MeshAttachment` now contain a `TextureRegion*` instead of encoding region fields directly.
* `AttachmentLoader::newRegionAttachment()` and `AttachmentLoader::newMeshAttachment()` now take an additional `Sequence*` parameter.
* `MeshAttachment::updateUVs()` was renamed to `MeshAttachment::updateRegion()`.
* `RegionAttachment::updateOffset()` was renamed to `RegionAttachment::updateRegion()`, `RegionAttachment::setUVs()` was merged into `updateRegion()`.
* `Slot::getAttachmentTime()` and `Slot::setAttachmentTime()` have been removed.
* `VertexAttachment::getDeformAttachment()` was renamed to `VertexAttachment::getTimelineAttachment()`.
* `Skeleton::update()` has been removed.
* `Skeleton::getTime()` has been removed.
### Cocos2d-x
### SFML
* Updated example to use SFML 2.5.1.
* Added dragon example.
### UE4
* Updated example project to UE 4.27
## C# ##
* **Additions**
* Full support for sequences.
* Support for `shortestRotation` in animation state. See https://github.com/esotericsoftware/spine-runtimes/issues/2027.
* `RegionAttachment` and `MeshAttachment` now provide a `Region` property. Use this property instead of the removed `RendererObject` property (see section *Breaking Changes* below).
* **Breaking changes**
* Removed `RendererObject` property from `RegionAttachment` and `MeshAttachment`. Use `attachment.Region` property instead. Removed removed `IHasRendererObject` interface. Use `IHasTextureRegion` instead.
* Replaced `RegionAttachment.UpdateOffset` and `MeshAttachment.UpdateUVs` with `Attachment.UpdateRegion`. The caller must ensure that the attachment's region is not `null`.
* Removed `AttachmentRegionExtensions` methods `Attachment.SetRegion`, `MeshAttachment.SetRegion` and `RegionAttachment.SetRegion(region, update)`. Use `attachment.Region = region; if (update) attachment.UpdateRegion()` instead.
* `AttachmentLoader.NewRegionAttachment()` and `AttachmentLoader.NewMeshAttachment()` take an additional `Sequence` parameter.
* `VertexAttachment.DeformAttachment` property has been replaced with `VertexAttachment.TimelineAttachment`.
* `RegionAttachment.ComputeWorldVertices()` takes a `Slot` instead of a `Bone` as the first argument.
* Removed `Skeleton.Update(float deltaTime)` method.
* Removed `Slot.AttachmentTime` property.
* Removed extension method `AtlasRegion.GetSpineAtlasRect()` parameter `includeRotate` (with default value `true`). Most likely this method was never used with `includeRotate=false` in user code so no changes are required.
* `AtlasRegion.PackedWidth` and `AtlasRegion.PackedHeight` are swapped compared to 4.0 when packing rotation is equal to 90 degrees. Most likely this property was never accessed in user code so no changes are required.
### Unity
* **Officially supported Unity versions are 2017.1-2021.1**.
* **Additions**
* `SpineAtlasAsset.CreateRuntimeInstance` methods now provide an optional `newCustomTextureLoader` parameter (defaults to `null`) which can be set to e.g. `(a) => new YourCustomTextureLoader(a)` to use your own `TextureLoader` subclass instead of `MaterialsTextureLoader`.
* `SkeletonAnimation`, `SkeletonMecanim` and `SkeletonGraphic` now provide an Inspector parameter `Advanced` - `Animation Update` with modes `In Update` **(previous behaviour, the default)**, `In FixedUpdate` and `Manual Update`. This allows to update animation in `FixedUpdate` when using the `SkeletonRootMotion` component (which is the recommended combination now, issuing a warning otherwise). The reason is that when root motion leads to a collision with a physics collider, it can introduce jittery excess movement when updating animation in `Update` due to more `Update` calls following a single `FixedUpdate` call.
* Added `SkeletonRootMotion` properties `PreviousRigidbodyRootMotion` and `AdditionalRigidbody2DMovement`. Setting or querying these movement vectors can be necessary when multiple scripts call `Rigidbody2D.MovePosition` on the same object where the last call overwrites the effect of preceding ones.
* `BoneFollower` and `BoneFollowerGraphic` now provide an additional `Follow Parent World Scale` parameter to allow following simple scale of parent bones (rotated/skewed scale can't be supported).
* Improved `Advanced - Fix Prefab Override MeshFilter` property for `SkeletonRenderer` (and subclasses`SkeletonAnimation` and `SkeletonMecanim`), now providing an additional option to use a global value which can be set in `Edit - Preferences - Spine`.
* Timeline naming improvements: `Spine AnimationState Clip` Inspector parameter `Custom Duration` changed and inverted to `Default Mix Duration` for more clarity. Shortened all Timeline add track menu entries from: `Spine.Unity.Playables - <track type>` to `Spine - <track type>`, `Spine Animation State Track` to `SkeletonAnimation Track`, `Spine AnimationState Graphic Track` to `SkeletonGraphic Track`, and `Spine Skeleton Flip Track` to `Skeleton Flip Track`.
* Timeline track appearance and Inspector: Tracks now show icons and track colors to make them easier to distinguish. When a Track is selected, the Inspector now shows an editable track name which was previously only editable at the Timeline asset.
* Added example component `SkeletonRenderTexture` to render a `SkeletonRenderer` to a `RenderTexture`, mainly for proper transparency. Added an example scene named `RenderTexture FadeOut Transparency` that demonstrates usage for a fadeout transparency effect.
* Added another fadeout example component named `SkeletonRenderTextureFadeout` which takes over transparency fadeout when enabled. You can use this component as-is, attach it in disabled state and enable it to start a fadeout effect.
* Timeline clips now offer an additional `Alpha` parameter for setting a custom constant mix alpha value other than 1.0, just as `TrackEntry.Alpha`. Defaults to 1.0.
* **Breaking changes**
* **Changes of default values**
* **Deprecated**
* **Restructuring (Non-Breaking)**
### XNA/MonoGame
* **Breaking change**: Removed spine-xna in favor of spine-monogame. See https://github.com/EsotericSoftware/spine-runtimes/issues/1949
* Added new spine-monogame solution. See [spine-monogame/README.md](spine-monogame/README.md) for updated instructions on how to use spine-monogame.
## Java
* **Additions**
* Support for `shortestRotation` in animation state. See https://github.com/esotericsoftware/spine-runtimes/issues/2027.
* Support for sequences.
* **Breaking changes**
* `AttachmentLoader#newRegionAttachment()` and `AttachmentLoader#newMeshAttachment()` take an additional `Sequence` parameter.
* `Slot#setAttachmentTime()` and `Slot#getAttachmentTime()` have been removed.
* `VertexAttachment#setDeformAttachment()` and `VertexAttachment#getDeformAttachment()` have been replaced with `VertexAttachment#setTimelineAttachment()` and `VertexAttachment#getTimelineAttachment()`.
* `RegionAttachment#updateOffset()` has been renamed to `RegionAttachment#updateRegion()`. The caller must ensure that the attachment's region is not `null`.
* `RegionAttachment#computeWorldVertices()` takes a `Slot` instead of a `Bone` as the first argument.
### libGDX
* `spine-libgdx`, `spine-libgdx-tests`, and `spine-skeletonviewer` are now fully Gradle-ified.
* `spine-skeletonviewer` now supports quickly loading skeletons by dragging and dropping `.json` or `.skel` skeleton files onto the window.
## Typescript/Javascript
* **Additions**
* full support for sequences.
* Added `Promise` based `AssetManager.loadAll()`. Allows synchronous waiting via `await assetManager.loadAll()`, simplifying loader logic in applications.
* Support for `shortestRotation` in animation state. See https://github.com/esotericsoftware/spine-runtimes/issues/2027.
* Full support for sequences.
* **Breaking changes**
* `AttachmentLoader#newRegionAttachment()` and `AttachmentLoader#newMeshAttachment()` take an additional `Sequence` parameter.
* `Slot#attachmentTime` and has been removed.
* `VertexAttachment#deformAttachment` has been replaced with `VertexAttachment#timelineAttachment`.
* `RegionAttachment#updateOffset()` has been renamed to `RegionAttachment#updateRegion()`. The caller must ensure that the attachment's region is not `null`.
* `RegionAttachment#computeWorldVertices()` takes a `Slot` instead of a `Bone` as the first argument.
* Removed `PlayerEditor`.
### WebGL backend
* `PolygonBatcher.start()` now disables culling and restores the previous state on `PolygonBatcher.end()`.
* Added `SpineCanvas`, a simpler way to render a scene via spine-webgl. See `spine-ts/spine-webgl/examples/barebones.html` and `spine-ts/spine-webgl/examples/mix-and-match.html`.
### Canvas backend
* Improved example.
### Three.js backend
* Added orbital controls to THREJS example.
* `SkeletonMesh` takes an optional `SkeletonMeshMaterialCustomizer`, allowing modification of materials used by `SkeletonMesh`.
* Added `SkeletonMeshMaterial.alphaTest`, when > 0, alpha testing will be performed and fragments will not be written to the depth buffer, if depth writes are enabled.
### Player
* Added `SpinePlayer.dispose()` to explicitely dispose of all resources the player holds on to.
# 4.0
## AS3
@ -63,7 +202,7 @@
* Generated normals are now correctly flipped for back faces.
* Modifying parent materials updates material instances accordingly.
* Only `.json` files that are actually encoding Spine skeletons will be loaded. Other `.json` files will be left to other importers.
* Updated example project to UE 4.25.
* Updated example project to UE 4.27.
## C# ##
@ -110,7 +249,7 @@
* Fixed Timeline not pausing (and resuming) clip playback on Director pause, this is now the default behaviour. If you require the old behaviour (e.g. to continue playing an idle animation during Director pause), there is now an additional parameter `Don't Pause with Director` provided that can be enabled for each Timeline clip.
* Fixed Timeline `Spine AnimationState Clips` ignoring empty space on the Timeline after a clip's end. Timeline clips now also offer `Don't End with Clip` and `Clip End Mix Out Duration` parameters if you prefer the old behaviour of previous versions. By default when empty space follows the clip on the timeline, the empty animation is set on the track with a MixDuration of `Clip End Mix Out Duration`. Set `Don't End with Clip` to `true` to continue playing the clip's animation instead and mimic the old 3.8 behaviour. If you prefer pausing the animation instead of mixing out to the empty animation, set `Clip End Mix Out Duration` to a value less than 0, then the animation is paused instead.
* **Additions**
* **Additions and Improvements**
* Additional **Fix Draw Order** parameter at SkeletonRenderer, defaults to `disabled` (previous behaviour).
Applies only when 3+ submeshes are used (2+ materials with alternating order, e.g. "A B A").
If `true`, MaterialPropertyBlocks are assigned at each material to prevent aggressive batching of submeshes
@ -159,6 +298,13 @@
* Prefabs containing `SkeletonRenderer`, `SkeletonAnimation` and `SkeletonMecanim` now provide a proper Editor preview, including the preview thumbnail.
* `SkeletonRenderer` (and subclasses`SkeletonAnimation` and `SkeletonMecanim`) now provide a property `Advanced - Fix Prefab Override MeshFilter`, which when enabled fixes the prefab always being marked as changed. It sets the MeshFilter's hide flags to `DontSaveInEditor`. Unfortunately this comes at the cost of references to the `MeshFilter` by other components being lost, therefore this parameter defaults to `false` to keep the safe existing behaviour.
* `BoundingBoxFollower` and `BoundingBoxFollowerGraphic` now provide previously missing `usedByEffector` and `usedByComposite` parameters to be set at all generated colliders.
* `BoneFollower` and `BoneFollowerGraphic` now provide an additional `Follow Parent World Scale` parameter to allow following simple scale of parent bones (rotated/skewed scale can't be supported).
* Improved `Advanced - Fix Prefab Override MeshFilter` property for `SkeletonRenderer` (and subclasses`SkeletonAnimation` and `SkeletonMecanim`), now providing an additional option to use a global value which can be set in `Edit - Preferences - Spine`.
* Timeline naming improvements: `Spine AnimationState Clip` Inspector parameter `Custom Duration` changed and inverted to `Default Mix Duration` for more clarity. Shortened all Timeline add track menu entries from: `Spine.Unity.Playables - <track type>` to `Spine - <track type>`, `Spine Animation State Track` to `SkeletonAnimation Track`, `Spine AnimationState Graphic Track` to `SkeletonGraphic Track`, and `Spine Skeleton Flip Track` to `Skeleton Flip Track`.
* Timeline track appearance and Inspector: Tracks now show icons and track colors to make them easier to distinguish. When a Track is selected, the Inspector now shows an editable track name which was previously only editable at the Timeline asset.
* Added example component `SkeletonRenderTexture` to render a `SkeletonRenderer` to a `RenderTexture`, mainly for proper transparency. Added an example scene named `RenderTexture FadeOut Transparency` that demonstrates usage for a fadeout transparency effect.
* Added another fadeout example component named `SkeletonRenderTextureFadeout` which takes over transparency fadeout when enabled. You can use this component as-is, attach it in disabled state and enable it to start a fadeout effect.
* Timeline clips now offer an additional `Alpha` parameter for setting a custom constant mix alpha value other than 1.0, just as `TrackEntry.Alpha`. Defaults to 1.0.
* **Changes of default values**
@ -232,6 +378,8 @@
### Three.js backend
* `SkeletonMesh` now takes an optional `SkeletonMeshMaterialParametersCustomizer` function that allows you to modify the `ShaderMaterialParameters` before the material is finalized. Use it to modify things like THREEJS' `Material.depthTest` etc. See #1590.
* **Breaking change:** the global object `spine.canvas` no longer exists. All classes and functions are now exposed on the global `spine` object directly. Simply replace any reference to `spine.threejs.` in your source code with `spine.`.
* **Breaking change:** the default fragment shader of `SkeletonMeshMaterial` now explicitely discards fragments with alpha < 0.5. See https://github.com/EsotericSoftware/spine-runtimes/issues/1985
* **Breaking change:** reversal of the previous breaking change: the default fragment shader of `SkeletonMeshMaterial` does no longer discard fragments with alpha < 0.5. Pass a `SkeletonMeshMaterialParametersCustomizer` to the `SkeletonMesh` constructor, and modify `parameters.alphaTest` to be > 0.
### Player
* Added `SpinePlayerConfig.rawDataURIs`. Allows to embed data URIs for skeletons, atlases and atlas page images directly in the HTML/JS without needing to load it from a separate file. See the example for a demonstration.
@ -240,6 +388,7 @@
* Added `SpinePlayerConfig.draw`. If set, the callback is called each frame, just after the skeleton is drawn.
* Added `SpinePlayerConfig.downloader`. The `spine.Downloader` instance can be shared between players so assets are only downloaded once.
* If `SpinePlayerConfig.jsonURL` ends with an anchor, the anchor text is used to find the skeleton in the specified JSON file.
* Added `SpinePlayer.dispose()`, disposes all CPU and GPU side resources, removes all listeners, and removes the player DOM from the parent.
# 3.8
@ -625,6 +774,8 @@
* Added `MeshAttachment#newLinkedMesh()`, creates a linked mesh linkted to either the original mesh, or the parent of the original mesh.
* Added IK softness.
* Added `AssetManager.setRawDataURI(path, data)`. Allows to embed data URIs for skeletons, atlases and atlas page images directly in the HTML/JS without needing to load it from a separate file.
* Added `AssetManager.loadAll()` to allow Promise/async/await based waiting for completion of asset load. See the `spine-canvas` examples.
* Added `Skeleton.getBoundRect()` helper method to calculate the bouding rectangle of the current pose, returning the result as `{ x, y, width, height }`. Note that this method will create temporary objects which can add to garbage collection pressure.
### WebGL backend
* `Input` can now take a partially defined implementation of `InputListener`.
@ -867,6 +1018,7 @@ This will automatically:
* Support for audio events, see `audioPath`, `volume` and `balance` fields on event (data).
* `TrackEntry` has an additional field called `holdPrevious`. It can be used to counter act a limitation of `AnimationState` resulting in "dipping" of parts of the animation. For a full discussion of the problem and the solution we've implemented, see this [forum thread](http://esotericsoftware.com/forum/Probably-Easy-Animation-mixing-with-multiple-tracks-10682?p=48130&hilit=holdprevious#p48130).
* Added `AssetManager#setRawDataURI(path, data)`. Allows to set raw data URIs for a specific path, which in turn enables embedding assets into JavaScript/HTML.
* `PolygonBatcher` will now disable `CULL_FACE` and restore the state as it was before rendering.
### WebGL backend
* Added `VertexEffect` interface, instances of which can be set on `SkeletonRenderer`. Allows to modify vertices before submitting them to GPU. See `SwirlEffect`, `JitterEffect`, and the example which allows to set effects.

View File

@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.17)
project(spine)
set(CMAKE_INSTALL_PREFIX "./")
set(CMAKE_VERBOSE_MAKEFILE ON)
set(SPINE_SFML FALSE CACHE BOOL FALSE)
set(SPINE_SANITIZE FALSE CACHE BOOL FALSE)
if(MSVC)
message("MSCV detected")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
@ -8,13 +13,12 @@ if(MSVC)
else()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Werror -Wextra -pedantic -Wnonportable-include-path -Wshadow -std=c89")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Werror -Wextra -Wnon-virtual-dtor -pedantic -Wnonportable-include-path -Wshadow -std=c++11 -fno-exceptions -fno-rtti")
endif()
set(CMAKE_INSTALL_PREFIX "./")
set(CMAKE_VERBOSE_MAKEFILE ON)
set(SPINE_SFML FALSE CACHE BOOL FALSE)
set(SPINE_COCOS2D_OBJC FALSE CACHE BOOL FALSE)
set(SPINE_COCOS2D_X FALSE CACHE BOOL FALSE)
if (${SPINE_SANITIZE})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined")
endif()
endif()
if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
add_subdirectory(spine-c)
@ -23,15 +27,5 @@ if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
add_subdirectory(spine-sfml/cpp)
endif()
if((${SPINE_COCOS2D_OBJC}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-cocos2d-objc"))
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_subdirectory(spine-cocos2d-objc)
endif()
endif()
if((${SPINE_COCOS2D_X}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-cocos2dx"))
add_subdirectory(spine-cocos2dx)
endif()
# add_subdirectory(spine-c/spine-c-unit-tests)
add_subdirectory(spine-cpp/spine-cpp-unit-tests)

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "zgiHK9o7sFk",
"spine": "4.0.31",
"hash": "F735snjE3r4",
"spine": "4.1.23-beta",
"x": -191.3,
"y": -4.51,
"width": 365.79,
@ -245,24 +245,24 @@
},
"eye": {
"attachment": [
{ "time": 1.3667, "name": null }
{ "time": 1.3667 }
]
},
"eye-highlight": {
"attachment": [
{ "time": 1.3667, "name": null }
{ "time": 1.3667 }
]
},
"eye-pupil": {
"attachment": [
{ "time": 1.3667, "name": null }
{ "time": 1.3667 }
]
},
"head": {
"attachment": [
{ "time": 0.2333, "name": "burst01" },
{ "time": 0.4667, "name": "burst02" },
{ "time": 1.3667, "name": null }
{ "time": 1.3667 }
]
},
"splat01": {
@ -279,7 +279,7 @@
{ "time": 1.3667, "name": "splat01" },
{ "time": 1.5667, "name": "splat02" },
{ "time": 1.7333, "name": "splat03" },
{ "time": 1.8667, "name": null }
{ "time": 1.8667 }
]
}
},
@ -739,7 +739,7 @@
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},
@ -853,7 +853,7 @@
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},
@ -1037,7 +1037,7 @@
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 KiB

After

Width:  |  Height:  |  Size: 450 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "tnPDOU8oIi0",
"spine": "4.0.31",
"hash": "UmVPCRBPHcg",
"spine": "4.1.23-beta",
"x": -191.3,
"y": -4.51,
"width": 368.26,
@ -452,7 +452,7 @@
{ "time": 1.9333, "color": "ffffff40" }
],
"attachment": [
{ "name": null },
{},
{ "time": 0.3, "name": "eye-highlight" }
]
},
@ -496,13 +496,13 @@
"attachment": [
{ "time": 1.3, "name": "splat01" },
{ "time": 1.4, "name": "splat02" },
{ "time": 1.5, "name": null }
{ "time": 1.5 }
]
},
"splat-fg": {
"attachment": [
{ "time": 1.2667, "name": "splat01-fg" },
{ "time": 1.4, "name": null },
{ "time": 1.4 },
{ "time": 1.5, "name": "splat03" }
]
}
@ -1207,10 +1207,11 @@
{ "time": 1.2667, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
]
},
"deform": {
"attachments": {
"default": {
"burst-bg": {
"burst03-bg": [
"burst03-bg": {
"deform": [
{
"time": 1.3,
"offset": 46,
@ -1241,9 +1242,11 @@
"vertices": [ -158.85898, -157.88821, -222.41895, -171.88745, -265.61752, -163.54323, -295.0162, -162.22234, -298.79596, -131.13844, -362.79938, -138.7018, -433.25107, -98.61046, -477.58896, -33.0961, -464.7487, -16.99556, -455.00192, -4.77399, -462.6796, 4.09592, -465.00198, 23.43459, -452.06088, 17.27241, -418.03323, 32.78734, -397.86447, 53.22706, -423.10776, 55.14351, -445.94412, 15.30367, -485.93863, -8.62939, -511.99594, 3.77512, -526.6751, 57.78288, -498.78177, 71.13768, -459.2037, 145.88376, -421.043, 175.42703, -366.40555, 168.70264, -264.10452, 171.92749, -141.5528, 149.22067, -92.10904, 46.08691, -65.08963, -65.75665, -64.51958, -100.73477, -57.10714, -135.81528, -63.258, -136.1058, -166.01343, -130.57944, -110.04475, -140.76263, -155.05429, -88.68021, -270.2941, -110.81262, -420.71603, -12.59779, -378.2645, 55.97136, -471.31558, 44.54113, -439.99777, 98.30469, -410.42368, 110.83441, -376.80576, 107.88126, -360.46457, -47.26363, -381.6778, -75.78871, -260.41815, -159.90727, -228.69894, -152.92683, -221.67581, -132.34021, -132.3599, -116.78691, -109.39954, -110.22609, -104.19286, -96.19125 ]
}
]
}
},
"eye-pupil": {
"eye-pupil": [
"eye-pupil": {
"deform": [
{ "time": 1.9311 },
{
"time": 1.9333,
@ -1251,9 +1254,11 @@
"vertices": [ 4.47624, 1.75668, -5.43562, -0.09229, -6.1716, -0.11565, 3.39568, 0.18896 ]
}
]
}
},
"eye-stalk": {
"eye-stalk": [
"eye-stalk": {
"deform": [
{
"time": 1.3,
"vertices": [ -13.55461, 3.64995, -13.55461, 3.64995, -13.55461, 3.64995, -13.55461, 3.64995, -13.55461, 3.64995, -13.55461, 3.64995, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, 2.29017, -13.84904, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, 6.15363, -12.61681, -13.55461, 3.64995, 12.05962, -7.1837, 9.50334, -10.33129, -13.55461, 3.64995, 12.05962, -7.1837, -13.55461, 3.64995, -13.55461, 3.64995 ]
@ -1271,9 +1276,11 @@
"vertices": [ -9.31314, -0.35416, -9.31314, -0.35416, -9.31314, -0.35416, -9.31314, -0.35416, -9.31314, -0.35416, -9.31314, -0.35416, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, 0.05828, -10.43551, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, 0.41592, -9.66072, -9.31314, -0.35416, 6.37309, -3.86795, 2.92618, -7.13972, -9.31314, -0.35416, 6.37309, -3.86795, -9.31314, -0.35416, -9.31314, -0.35416 ]
}
]
}
},
"eyeball": {
"eye": [
"eye": {
"deform": [
{ "time": 1.9234 },
{
"time": 1.9333,
@ -1293,16 +1300,20 @@
"vertices": [ 3.24275, 7.91407, -10.90369, 19.33402, -18.24174, 22.2739, -30.77019, 23.47581, -33.87926, 23.45443, -38.95153, 23.98627, -34.9502, 18.64992, -30.14416, 12.82236, -20.97651, 2.92524, -14.81287, 0.26187, -2.10858, 1.39288, -1.74232, 1.39981, -0.33504, 1.14755, 1.22828, 0.86729, 2.52186, 0.44093, 3.74653, 0.03722, 4.60654, -0.45946, 5.45589, -0.94996, 5.53217, -1.3887, 5.6108, -1.84122, 4.8163, -2.14865, 4.06898, -2.43792, -11.13084, -0.60674, -11.13115, -0.60712, -25.47261, 11.38448, -25.47296, 11.38448, -31.46003, 19.05132, -31.4604, 19.05161, -27.36235, 20.51298, -27.36279, 20.51315, -9.49651, 17.27551, -9.49667, 17.27538, -0.40323, 5.37477, -0.40364, 5.37405, 3.24374, -2.20052, 3.24379, -2.20058, 4.61343, -1.71692, 4.61352, -1.717, 4.41793, -0.95703, 4.41801, -0.95714, 3.15983, -0.14434, 3.15992, -0.14439, 0.83397, 0.60798, 0.83404, 0.6078, -1.96106, 1.21719, -1.96115, 1.21683, 3.92605, -1.95956, 3.92619, -1.95968, 4.52572, -1.37605, 4.52586, -1.37612, 3.78548, -0.54843, 3.78557, -0.5485, 1.99743, 0.23164, 1.99757, 0.23158, -0.27251, 0.78668, -0.27241, 0.78658, -1.80754, 1.19403, -1.80772, 1.19377, -19.09809, 2.46482, -19.09858, 2.46502, -28.60839, 15.39989, -28.60876, 15.40005, -29.13958, 19.87903, -29.1399, 19.87918, -16.33226, 19.23055, -16.33257, 19.23074, -1.51704, 11.7206, -4.92833, 11.02434, -4.92876, 11.0241, 1.4674, -1.45463, 0.75603, -1.12101, 0.75596, -1.12132, -8.55228, 8.23908, -8.55267, 8.23903, 1.20663, -0.8295, 1.20665, -0.83001, 1.4439, -0.86632, 1.44389, -0.86688, 0.74517, -0.46391, 0.74515, -0.46432, -0.4279, 0.16244, -0.42794, 0.16207, -2.09786, 1.05663, -2.09795, 1.05634, -3.90304, 0.99792, -3.90348, 0.99728, -8.0176, 3.28572, -8.01794, 3.28543, -10.92476, 5.07293, -10.92514, 5.0727, -14.40496, 7.53363, -14.40521, 7.53322, -18.1622, 10.59957, -18.16252, 10.59935, -22.38956, 14.13091, -22.38988, 14.13076, -24.60171, 16.46433, -24.60199, 16.46445, -25.20555, 17.09343, -25.20588, 17.09342, -22.75626, 17.1347, -22.75659, 17.13467, -21.20954, 17.0104, -21.20993, 17.01039, -17.62271, 16.1749, -17.62304, 16.1748, -15.49942, 15.71741, -15.49973, 15.71711, -11.04413, 13.37115, -11.04425, 13.37096, -8.16751, 11.73045, -8.16785, 11.73016, -4.56702, 9.33353, -4.56739, 9.33321, -1.3697, 7.00007, -1.37008, 6.99982, -2.7477, 1.81529, -2.74784, 1.815, -0.29255, -0.23069, -0.29261, -0.23111, 0.42445, -0.52553, 0.42439, -0.52595 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{},
{
"time": 0.2,
"vertices": [ 13.75111, 4.85142, 24.32014, 1.12376, 26.01038, 9.53201, 30.68427, 18.44095, 24.90535, 25.67038, 8.98901, 37.05399, 1.21941, 32.73833, 2.0E-5, 1.0E-5, 2.0E-5, 2.0E-5, 1.0E-5, 2.0E-5, 0, 1.0E-5, 0, 1.0E-5, 0, 0, 0, 0, -6.6898, 9.80194, -5.05742, 9.26561, -4.96629, 11.48915, -6.59993, 23.32903, -12.01232, 20.66869, -16.25858, 19.40443, -12.71413, 14.54102, -5.93674, 14.7163, 0.11565, 15.91503, 5.36177, 14.31557, 4.48566, -2.46352, -1.42722, -2.03418, -1.0E-5, 0, 0, 0, -3.61057, 7.04752, -3.51703, 9.89339, 30.78316, 3.77597, 79.82353, 18.92043, 55.77951, 17.95429, 50.40761, 34.94055, 50.55713, 39.23791, 61.27519, 44.92727, 79.54408, 32.56362, 18.54898, 18.91411, 6.64247, 30.16319, -16.43497, 10.62154, -13.17729, 14.75938, 51.7993, -0.26025, 18.34035, 2.16159, 28.03456, 7.0585, 3.33049, -2.35816, 2.00232, 0.76244, 11.03924, 5.39703, 31.70125, 3.61331, 19.72183, 2.9424, -3.03603, 7.64153, 1.0E-5, 1.0E-5, 25.98085, 4.27312, 8.4198, 0.44305, -6.60401, -1.06753, 0, 0, 0, 0, 4.6051, 0.5287, 9.93486, 10.03566, 27.98062, 7.05276, 38.33069, 6.80178, 31.15146, 9.09935, 12.24789, 4.55832, 11.94951, 6.85835, 17.77548, 7.54866, 30.17921, -0.17654, 38.40248, 6.66553, 28.92384, 10.24368, 16.81825, 6.69662, 9.21013, 1.0574, 2.04581, -0.27795, 13.95413, 15.73528, -1.43007, 0.10522, -2.08388, 0.08258, 0, 0, 1.17355, 0.34741, 18.39603, 0.88033, 0, 0, 11.41278, 11.51308, -2.88608, 1.10176, -1.57054, -0.07635, -0.16765, -0.08842, 0, 0, 7.97186, 1.1478, 3.2681, 4.46464, 36.27831, 5.03716, 36.27831, 5.03716, 36.66379, 8.15264, 37.1739, 6.85481, -1.85954, 3.00225, 23.87404, 7.3959, -1.38234, 0.20156, -2.22337, -0.03172, -1.65433, -0.1206, -2.57883, -0.60804, -0.02429, 1.84338, -2.52748, 0.95428, -1.16122, 0.25819, 6.62007, 11.85163, 4.22813, 10.46403, 0, 0, -1.81659, 32.37084, 9.25679, 35.75591, 26.71053, 23.73249, 32.4342, 19.81351, 29.77367, 7.60575, 24.80023, 8.73225, 13.30579, 10.78311, -0.70573, 5.85449, -1.23865, 14.09991, -15.53979, 14.14754, -18.412, 20.94823 ]
}
],
"burst01": [
]
},
"burst01": {
"deform": [
{
"time": 0.2333,
"offset": 44,
@ -1316,8 +1327,10 @@
"time": 0.4667,
"vertices": [ 47.3049, 21.76485, 44.40627, 28.47404, 32.26791, 28.0729, 18.77591, 24.64358, 0, 0, 6.15318, 19.76164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.83234, 1.5144, 0, 0, 1.38036, 15.13052, 13.86705, 6.80511, 23.11638, -0.14884, 36.52461, 5.81176, 32.60052, 0.97962, 52.92517, 6.02301, 52.29893, 22.37827, 45.13234, -1.49643, 0.36846, 31.73622, 8.76564, 33.39234, 19.31503, 51.92636, 27.37635, 46.68877, 60.23064, -22.43886, 59.06487, -24.12051, 49.56319, -12.64415, 43.6768, 0.30326, 12.26945, 22.01128, 6.19104, 43.16184, 7.63224, 51.85173, 13.32143, 61.85971, 44.21729, 75.05798, 66.24655, 56.87083, 73.01474, 36.15078, 75.04478, -0.78735, 69.30954, -11.74341, 6.99788, 18.18582, 20.0443, 26.86685, 22.80408, 30.99572, 22.46033, 35.27834, 43.01311, 31.46513, 52.07494, 22.3883, 45.20529, -2.49372, 17.27682, -13.33767, 53.83313, 18.04973, 39.67324, 20.46646, 46.62216, -6.53596, 25.05461, 16.29762, 16.19243, 53.46538, 29.99724, 40.46952, 53.40778, 24.69133, 19.21873, 53.70358, -0.95757, 3.02103, -0.80464, -0.22341, 21.79544, 9.35772, -3.54565, -0.69027, 2.67444, -1.88193, 2.61572, 9.03735, 29.46332, 45.87617, 15.63039, 50.60509, 8.84979, 30.49088, 45.61912, -5.54185, 47.36246, -9.72351, 47.37259, -12.98466, 52.4026, -20.54906, 51.18359, -17.02686, 57.92318, -20.2846, 70.05144, -15.06292, 75.13141, -2.89599, 76.28175, 13.67413, 72.22368, 36.26307, 70.05863, 43.86377, 69.19043, 56.41232, 45.50443, 74.99865, 35.11581, 75.36394, 27.88362, 73.4762, 12.33069, 64.75158, 5.57372, 55.85366, 7.07925, 54.42634, 8.14337, 49.23374, 5.74281, 45.68628, 3.89062, 35.15369, 8.62836, 20.24689, 4.20003, 32.71037, 9.8178, 48.15385, 6.48223, 52.38819, 26.69831, 72.78359, 46.9562, 72.12347, 71.15749, 42.74264, 76.62032, 14.9936, 64.92282, 12.31555, 57.53946, 30.24706, 47.98927, 51.2152, 42.25758, 65.78861, 37.15187, 71.33881, 14.4293, 57.7468, 12.64787, 59.88387, 13.97566, 66.32811, 16.70258, 68.19404, 21.57089, 68.13657, 38.05918, 62.8656, 44.90455, 46.17664, 51.12674, 27.31055, 59.68296, 10.3176 ]
}
],
"burst02": [
]
},
"burst02": {
"deform": [
{},
{
"time": 0.4667,
@ -1336,8 +1349,10 @@
"time": 1.2667,
"vertices": [ -0.60118, 40.21666, 13.21951, 39.18164, 29.47369, 45.0315, 56.76008, 32.39156, 63.27009, 21.81733, 62.03564, 15.01811, 64.11848, -1.57637, 62.48392, -5.05509, 62.0004, -3.32251, 53.43962, -21.25206, 49.83433, -22.08006, 26.56342, -42.88687, 6.75268, -37.41826, 11.62914, -34.05639, 3.79571, -30.49985, 1.76681, -5.8581, 3.41879, -2.25661, 0, 0, 0, 0, 0, 1.0E-5, 0, 0, 0, 0, 20.66207, 1.18949, -38.5212, -16.28236, -28.98003, 29.90348, 2.0E-5, 2.0E-5, 54.44005, -6.72733, 76.40656, 18.00246, 72.74952, 28.6037, 61.75354, 48.36436, 52.07378, 54.99824, 44.73683, 49.02092, 38.58128, 33.86156, 43.56477, 18.99028, 49.0436, 2.25867, 58.29994, -10.54558, 67.76347, -17.15362, 75.02335, -17.88821, 79.06823, -10.23586, 79.9537, 0.7427, 61.61975, 50.98802, 56.37247, 56.29552, 57.21532, 52.81435, 47.85279, 54.11208, 43.02682, 42.18958, 42.66728, 27.4078, 68.10815, 38.25859, 45.63157, 9.92648, 53.55116, -5.10542, 63.43682, -14.96118, 71.54783, -17.55838, 77.39485, -13.83996, 79.59405, -5.05167, 78.67317, 8.41954, 51.17966, 58.6673, 46.29943, 57.67178, 42.59077, 52.48447, 40.6232, 44.98309, 40.39751, 36.26408, 40.96192, 28.17683, 41.85824, 19.31689, 44.05618, 9.44077, 52.41975, -6.643, 58.35233, -13.4062, 63.75209, -17.73891, 68.67623, -20.59882, 72.70447, -21.37257, 76.00245, -20.44646, 76.86877, -16.17442, 78.71053, -12.37278, 80.48174, -7.37115, 81.70876, -0.96352, 80.67078, 7.40256, 76.75462, 20.30871, 74.09646, 29.57249, 68.3063, 41.31281, 59.06873, 14.56583, 60.39012, 23.31939, 51.33841, 32.70986, 32.27072, 41.44254, 15.71152, 37.21485, 6.32091, 36.14613, -22.47176, 26.23696, -28.75047, -8.63012, 2.37231, -1.98877, 61.72414, 16.07718, 64.43069, 2.65221, 66.21148, 1.35978, 67.08562, 0.58398, 57.63603, -20.88151, 52.01707, -22.67115, 28.06324, -40.17508, 13.56615, -35.38068, 12.38645, -33.03455, 4.29317, -28.45454, 9.75845, -17.98366 ]
}
],
"burst03-fg": [
]
},
"burst03-fg": {
"deform": [
{ "time": 1.3 },
{
"time": 1.3333,
@ -1376,9 +1391,11 @@
"vertices": [ -108.63416, -124.91017, -133.87291, -124.251, -142.6294, -115.84753, -143.20923, -102.44234, -148.82416, -70.71955, -137.87033, -52.09589, -131.98907, -38.28564, -115.27725, -15.78029, -90.57693, 4.81735, -77.80376, 33.6158, -117.11124, 18.6396, -132.88025, 12.79369, -166.30356, 17.1678, -202.37338, 33.99169, -248.4867, 39.35126, -298.22083, 35.41038, -342.2739, 38.15667, -376.2425, 57.15323, -394.76685, 89.66321, -396.4634, 117.82472, -366.11874, 131.6904, -350.1521, 145.58844, -337.18158, 136.10063, -322.84595, 147.00995, -307.85916, 152.25815, -286.51025, 148.05208, -289.30066, 126.24805, -280.40997, 110.64816, -250.5748, 99.70715, -213.0011, 95.76285, -181.55362, 94.97186, -136.88281, 86.75306, -107.59129, 77.63562, -77.52026, 37.09649, -62.64655, 40.10567, -45.81557, 56.299, -24.09258, 65.7193, -9.16763, 62.30466, -2.0E-5, 0, -35.76065, -37.76878, -28.85333, -52.49422, -43.02149, -59.61117, -49.74921, -69.9977, -55.65605, -99.59956, -62.96867, -105.93137, -85.68259, -135.36412, -94.51278, -130.98228, -92.37325, -118.09144, -126.38745, -112.6104, -130.97462, -96.28339, -94.80884, -79.84474, -92.80672, -56.23335, -127.23772, -71.82628, -112.56506, -46.76895, -75.99547, -86.58072, -89.98784, -95.99784, -136.7193, -86.29273, -136.30603, -63.55061, -110.68084, -96.0786, -112.13541, -75.23594, -355.13516, 87.35067, -323.20538, 85.13422, -291.3755, 76.85062, -249.22365, 71.40271, -207.7596, 63.4704, -83.78013, -35.61229, -60.45599, -19.77045, -40.10611, 10.14803, -117.74198, 7.98483, -132.72545, 16.55154, -172.88249, 59.08895, -143.14511, 30.79572, -56.33069, 8.09913 ]
}
]
}
},
"splat-fg": {
"splat03": [
"splat03": {
"deform": [
{
"time": 1.4667,
"offset": 2,
@ -1395,6 +1412,7 @@
]
}
}
}
},
"drawOrder": [
{
@ -1441,7 +1459,7 @@
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},
@ -1550,7 +1568,7 @@
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},
@ -1732,10 +1750,11 @@
{ "time": 0.6667, "mixRotate": 0, "mixX": 0.995, "mixScaleX": 0 }
]
},
"deform": {
"attachments": {
"default": {
"head": {
"head": [
"head": {
"deform": [
{ "time": 0.2333 },
{
"time": 0.4333,
@ -1747,12 +1766,13 @@
}
}
}
}
},
"run": {
"slots": {
"eye-highlight": {
"attachment": [
{ "name": null }
{}
]
}
},

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 KiB

After

Width:  |  Height:  |  Size: 444 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "svidebPqqeg",
"spine": "4.0.31",
"hash": "oo0dBSCqNHM",
"spine": "4.1.23-beta",
"x": -152.5,
"y": -151,
"width": 305,

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,13 @@
{
"skeleton": {
"hash": "UIFpNNbbcQI",
"spine": "4.0.31",
"hash": "aPoA1GjXkVI",
"spine": "4.1.23-beta",
"x": -366.31,
"y": -286.62,
"y": -327.81,
"width": 660.39,
"height": 604.09,
"height": 643,
"images": "./images/",
"audio": ""
"audio": "././"
},
"bones": [
{ "name": "root", "y": -176.12 },
@ -297,7 +297,7 @@
"slots": [
{ "name": "left-rear-leg", "bone": "left-rear-leg", "attachment": "left-rear-leg" },
{ "name": "left-rear-thigh", "bone": "left-rear-thigh", "attachment": "left-rear-thigh" },
{ "name": "left-wing", "bone": "left-wing", "attachment": "left-wing01" },
{ "name": "left-wing", "bone": "left-wing", "attachment": "left-wing" },
{ "name": "tail6", "bone": "tail6", "attachment": "tail06" },
{ "name": "tail5", "bone": "tail5", "attachment": "tail05" },
{ "name": "tail4", "bone": "tail4", "attachment": "tail04" },
@ -323,7 +323,7 @@
{ "name": "right-front-toe2", "bone": "right-front-toe2", "attachment": "front-toe-b" },
{ "name": "right-front-toe3", "bone": "right-front-toe3", "attachment": "front-toe-b" },
{ "name": "chin", "bone": "chin", "attachment": "chin" },
{ "name": "right-wing", "bone": "right-wing", "attachment": "right-wing01" },
{ "name": "right-wing", "bone": "right-wing", "attachment": "right-wing" },
{ "name": "head", "bone": "head", "attachment": "head" },
{ "name": "thiagobrayner", "bone": "root", "attachment": "thiagobrayner" }
],
@ -376,15 +376,14 @@
"left-rear-thigh": { "x": 56.03, "y": 27.39, "rotation": 74.94, "width": 91, "height": 149 }
},
"left-wing": {
"left-wing01": { "x": 129.21, "y": -45.49, "rotation": -83.7, "width": 191, "height": 256 },
"left-wing02": { "x": 126.38, "y": -31.69, "rotation": -86.19, "width": 179, "height": 269 },
"left-wing03": { "x": 110.27, "y": -90.89, "rotation": -86.19, "width": 186, "height": 207 },
"left-wing04": { "x": -61.62, "y": -83.27, "rotation": -86.19, "width": 188, "height": 135 },
"left-wing05": { "x": -90.02, "y": -78.14, "rotation": -86.19, "width": 218, "height": 213 },
"left-wing06": { "x": -143.77, "y": -83.72, "rotation": -86.19, "width": 192, "height": 331 },
"left-wing07": { "x": -133.05, "y": -33.9, "rotation": -86.19, "width": 159, "height": 255 },
"left-wing08": { "x": 50.15, "y": -15.71, "rotation": -86.19, "width": 164, "height": 181 },
"left-wing09": { "x": 85.94, "y": -11.33, "rotation": -86.19, "width": 204, "height": 167 }
"left-wing": {
"x": -36.32,
"y": -44.53,
"rotation": -83.7,
"width": 264,
"height": 589,
"sequence": { "count": 9, "digits": 2 }
}
},
"right-front-leg": {
"right-front-leg": { "x": 17.8, "y": 4.23, "rotation": 37.63, "width": 101, "height": 89 }
@ -417,15 +416,14 @@
"right-rear-toe": { "x": 47.46, "y": -7.64, "rotation": 134.34, "width": 109, "height": 77 }
},
"right-wing": {
"right-wing01": { "x": 170.08, "y": -23.68, "rotation": -130.34, "width": 219, "height": 310 },
"right-wing02": { "x": 171.15, "y": -19.33, "rotation": -130.34, "width": 203, "height": 305 },
"right-wing03": { "x": 166.46, "y": 29.24, "rotation": -130.34, "width": 272, "height": 247 },
"right-wing04": { "x": 42.94, "y": 134.06, "rotation": -130.34, "width": 279, "height": 144 },
"right-wing05": { "x": -8.84, "y": 142.59, "rotation": -130.34, "width": 251, "height": 229 },
"right-wing06": { "x": -123.33, "y": 111.22, "rotation": -130.34, "width": 200, "height": 366 },
"right-wing07": { "x": -40.17, "y": 118.03, "rotation": -130.34, "width": 200, "height": 263 },
"right-wing08": { "x": 48.02, "y": 28.76, "rotation": -130.34, "width": 234, "height": 254 },
"right-wing09": { "x": 128.1, "y": 21.13, "rotation": -130.34, "width": 248, "height": 204 }
"right-wing": {
"x": 35.09,
"y": 78.11,
"rotation": -130.34,
"width": 365,
"height": 643,
"sequence": { "count": 9, "digits": 2 }
}
},
"tail1": {
"tail01": { "x": 22.6, "y": -4.5, "rotation": 163.85, "width": 120, "height": 153 }
@ -453,50 +451,6 @@
],
"animations": {
"flying": {
"slots": {
"left-wing": {
"attachment": [
{ "time": 0.0667, "name": "left-wing02" },
{ "time": 0.1333, "name": "left-wing03" },
{ "time": 0.2, "name": "left-wing04" },
{ "time": 0.2667, "name": "left-wing05" },
{ "time": 0.3333, "name": "left-wing06" },
{ "time": 0.4, "name": "left-wing07" },
{ "time": 0.4667, "name": "left-wing08" },
{ "time": 0.5333, "name": "left-wing09" },
{ "time": 0.6, "name": "left-wing01" },
{ "time": 0.7333, "name": "left-wing02" },
{ "time": 0.8, "name": "left-wing03" },
{ "time": 0.8333, "name": "left-wing04" },
{ "time": 0.8667, "name": "left-wing05" },
{ "time": 0.9, "name": "left-wing06" },
{ "time": 0.9333, "name": "left-wing07" },
{ "time": 0.9667, "name": "left-wing08" },
{ "time": 1, "name": "left-wing01" }
]
},
"right-wing": {
"attachment": [
{ "time": 0.0667, "name": "right-wing02" },
{ "time": 0.1333, "name": "right-wing03" },
{ "time": 0.2, "name": "right-wing04" },
{ "time": 0.2667, "name": "right-wing05" },
{ "time": 0.3333, "name": "right-wing06" },
{ "time": 0.4, "name": "right-wing07" },
{ "time": 0.4667, "name": "right-wing08" },
{ "time": 0.5333, "name": "right-wing09" },
{ "time": 0.6, "name": "right-wing01" },
{ "time": 0.7333, "name": "right-wing02" },
{ "time": 0.8, "name": "right-wing03" },
{ "time": 0.8333, "name": "right-wing04" },
{ "time": 0.8667, "name": "right-wing05" },
{ "time": 0.9, "name": "right-wing06" },
{ "time": 0.9333, "name": "right-wing07" },
{ "time": 0.9667, "name": "right-wing08" },
{ "time": 1, "name": "right-wing01" }
]
}
},
"bones": {
"back": {
"rotate": [
@ -1093,6 +1047,32 @@
{ "time": 1 }
]
}
},
"attachments": {
"default": {
"left-wing": {
"left-wing": {
"sequence": [
{ "mode": "loop", "delay": 0.0667 },
{ "time": 0.6 },
{ "time": 0.7333, "mode": "loop", "index": 1 },
{ "time": 0.8, "mode": "loop", "index": 2, "delay": 0.0333 },
{ "time": 0.9667, "index": 7 }
]
}
},
"right-wing": {
"right-wing": {
"sequence": [
{ "mode": "loop", "delay": 0.0667 },
{ "time": 0.6 },
{ "time": 0.7333, "mode": "loop", "index": 1 },
{ "time": 0.8, "mode": "loop", "index": 2, "delay": 0.0333 },
{ "time": 0.9667, "index": 7 }
]
}
}
}
}
}
}

View File

@ -3,110 +3,127 @@ dragon-pma.png
filter: Linear, Linear
pma: true
back
bounds: 2, 334, 190, 185
bounds: 564, 534, 190, 185
chest
bounds: 2, 697, 136, 122
bounds: 2, 645, 136, 122
chin
bounds: 611, 613, 214, 146
bounds: 140, 619, 214, 146
front-toe-a
bounds: 2, 914, 29, 50
bounds: 2, 862, 29, 50
rotate: 90
front-toe-b
bounds: 467, 887, 56, 57
bounds: 467, 835, 56, 57
rotate: 90
head
bounds: 756, 398, 296, 260
rotate: 90
left-front-leg
bounds: 599, 886, 84, 57
bounds: 599, 834, 84, 57
left-front-thigh
bounds: 782, 871, 84, 72
bounds: 782, 819, 84, 72
left-rear-leg
bounds: 465, 434, 206, 177
bounds: 356, 558, 206, 177
left-rear-thigh
bounds: 216, 819, 91, 149
bounds: 216, 767, 91, 149
rotate: 90
left-wing01
bounds: 403, 241, 191, 256
bounds: 2, 268, 264, 589
rotate: 90
left-wing02
bounds: 673, 401, 179, 269
bounds: 2, 2, 264, 589
rotate: 90
left-wing03
bounds: 194, 286, 186, 207
rotate: 90
left-wing04
bounds: 140, 682, 188, 135
left-wing06
bounds: 661, 207, 192, 331
rotate: 90
left-wing07
bounds: 2, 521, 159, 255
rotate: 90
left-wing08
bounds: 827, 582, 164, 181
rotate: 90
left-wing09
bounds: 259, 474, 204, 167
right-front-leg
bounds: 113, 821, 101, 89
bounds: 113, 769, 101, 89
right-front-thigh
bounds: 758, 761, 108, 108
bounds: 758, 709, 108, 108
right-rear-leg
bounds: 640, 773, 116, 100
bounds: 640, 721, 116, 100
right-rear-thigh
bounds: 367, 794, 91, 149
bounds: 367, 742, 91, 149
rotate: 90
right-rear-toe
bounds: 2, 833, 109, 77
right-wing02
bounds: 635, 2, 203, 305
rotate: 90
right-wing04
bounds: 330, 643, 279, 144
right-wing06
bounds: 2, 84, 200, 366
rotate: 90
right-wing07
bounds: 370, 39, 200, 263
rotate: 90
bounds: 2, 781, 109, 77
tail01
bounds: 868, 748, 120, 153
bounds: 868, 696, 120, 153
rotate: 90
tail02
bounds: 518, 789, 95, 120
bounds: 518, 737, 95, 120
rotate: 90
tail03
bounds: 868, 870, 73, 92
bounds: 868, 818, 73, 92
rotate: 90
tail04
bounds: 526, 887, 56, 71
bounds: 526, 835, 56, 71
rotate: 90
tail05
bounds: 406, 891, 52, 59
bounds: 406, 839, 52, 59
rotate: 90
tail06
bounds: 685, 875, 95, 68
bounds: 685, 823, 95, 68
thiagobrayner
bounds: 54, 912, 350, 31
bounds: 54, 860, 350, 31
dragon-pma_2.png
size: 1024, 512
size: 1024, 1024
filter: Linear, Linear
pma: true
head
bounds: 2, 214, 296, 260
left-wing03
bounds: 2, 534, 264, 589
rotate: 90
left-wing04
bounds: 2, 268, 264, 589
rotate: 90
left-wing05
bounds: 741, 39, 218, 213
bounds: 593, 209, 264, 589
left-wing06
bounds: 2, 2, 264, 589
rotate: 90
dragon-pma_3.png
size: 1024, 1024
filter: Linear, Linear
pma: true
left-wing07
bounds: 2, 694, 264, 589
rotate: 90
left-wing08
bounds: 2, 428, 264, 589
rotate: 90
left-wing09
bounds: 593, 369, 264, 589
right-wing01
bounds: 264, 200, 219, 310
bounds: 2, 2, 365, 643
rotate: 90
dragon-pma_4.png
size: 1024, 1024
filter: Linear, Linear
pma: true
right-wing02
bounds: 2, 369, 365, 643
right-wing03
bounds: 485, 238, 272, 247
bounds: 369, 369, 365, 643
right-wing04
bounds: 2, 2, 365, 643
rotate: 90
dragon-pma_5.png
size: 1024, 1024
filter: Linear, Linear
pma: true
right-wing05
bounds: 734, 259, 251, 229
bounds: 2, 369, 365, 643
right-wing06
bounds: 369, 369, 365, 643
right-wing07
bounds: 2, 2, 365, 643
rotate: 90
dragon-pma_6.png
size: 1024, 1024
filter: Linear, Linear
pma: true
right-wing08
bounds: 485, 2, 234, 254
rotate: 90
bounds: 2, 2, 365, 643
right-wing09
bounds: 2, 8, 248, 204
bounds: 369, 2, 365, 643

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 KiB

After

Width:  |  Height:  |  Size: 355 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

View File

@ -2,109 +2,122 @@ dragon.png
size: 1024, 1024
filter: Linear, Linear
back
bounds: 2, 334, 190, 185
bounds: 564, 534, 190, 185
chest
bounds: 2, 697, 136, 122
bounds: 2, 645, 136, 122
chin
bounds: 611, 613, 214, 146
bounds: 140, 619, 214, 146
front-toe-a
bounds: 2, 914, 29, 50
bounds: 2, 862, 29, 50
rotate: 90
front-toe-b
bounds: 467, 887, 56, 57
bounds: 467, 835, 56, 57
rotate: 90
head
bounds: 756, 398, 296, 260
rotate: 90
left-front-leg
bounds: 599, 886, 84, 57
bounds: 599, 834, 84, 57
left-front-thigh
bounds: 782, 871, 84, 72
bounds: 782, 819, 84, 72
left-rear-leg
bounds: 465, 434, 206, 177
bounds: 356, 558, 206, 177
left-rear-thigh
bounds: 216, 819, 91, 149
bounds: 216, 767, 91, 149
rotate: 90
left-wing01
bounds: 403, 241, 191, 256
bounds: 2, 268, 264, 589
rotate: 90
left-wing02
bounds: 673, 401, 179, 269
bounds: 2, 2, 264, 589
rotate: 90
left-wing03
bounds: 194, 286, 186, 207
rotate: 90
left-wing04
bounds: 140, 682, 188, 135
left-wing06
bounds: 661, 207, 192, 331
rotate: 90
left-wing07
bounds: 2, 521, 159, 255
rotate: 90
left-wing08
bounds: 827, 582, 164, 181
rotate: 90
left-wing09
bounds: 259, 474, 204, 167
right-front-leg
bounds: 113, 821, 101, 89
bounds: 113, 769, 101, 89
right-front-thigh
bounds: 758, 761, 108, 108
bounds: 758, 709, 108, 108
right-rear-leg
bounds: 640, 773, 116, 100
bounds: 640, 721, 116, 100
right-rear-thigh
bounds: 367, 794, 91, 149
bounds: 367, 742, 91, 149
rotate: 90
right-rear-toe
bounds: 2, 833, 109, 77
right-wing02
bounds: 635, 2, 203, 305
rotate: 90
right-wing04
bounds: 330, 643, 279, 144
right-wing06
bounds: 2, 84, 200, 366
rotate: 90
right-wing07
bounds: 370, 39, 200, 263
rotate: 90
bounds: 2, 781, 109, 77
tail01
bounds: 868, 748, 120, 153
bounds: 868, 696, 120, 153
rotate: 90
tail02
bounds: 518, 789, 95, 120
bounds: 518, 737, 95, 120
rotate: 90
tail03
bounds: 868, 870, 73, 92
bounds: 868, 818, 73, 92
rotate: 90
tail04
bounds: 526, 887, 56, 71
bounds: 526, 835, 56, 71
rotate: 90
tail05
bounds: 406, 891, 52, 59
bounds: 406, 839, 52, 59
rotate: 90
tail06
bounds: 685, 875, 95, 68
bounds: 685, 823, 95, 68
thiagobrayner
bounds: 54, 912, 350, 31
bounds: 54, 860, 350, 31
dragon_2.png
size: 1024, 512
size: 1024, 1024
filter: Linear, Linear
head
bounds: 2, 214, 296, 260
left-wing03
bounds: 2, 534, 264, 589
rotate: 90
left-wing04
bounds: 2, 268, 264, 589
rotate: 90
left-wing05
bounds: 741, 39, 218, 213
bounds: 593, 209, 264, 589
left-wing06
bounds: 2, 2, 264, 589
rotate: 90
dragon_3.png
size: 1024, 1024
filter: Linear, Linear
left-wing07
bounds: 2, 694, 264, 589
rotate: 90
left-wing08
bounds: 2, 428, 264, 589
rotate: 90
left-wing09
bounds: 593, 369, 264, 589
right-wing01
bounds: 264, 200, 219, 310
bounds: 2, 2, 365, 643
rotate: 90
dragon_4.png
size: 1024, 1024
filter: Linear, Linear
right-wing02
bounds: 2, 369, 365, 643
right-wing03
bounds: 485, 238, 272, 247
bounds: 369, 369, 365, 643
right-wing04
bounds: 2, 2, 365, 643
rotate: 90
dragon_5.png
size: 1024, 1024
filter: Linear, Linear
right-wing05
bounds: 734, 259, 251, 229
bounds: 2, 369, 365, 643
right-wing06
bounds: 369, 369, 365, 643
right-wing07
bounds: 2, 2, 365, 643
rotate: 90
dragon_6.png
size: 1024, 1024
filter: Linear, Linear
right-wing08
bounds: 485, 2, 234, 254
rotate: 90
bounds: 2, 2, 365, 643
right-wing09
bounds: 2, 8, 248, 204
bounds: 369, 2, 365, 643

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 KiB

After

Width:  |  Height:  |  Size: 325 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -35,12 +35,6 @@ cp -f ../mix-and-match/export/*.json "$ROOT/spine-libgdx/spine-libgdx-tests/asse
cp -f ../mix-and-match/export/*.skel "$ROOT/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/"
cp -f ../mix-and-match/export/*-pma.* "$ROOT/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/"
echo "spine-as3"
rm "$ROOT/spine-as3/spine-as3-example/src/spineboy".*
cp -f ../spineboy/export/spineboy-ess.json "$ROOT/spine-as3/spine-as3-example/src/"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-as3/spine-as3-example/src/"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-as3/spine-as3-example/src/"
echo "spine-cocos2d-objc"
rm "$ROOT/spine-cocos2d-objc/Resources/"*
@ -65,7 +59,7 @@ cp -f ../tank/export/tank.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../tank/export/tank.png "$ROOT/spine-cocos2d-objc/Resources/"
echo "spine-cocos2dx"
rm "$ROOT/spine-cocos2dx/example/Resources/common/"*
rm -rf "$ROOT/spine-cocos2dx/example/Resources/common/"*
cp -f ../coin/export/coin-pro.skel "$ROOT/spine-cocos2dx/example/Resources/common/"
cp -f ../coin/export/coin.atlas "$ROOT/spine-cocos2dx/example/Resources/common/"
@ -117,79 +111,6 @@ cp -f ../mix-and-match/export/mix-and-match-pro.skel "$ROOT/spine-cocos2dx/examp
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-cocos2dx/example-v4/Resources/common/"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-cocos2dx/example-v4/Resources/common/"
echo "spine-solar2d"
rm "$ROOT/spine-solar2d/data/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-solar2d/data"
cp -f ../coin/export/coin.atlas "$ROOT/spine-solar2d/data"
cp -f ../coin/export/coin.png "$ROOT/spine-solar2d/data"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-solar2d/data"
cp -f ../goblins/export/goblins.atlas "$ROOT/spine-solar2d/data"
cp -f ../goblins/export/goblins.png "$ROOT/spine-solar2d/data"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-solar2d/data"
cp -f ../raptor/export/raptor.atlas "$ROOT/spine-solar2d/data"
cp -f ../raptor/export/raptor.png "$ROOT/spine-solar2d/data"
cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-solar2d/data"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-solar2d/data"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-solar2d/data"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-solar2d/data"
cp -f ../tank/export/tank.atlas "$ROOT/spine-solar2d/data"
cp -f ../tank/export/tank.png "$ROOT/spine-solar2d/data"
cp -f ../vine/export/vine-pro.json "$ROOT/spine-solar2d/data"
cp -f ../vine/export/vine.atlas "$ROOT/spine-solar2d/data"
cp -f ../vine/export/vine.png "$ROOT/spine-solar2d/data"
cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-solar2d/data"
cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-solar2d/data"
cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-solar2d/data"
cp -f ../owl/export/owl-pro.json "$ROOT/spine-solar2d/data"
cp -f ../owl/export/owl.atlas "$ROOT/spine-solar2d/data"
cp -f ../owl/export/owl.png "$ROOT/spine-solar2d/data"
cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-solar2d/data"
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-solar2d/data"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-solar2d/data"
echo "spine-love"
rm "$ROOT/spine-love/data/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-love/data"
cp -f ../coin/export/coin.atlas "$ROOT/spine-love/data"
cp -f ../coin/export/coin.png "$ROOT/spine-love/data"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-love/data"
cp -f ../goblins/export/goblins.atlas "$ROOT/spine-love/data"
cp -f ../goblins/export/goblins.png "$ROOT/spine-love/data"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-love/data"
cp -f ../raptor/export/raptor.atlas "$ROOT/spine-love/data"
cp -f ../raptor/export/raptor.png "$ROOT/spine-love/data"
cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-love/data"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-love/data"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-love/data"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-love/data"
cp -f ../tank/export/tank.atlas "$ROOT/spine-love/data"
cp -f ../tank/export/tank.png "$ROOT/spine-love/data"
cp -f ../vine/export/vine-pro.json "$ROOT/spine-love/data"
cp -f ../vine/export/vine.atlas "$ROOT/spine-love/data"
cp -f ../vine/export/vine.png "$ROOT/spine-love/data"
cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-love/data"
cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-love/data"
cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-love/data"
cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-love/data"
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-love/data"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-love/data"
echo "spine-sfml-c"
rm "$ROOT/spine-sfml/c/data/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-sfml/c/data/"
@ -197,6 +118,11 @@ cp -f ../coin/export/coin-pro.skel "$ROOT/spine-sfml/c/data/"
cp -f ../coin/export/coin-pma.atlas "$ROOT/spine-sfml/c/data/"
cp -f ../coin/export/coin-pma.png "$ROOT/spine-sfml/c/data/"
cp -f ../dragon/export/dragon-ess.json "$ROOT/spine-sfml/c/data/"
cp -f ../dragon/export/dragon-ess.skel "$ROOT/spine-sfml/c/data/"
cp -f ../dragon/export/dragon-pma.atlas "$ROOT/spine-sfml/c/data/"
cp -f ../dragon/export/dragon-pma*.png "$ROOT/spine-sfml/c/data/"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-sfml/c/data/"
cp -f ../goblins/export/goblins-pro.skel "$ROOT/spine-sfml/c/data/"
cp -f ../goblins/export/goblins-pma.atlas "$ROOT/spine-sfml/c/data/"
@ -244,6 +170,11 @@ cp -f ../coin/export/coin-pro.skel "$ROOT/spine-sfml/cpp/data/"
cp -f ../coin/export/coin-pma.atlas "$ROOT/spine-sfml/cpp/data/"
cp -f ../coin/export/coin-pma.png "$ROOT/spine-sfml/cpp/data/"
cp -f ../dragon/export/dragon-ess.json "$ROOT/spine-sfml/cpp/data/"
cp -f ../dragon/export/dragon-ess.skel "$ROOT/spine-sfml/cpp/data/"
cp -f ../dragon/export/dragon-pma.atlas "$ROOT/spine-sfml/cpp/data/"
cp -f ../dragon/export/dragon-pma*.png "$ROOT/spine-sfml/cpp/data/"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-sfml/cpp/data/"
cp -f ../goblins/export/goblins-pro.skel "$ROOT/spine-sfml/cpp/data/"
cp -f ../goblins/export/goblins-pma.atlas "$ROOT/spine-sfml/cpp/data/"
@ -284,46 +215,6 @@ cp -f ../mix-and-match/export/mix-and-match-pro.skel "$ROOT/spine-sfml/cpp/data/
cp -f ../mix-and-match/export/mix-and-match-pma.atlas "$ROOT/spine-sfml/cpp/data/"
cp -f ../mix-and-match/export/mix-and-match-pma.png "$ROOT/spine-sfml/cpp/data/"
echo "spine-starling"
# Do not delete everything in src, especially goblins-mesh-starling.png/.xml
cp -f ../coin/export/coin-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../coin/export/coin.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../coin/export/coin.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../goblins/export/goblins.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../goblins/export/goblins.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../raptor/export/raptor.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../raptor/export/raptor.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../tank/export/tank.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../tank/export/tank.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../vine/export/vine-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../vine/export/vine.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../vine/export/vine.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../owl/export/owl-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../owl/export/owl.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../owl/export/owl.png "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../mix-and-match/export/mix-and-match-pro.skel "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-starling/spine-starling-example/src/"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-starling/spine-starling-example/src/"
echo "spine-ts"
rm "$ROOT/spine-ts/spine-webgl/example/assets/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-ts/spine-webgl/example/assets/"
@ -336,6 +227,11 @@ cp -f ../goblins/export/goblins-pro.skel "$ROOT/spine-ts/spine-webgl/example/ass
cp -f ../goblins/export/goblins-pma.atlas "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../goblins/export/goblins-pma.png "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../dragon/export/dragon-ess.json "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../dragon/export/dragon-ess.skel "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../dragon/export/dragon-pma.atlas "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../dragon/export/dragon-pma*.png "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../raptor/export/raptor-pro.skel "$ROOT/spine-ts/spine-webgl/example/assets/"
cp -f ../raptor/export/raptor-pma.atlas "$ROOT/spine-ts/spine-webgl/example/assets/"
@ -391,31 +287,31 @@ cp -f ../spineboy/export/spineboy-pro.skel "$ROOT/spine-ts/spine-player/example/
cp -f ../spineboy/export/spineboy-pma.atlas "$ROOT/spine-ts/spine-player/example/assets/"
cp -f ../spineboy/export/spineboy-pma.png "$ROOT/spine-ts/spine-player/example/assets/"
echo "spine-xna"
rm "$ROOT/spine-xna/example/data/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-xna/example/data/"
cp -f ../coin/export/coin-pro.skel "$ROOT/spine-xna/example/data/"
cp -f ../coin/export/coin.atlas "$ROOT/spine-xna/example/data/"
cp -f ../coin/export/coin.png "$ROOT/spine-xna/example/data/"
echo "spine-monogame"
rm "$ROOT/spine-monogame/spine-monogame-example/data/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../coin/export/coin-pro.skel "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../coin/export/coin.atlas "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../coin/export/coin.png "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-xna/example/data/"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-monogame/spine-monogame-example/data/"
# Note: normalmap need to be created manually. Thus we use a separately prepared atlas and
# diffuse map so that the maps always match. These atlas textures are copied to the target dir.
cp -f ../raptor/manual-maps/raptor.atlas "$ROOT/spine-xna/example/data/"
cp -f ../raptor/manual-maps/raptor.png "$ROOT/spine-xna/example/data/"
cp -f ../raptor/manual-maps/raptor-normals.png "$ROOT/spine-xna/example/data/raptor_normals.png"
cp -f ../raptor/manual-maps/raptor.atlas "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../raptor/manual-maps/raptor.png "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../raptor/manual-maps/raptor-normals.png "$ROOT/spine-monogame/spine-monogame-example/data/raptor_normals.png"
cp -f ../spineboy/export/spineboy-pro.skel "$ROOT/spine-xna/example/data/"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-xna/example/data/"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-xna/example/data/"
cp -f ../spineboy/export/spineboy-pro.skel "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-xna/example/data/"
cp -f ../tank/export/tank.atlas "$ROOT/spine-xna/example/data/"
cp -f ../tank/export/tank.png "$ROOT/spine-xna/example/data/"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../tank/export/tank.atlas "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../tank/export/tank.png "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-xna/example/data/"
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-xna/example/data/"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-xna/example/data/"
cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-monogame/spine-monogame-example/data/"
cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-monogame/spine-monogame-example/data/"
echo "spine-ue4"
rm "$ROOT/spine-ue4/Content/GettingStarted/Assets/Raptor/raptor.json"
@ -457,8 +353,16 @@ cp -f ../dragon/export/dragon-ess.json "$UNITY_TARGET_DIR/dragon.json"
cp -f ../dragon/export/dragon-pma.atlas "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma.png/dragon.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma_2.png/dragon2.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma_3.png/dragon3.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma_4.png/dragon4.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma_5.png/dragon5.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
$sed -i "s/dragon-pma_6.png/dragon6.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt"
cp -f ../dragon/export/dragon-pma.png "$UNITY_TARGET_DIR/dragon.png"
cp -f ../dragon/export/dragon-pma_2.png "$UNITY_TARGET_DIR/dragon2.png"
cp -f ../dragon/export/dragon-pma_3.png "$UNITY_TARGET_DIR/dragon3.png"
cp -f ../dragon/export/dragon-pma_4.png "$UNITY_TARGET_DIR/dragon4.png"
cp -f ../dragon/export/dragon-pma_5.png "$UNITY_TARGET_DIR/dragon5.png"
cp -f ../dragon/export/dragon-pma_6.png "$UNITY_TARGET_DIR/dragon6.png"
UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins"
cp -f ../goblins/export/goblins-pro.json "$UNITY_TARGET_DIR/goblins.json"

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "vsus27NzL88",
"spine": "4.0.31",
"hash": "djttFmlR6Co",
"spine": "4.1.23-beta",
"x": -92.53,
"y": -5.3,
"width": 234.03,
@ -347,7 +347,7 @@
"eyes": {
"attachment": [
{ "time": 0.7, "name": "eyes-closed" },
{ "time": 0.8, "name": null }
{ "time": 0.8 }
]
}
},

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "PtTAK+zF95I",
"spine": "4.0.31",
"hash": "CdaHvXeCMjE",
"spine": "4.1.23-beta",
"x": -134.12,
"y": -3.28,
"width": 266.94,
@ -571,7 +571,7 @@
"eyes": {
"attachment": [
{ "time": 0.7, "name": "eyes-closed" },
{ "time": 0.8, "name": null }
{ "time": 0.8 }
]
}
},
@ -899,10 +899,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"right-hand-item": {
"dagger": [
"dagger": {
"deform": [
{
"offset": 26,
"vertices": [ 2.34755, 0.1447 ],
@ -921,10 +922,12 @@
}
]
}
}
},
"goblin": {
"head": {
"head": [
"head": {
"deform": [
{
"curve": [ 0.127, 0, 0.15, 1 ]
},
@ -950,9 +953,11 @@
},
{ "time": 1 }
]
}
},
"left-foot": {
"left-foot": [
"left-foot": {
"deform": [
{
"offset": 8,
"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
@ -986,9 +991,11 @@
"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
}
]
}
},
"pelvis": {
"pelvis": [
"pelvis": {
"deform": [
{},
{
"time": 0.1333,
@ -1012,9 +1019,11 @@
},
{ "time": 1 }
]
}
},
"right-foot": {
"right-foot": [
"right-foot": {
"deform": [
{},
{
"time": 0.1333,
@ -1054,9 +1063,11 @@
},
{ "time": 0.8667 }
]
}
},
"right-hand": {
"right-hand": [
"right-hand": {
"deform": [
{
"offset": 4,
"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
@ -1068,9 +1079,11 @@
"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
}
]
}
},
"right-lower-leg": {
"right-lower-leg": [
"right-lower-leg": {
"deform": [
{},
{
"time": 0.6,
@ -1079,9 +1092,11 @@
},
{ "time": 1 }
]
}
},
"right-upper-leg": {
"right-upper-leg": [
"right-upper-leg": {
"deform": [
{
"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
},
@ -1096,9 +1111,11 @@
"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
}
]
}
},
"torso": {
"torso": [
"torso": {
"deform": [
{
"offset": 2,
"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
@ -1134,9 +1151,11 @@
"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
}
]
}
},
"undie-straps": {
"undie-straps": [
"undie-straps": {
"deform": [
{
"offset": 2,
"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
@ -1167,9 +1186,11 @@
"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
}
]
}
},
"undies": {
"undies": [
"undies": {
"deform": [
{
"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
},
@ -1206,5 +1227,6 @@
}
}
}
}
}
}

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "cJR8Fbsu8Hg",
"spine": "4.0.31",
"hash": "oG+kkp8qkDs",
"spine": "4.1.23-beta",
"x": -87.83,
"y": 0.01,
"width": 319.3,

Binary file not shown.

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "3ozYAtTiEh8",
"spine": "4.0.31",
"hash": "iMg/Nef4GhU",
"spine": "4.1.23-beta",
"x": -85.7,
"y": -0.02,
"width": 321.77,
@ -309,7 +309,7 @@
},
{
"name": "weapon/morningstar",
"bones": [ "chain1", "chain2", "chain3", "chain4", "chain5", "chain6", "chain7", "chain8", "weapon-morningstar", "weapon-morningstar-physics1", "weapon-morningstar-physics2", "weapon-morningstar-physics3", "weapon-morningstar-physics4" ],
"bones": [ "chain4", "weapon-morningstar-physics2", "weapon-morningstar-physics1", "weapon-morningstar-physics3", "chain8", "chain1", "chain6", "weapon-morningstar", "chain5", "chain7", "weapon-morningstar-physics4", "chain2", "chain3" ],
"path": [ "weapon-morningstar" ]
},
{
@ -512,10 +512,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"curve": [ 0.05, 0, 0.15, 1 ]
},
@ -527,9 +528,11 @@
},
{ "time": 0.4 }
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"curve": [ 0.042, 0.78, 0.15, 1 ]
},
@ -540,9 +543,11 @@
},
{ "time": 0.4 }
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 15,
"vertices": [ -3.84663, 0, -3.84666, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, -4.54436, -0.64838, -4.54436, -0.64838 ],
@ -566,9 +571,11 @@
"vertices": [ -6.48674, 0.51688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, -4.54436, -0.64838, -4.54436, -0.64838 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"curve": [ 0.05, 0, 0.15, 1 ]
},
@ -579,9 +586,11 @@
},
{ "time": 0.4 }
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"curve": [ 0.042, 0.78, 0.15, 1 ]
},
@ -595,6 +604,7 @@
}
}
}
}
},
"crouch": {
"bones": {
@ -749,10 +759,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"offset": 12,
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ],
@ -770,9 +781,11 @@
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ]
}
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ],
"curve": [ 0.125, 0, 0.375, 1 ]
@ -787,9 +800,11 @@
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 14,
"vertices": [ 1.38039, -4.88211, 1.38039, -4.88215, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ],
@ -807,9 +822,11 @@
"vertices": [ 1.38039, -4.88211, 1.38039, -4.88215, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"offset": 2,
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ],
@ -826,9 +843,11 @@
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"vertices": [ 5.27928, -0.76782, 10.17068, -0.28402, 10.09426, -0.29504, 5.20281, -0.77885 ],
"curve": [ 0.125, 0, 0.375, 1 ]
@ -846,6 +865,7 @@
}
}
}
}
},
"crouch-from fall": {
"bones": {
@ -1088,10 +1108,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{},
{
"time": 0.0333,
@ -1116,9 +1137,11 @@
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ]
}
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{},
{
"time": 0.0333,
@ -1139,9 +1162,11 @@
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{},
{
"time": 0.0333,
@ -1166,9 +1191,11 @@
"vertices": [ 1.38039, 0.05844, 1.38039, 0.05842, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{},
{
"time": 0.0333,
@ -1192,9 +1219,11 @@
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{},
{
"time": 0.0333,
@ -1218,6 +1247,7 @@
}
}
}
}
},
"fall": {
"bones": {
@ -1648,10 +1678,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"curve": [ 0.125, 0, 0.375, 1 ]
},
@ -1673,9 +1704,11 @@
},
{ "time": 2 }
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ],
"curve": [ 0.012, 0.44, 0.075, 1 ]
@ -1710,9 +1743,11 @@
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 14,
"vertices": [ 1.38039, 0.05844, 1.38039, 0.05842, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ],
@ -1752,9 +1787,11 @@
"vertices": [ 1.38039, 0.05844, 1.38039, 0.05842, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"curve": [ 0.125, 0, 0.375, 1 ]
},
@ -1774,9 +1811,11 @@
},
{ "time": 2 }
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"vertices": [ 5.27928, -0.76782, 10.17068, -0.28402, 10.09426, -0.29504, 5.20281, -0.77885 ],
"curve": [ 0.012, 0.44, 0.075, 1 ]
@ -1814,6 +1853,7 @@
}
}
}
}
},
"idle": {
"bones": {
@ -2017,10 +2057,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"curve": [ 0.125, 0, 0.375, 1 ]
},
@ -2032,9 +2073,11 @@
},
{ "time": 1 }
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ],
"curve": [ 0.125, 0, 0.375, 1 ]
@ -2049,9 +2092,11 @@
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 14,
"vertices": [ 1.38038, -3.88539, 1.38039, -3.88566, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ],
@ -2069,9 +2114,11 @@
"vertices": [ 1.38038, -3.88539, 1.38039, -3.88566, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"curve": [ 0.125, 0, 0.375, 1 ]
},
@ -2082,9 +2129,11 @@
},
{ "time": 1 }
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"vertices": [ 5.27928, -0.76782, 10.17068, -0.28402, 10.09426, -0.29504, 5.20281, -0.77885 ],
"curve": [ 0.125, 0, 0.375, 1 ]
@ -2102,6 +2151,7 @@
}
}
}
}
},
"idle-from fall": {
"bones": {
@ -2377,10 +2427,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{},
{
"time": 0.0333,
@ -2395,9 +2446,11 @@
},
{ "time": 0.5667 }
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{},
{
"time": 0.0333,
@ -2423,9 +2476,11 @@
"vertices": [ 3.86398, 0.60646, 7.61642, 0.33229, 8.69186, 0.43607, 9.73261, -0.2366, 9.36311, -0.28992, 8.69186, 0.43607, 7.61642, 0.33229, 3.49443, 0.5533 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{},
{
"time": 0.0333,
@ -2456,9 +2511,11 @@
"vertices": [ 1.38038, -3.57954, 1.38039, -3.57972, 0.93076, 0.03947, 0.64285, 0.78767, 2.71751, 0.88435, 1.23665, 0.42568, 0, 0, 0, 0, -1.58744, -0.06729, -1.58744, -0.06731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6.67879, 0.1554, 6.67879, 0.15537, 2.56357, 0.10853, 4.17887, 0.1081, 0, 0, 0, 0, 0, 0, 1.6648, 0.46504, 8.75594, 0.22785, 1.49083, -0.09221, 1.49083, -0.09221, 5.221, 1.0741 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{},
{
"time": 0.0333,
@ -2471,9 +2528,11 @@
},
{ "time": 0.5667 }
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{},
{
"time": 0.0333,
@ -2502,6 +2561,7 @@
}
}
}
}
},
"jump": {
"bones": {
@ -2725,26 +2785,31 @@
]
}
},
"deform": {
"attachments": {
"default": {
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"offset": 2,
"vertices": [ 9.12951, 4.1E-4, 6.71509, 4.0E-4, 3.75744, 1.8E-4, 3.75744, 1.8E-4, 6.71509, 4.0E-4, 9.12951 ]
}
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 46,
"vertices": [ 4.89935, 0.38196, 4.89929, 0.38176, 0, 0, 0, 0, 7.88389, -1.00815, 7.88392, -1.0079, 0, 0, 9.84631, -0.95363, 13.40236, 0.79156, 0, 0, 0, 0, 2.31737, 1.33926 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"vertices": [ -1.06702, 3.68677, 5.16507, 9.0E-5, 5.16507, 9.0E-5, -1.06702, 3.68677 ]
}
@ -2752,6 +2817,7 @@
}
}
}
}
},
"run": {
"bones": {
@ -3139,10 +3205,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"offset": 12,
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ],
@ -3160,9 +3227,11 @@
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ]
}
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{},
{
"time": 0.2667,
@ -3170,9 +3239,11 @@
},
{ "time": 0.5333 }
]
}
},
"head": {
"head": [
"head": {
"deform": [
{},
{
"time": 0.0881,
@ -3211,9 +3282,11 @@
},
{ "time": 0.5333 }
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"offset": 2,
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ],
@ -3230,9 +3303,11 @@
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{},
{
"time": 0.2667,
@ -3242,6 +3317,7 @@
]
}
}
}
},
"events": [
{ "time": 0.2667, "name": "footstep" },
@ -3897,10 +3973,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"curve": [ 0, 0.9, 0.019, 1 ]
},
@ -3928,9 +4005,11 @@
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ]
}
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"curve": [ 0, 0.9, 0.019, 1 ]
},
@ -3945,9 +4024,11 @@
},
{ "time": 0.7667 }
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"curve": [ 0, 0.9, 0.019, 1 ]
},
@ -3997,9 +4078,11 @@
"vertices": [ -6.48674, 0.51688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, -4.54436, -0.64838, -4.54436, -0.64838 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"curve": [ 0, 0.9, 0.019, 1 ]
},
@ -4025,9 +4108,11 @@
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"curve": [ 0, 0.9, 0.019, 1 ]
},
@ -4044,6 +4129,7 @@
]
}
}
}
},
"events": [
{ "time": 0.2333, "name": "footstep" },
@ -4350,10 +4436,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"offset": 12,
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ],
@ -4371,9 +4458,11 @@
"vertices": [ 2.58727, 10.16383, -0.16622, 4.50658, 0, 0, 0, 0, -2.0E-5, 0, 1.0E-5, 0, 0, 0, -0.23098, 5.2839, -0.84593, 9.09544, -1.0E-5, 0, -0.84593, 9.09544, -0.84593, 9.09544, -0.23098, 5.2839, -0.23098, 5.2839, -0.16621, 4.50658, -0.84591, 9.09544 ]
}
]
}
},
"eyes": {
"eyes": [
"eyes": {
"deform": [
{
"curve": [ 0.133, 0, 0.4, 1 ]
},
@ -4384,9 +4473,11 @@
},
{ "time": 1.0667 }
]
}
},
"head": {
"head": [
"head": {
"deform": [
{
"offset": 22,
"vertices": [ -6.48674, 0.51688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.54038, -0.15547, -4.54038, -0.15547, 0, 0, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, -11.14854, -0.87456, -8.67199, -0.78973 ],
@ -4404,9 +4495,11 @@
"vertices": [ -6.48674, 0.51688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.54038, -0.15547, -4.54038, -0.15547, 0, 0, 0, 0, 0, 0, -6.48674, 0.51688, 0, 0, -11.14854, -0.87456, -8.67199, -0.78973 ]
}
]
}
},
"mantles": {
"mantles": [
"mantles": {
"deform": [
{
"offset": 2,
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ],
@ -4423,9 +4516,11 @@
"vertices": [ -0.28601, 2.3224, 3.1293, 5.31261, 0.13581, 2.32149, 0.13581, 2.32149, 3.12929, 5.31261, -0.286, 2.3224 ]
}
]
}
},
"mouth": {
"mouth": [
"mouth": {
"deform": [
{
"curve": [ 0.133, 0, 0.4, 1 ]
},
@ -4438,6 +4533,7 @@
]
}
}
}
},
"events": [
{ "time": 0.5333, "name": "footstep" },

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 KiB

After

Width:  |  Height:  |  Size: 369 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 350 KiB

After

Width:  |  Height:  |  Size: 340 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 KiB

After

Width:  |  Height:  |  Size: 320 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "D48YMP6TYgI",
"spine": "4.0.31",
"hash": "HtoSOJus9ic",
"spine": "4.1.23-beta",
"x": -644,
"y": -274,
"width": 1350.84,
@ -364,18 +364,18 @@
"L_eye-closed": {
"attachment": [
{ "time": 0.4667, "name": "L_eye-closed" },
{ "time": 0.5333, "name": null },
{ "time": 0.5333 },
{ "time": 1.8333, "name": "L_eye-closed" },
{ "time": 1.9333, "name": null }
{ "time": 1.9333 }
]
},
"R_eye-closed": {
"attachment": [
{ "time": 0.4667, "name": "R_eye-closed" },
{ "time": 0.5333, "name": null },
{ "time": 0.5333 },
{ "time": 1.8333, "name": "R_eye-closed" },
{ "time": 1.9, "name": null },
{ "time": 5.2333, "name": null }
{ "time": 1.9 },
{ "time": 5.2333 }
]
}
}
@ -463,39 +463,48 @@
]
}
},
"deform": {
"attachments": {
"default": {
"head-base": {
"head-base": [
"head-base": {
"deform": [
{
"offset": 7,
"vertices": [ 14.94373, 0, 12.65295, 0, 12.65233, -1.0E-5, 67.01102, -1.0E-5, 56.73529, 0, 56.73491, -1.0E-5, 67.71835, -1.0E-5, 57.33374, 0, 57.33344, -1.0E-5, 67.71835, 0, 57.33344, -1.0E-5, 67.34274, -1.0E-5, 57.01584, 0, 57.01547, 0, 20.78079, -1.0E-5, 17.5946, 0, 17.59413, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.65256, 0, 3.94009, 0, 3.93906, 0, 8.86218, -1.0E-5, 7.50494, 0, 7.50377, 3.80679, 7.12328, 2.63647, 5.78107, 2.6363, 5.77944, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 4.0068, -9.92122, 4.00659, -9.92301, 2.52487, -0.27368, 2.5247, -0.27514, 0.78302, 16.37561, 0.78287, 16.3739, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 3.59885, 0, 3.59729, 0, 0.78192, 0, 0.66266, 0, -0.8714, 0, -0.73761, 0, 14.92346, 0, 12.63475, 0, 15.32294, 0, 12.97321, 0, 20.35486, 0, 17.2334, 0.25634, 7.79885, 0.1778, 6.58624, 0, 35.55524, 0, 30.10268, 0, 42.37582, 0, 35.87729, 0, 45.64838, 0, 38.64833, 0, 21.29605, 0, 18.03027, 0, 20.06952, 0, 16.99168, 0, 27.19852, 0, 23.02756, 0, -2.28232, 0, -1.93265, 0, -4.93713, 0, -4.18004, 0, -4.41357, 0, -3.73672, 4.18564, -6.46916, 2.8986, -5.75401, 0, 12.58502, 0, 10.65575, 0, 16.75674, 0, 14.18719, 7.05116, -13.72548, 4.88302, -12.08656, 4.88288, -12.08753, 6.80575, -18.05002, 6.80558, -18.05162, 0, 20.84903, 0, 20.84752, 0, 18.38699, 0, 15.56738, 2.47823, 3.10307, 1.71634, 2.46333, 5.14171, -9.52105, 3.56069, -8.40152, 6.80575, -18.05002, 6.80558, -18.05162, 0, 20.84903, 0, 20.84752, 0, -7.3945, 0, -6.26045, 0, -2.11862, 0, -1.79346, 0, -2.90344, 0, -2.45781, 0, -7.88242, 0, -6.67371, 0, -6.67361, 0, -3.1828, 0, -2.69247, 0, -2.69414, 0, 0.65915, 0, 0.55807, 0, 1.86981, 0, 1.58313, 0.06213, -3.64604, 0.0432, -3.09045, 0.91777, -1.83724, 0.63572, -1.61568, 0, 6.82599, 0, 5.77931, 0, -21.77914, 0, -18.4391, 0, -21.9791, 0, -18.60844, 0, 5.51465, 0, 4.66925, 0, 6.16968, 0, 5.22366, 2.15704, 4.34937, 1.49408, 3.54054, 1.49391, 3.53944, 0, 6.90668, 0, 5.84891, 0, 5.84795, 0, -1.7995, 0, -1.5231, 0, -1.52324, 0, 2.10727, 0, 1.78445, 0, 14.38007, 0, 12.17538, 0, 5.34238, 0, 4.52444, 0, 4.5231, 0, -2.23868, 0, -1.89496, 0, -1.89513, 0, 7.08655, 0, 5.99965, 0, 31.15753, 0, 26.37973, 0, 42.88345, 0, 36.30704, 0, 39.49829, -1.0E-5, 33.44131, 0, 33.44121, 0, 33.70972, 0, 28.54018, 0, 20.23813, 0, 17.13489 ]
}
]
}
},
"L_foot": {
"L_foot": [
"L_foot": {
"deform": [
{
"vertices": [ 0.18475, -11.92622, 1.50322, -1.16228, 9.49197, -2.14086, 8.17357, -12.90479 ]
}
]
}
},
"L_wing": {
"L_wing": [
"L_wing": {
"deform": [
{
"vertices": [ -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, 26.35396, -20.44797, 19.26654, 27.22954 ]
}
]
}
},
"R_foot": {
"R_foot": [
"R_foot": {
"deform": [
{
"vertices": [ 10.15533, 0.83983, 14.67896, -12.2128, 4.99141, -15.57014, 0.4679, -2.5175 ]
}
]
}
},
"R_wing": {
"R_wing": [
"R_wing": {
"deform": [
{
"vertices": [ -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, -6.02205, 15.33593, -15.05563, -6.6922, -72.47807, 0, 3.19443, -72.4077 ]
}
@ -503,6 +512,7 @@
}
}
}
}
},
"idle": {
"bones": {
@ -805,39 +815,48 @@
]
}
},
"deform": {
"attachments": {
"default": {
"head-base": {
"head-base": [
"head-base": {
"deform": [
{
"offset": 28,
"vertices": [ -3.41531, 1.32523, -3.00798, 1.32536, -3.00795, 1.32538, -13.18137, 2.46658, -11.60915, 2.46693, -11.60909, 2.46701, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, 0, 0, 0, 0, 0, 0, -13.94728, 9.2356, -13.94693, 9.23602, -34.88094, 21.34346, -34.88048, 21.34392, -34.03203, 20.858, -34.03159, 20.85857, -15.79938, 10.16179, -15.79893, 10.1624, -3.29639, 2.12108, -3.29633, 2.12112, 0, 0, 0, 0, 0, 0, 0, 0, -2.33473, -7.05453, -2.33449, -7.05409, -6.45872, -19.51779, -6.45844, -19.51738, -6.45872, -19.51779, -6.45844, -19.51738, -2.69571, -8.14571, -2.69562, -8.14552, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.96945, 0.53802, -0.85397, 0.53859, 0, 0, 0, 0, 0, 0, 0, 0, -8.70248, 4.69284, -7.66454, 4.69325, -7.66441, 4.69341, -27.66286, 17.12148, -27.66251, 17.12209, -1.01492, -3.06616, -1.01476, -3.06607, 0, 0, 0, 0, 0, 0, 0, 0, -2.82654, 1.60172, -2.4894, 1.60188, -15.98976, 10.32721, -15.98938, 10.3277, -0.64944, -1.96115, -0.64929, -1.96082, -8.67078, 1.01303, -7.6366, 1.01357, -2.97052, 0.34692, -2.61644, 0.3476, -10.75204, 1.25653, -9.46964, 1.25705, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -18.93701, 2.21329, -16.67841, 2.21358, -16.67833, 2.21367, -16.15625, 1.88818, -14.22923, 1.8886, -14.22917, 1.88867, -7.32959, 0.85648, -6.4554, 0.85704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.45544, 0.45947, -2.16273, 0.45963, -2.16269, 0.4597, -0.45786, 0.17761, -0.40327, 0.17772, -4.47153, 0.83658, -3.93811, 0.83688 ]
}
]
}
},
"L_foot": {
"L_foot": [
"L_foot": {
"deform": [
{
"vertices": [ 32.68079, -7.56046, 32.68079, -7.56046, 32.68079, -7.56046, 32.68079, -7.56046 ]
}
]
}
},
"L_wing": {
"L_wing": [
"L_wing": {
"deform": [
{
"vertices": [ -4.27489, 26.67386, -26.45953, -5.4467, 46.59749, 18.47894, -20.51476, 45.73743, 13.95807, -43.26625, 42.60894, 15.85114, -36.91428, -35.07135, 36.66417, -35.33297 ]
}
]
}
},
"R_foot": {
"R_foot": [
"R_foot": {
"deform": [
{
"vertices": [ -20.46537, -32.39883, -25.30428, -2.89771, -3.40881, 0.69367, 1.43011, -28.8075 ]
}
]
}
},
"R_wing": {
"R_wing": [
"R_wing": {
"deform": [
{
"vertices": [ 18.48068, 129.83382, -130.52315, 12.7402, 96.8046, 109.6412, -113.80231, 91.87796, 38.92776, 16.92949, -18.6298, 38.14354, -39.39606, 37.12224, -35.35072, -40.99409 ]
}
@ -845,6 +864,7 @@
}
}
}
}
},
"right": {
"bones": {
@ -955,38 +975,47 @@
]
}
},
"deform": {
"attachments": {
"default": {
"head-base": {
"head-base": [
"head-base": {
"deform": [
{
"vertices": [ 11.1344, -1.06403, 13.4433, -1.51923, 11.08145, -1.51938, 12.53537, -1.19803, 15.13455, -1.71051, 12.47559, -1.71072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.56973, 0.88794, 0.60562, 0.86386, 7.85834, 12.59955, 10.15225, 12.26709, 8.36813, 12.26724, 3.38986, 7.69897, 4.49231, 7.55347, 3.70251, 7.55368, -0.97604, 5.23138, -0.92181, 5.26715, -0.76071, 5.26755, 1.32083, 22.53156, 2.72308, 22.45892, 2.24338, 22.45923, -3.96936, 19.33832, -3.84851, 19.48505, -3.17334, 19.48557, -6.3392, 31.11188, -6.13593, 31.3457, -5.05893, 31.34583, -24.94391, 28.39221, -28.82199, 29.39117, -23.75919, 29.3912, -56.22678, 14.04083, -46.34955, 14.04099, -56.22678, 14.04083, -46.34955, 14.04099, -56.22678, 14.04083, -46.34955, 14.04099, -38.34558, 15.25574, -31.60992, 15.2561, -7.34616, 3.76868, -6.05621, 3.76898, 0, 0, 0, 0, 2.16394, -6.08075, 1.78259, -6.08026, 6.83832, -19.22064, 5.63589, -19.22021, 6.83832, -19.22064, 5.63589, -19.22021, 6.83832, -19.22064, 5.63589, -19.22021, 3.1478, -8.84509, 2.59338, -8.84448, 38.20682, -13.54205, 31.49402, -13.54196, 22.70163, -2.56564, 18.71329, -2.56577, 0, 0, 0, 0, -0.43359, 3.77911, -0.27841, 3.79391, 0.11462, 0.26648, 0.12549, 0.26163, 1.81287, -0.17331, 1.80423, -0.24731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.63617, 1.49402, -3.11993, 1.60059, -2.57245, 1.6011, -23.26324, 6.68951, -19.1777, 6.68982, 1.72217, -4.84058, 1.41837, -4.8396, 0.2225, -0.6604, 0.1955, -0.66821, 0, 0, 0, 0, 0, 0, 0, 0, -17.02399, 8.7337, -14.03403, 8.73428, 3.4574, -9.71698, 2.84891, -9.71613, 1.56943, 4.6452, 1.7587, 4.57733, -0.13034, 0.7984, -0.0975, 0.80319, -0.81927, 3.48224, -0.67593, 3.51291, 11.55099, -1.10391, 13.94623, -1.57617, 11.49603, -1.57617, 7.56793, -0.7233, 9.13727, -1.03268, 7.53198, -1.03275, 1.63562, -0.15628, 1.62781, -0.22321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5.16141, 15.28809, -5.4942, 15.48712, -4.53036, 15.48749, -3.8877, 17.94763, -3.81842, 18.09192, -3.14871, 18.09222, 3.01028, 16.62122, 4.4769, 16.48401, 3.68909, 16.48447, 0.54437, 3.79083, 0.69931, 3.76553, 9.14157, -3.81387, 8.9776, -4.18481, 12.65292, -1.20917, 15.27689, -1.72641, 12.59274, -1.72662, 20.33411, -1.94312, 24.55048, -2.77457, 20.23727, -2.77475, 5.69284, -0.54407, 5.66556, -0.77692, 5.24939, -0.50168, 5.22458, -0.71631, 0, 0, 0, 0, 4.19965, 7.2785, 5.45303, 7.10022, 4.49445, 7.10037, 1.8887, 2.94391, 2.00775, 2.86407, 1.66986, 3.74084, 1.82175, 3.6698 ]
}
]
}
},
"L_foot": {
"L_foot": [
"L_foot": {
"deform": [
{
"vertices": [ 39.31265, 4.41002, 41.72089, -32.44155, 14.37022, -34.22886, 11.96194, 2.62272 ]
}
]
}
},
"L_wing": {
"L_wing": [
"L_wing": {
"deform": [
{
"vertices": [ 117.33383, -45.40262, 40.18668, 119.21864, 56.25742, -57.3571, 54.82147, 58.72855, -3.51584, 22.62314, -22.44652, -4.51169, 57.56076, 34.57768, -37.08134, 55.97851 ]
}
]
}
},
"R_foot": {
"R_foot": [
"R_foot": {
"deform": [
{
"vertices": [ -30.70229, -18.33, -30.70229, -18.33, -30.70229, -18.33, -30.70229, -18.33 ]
}
]
}
},
"R_wing": {
"R_wing": [
"R_wing": {
"deform": [
{
"vertices": [ 109.29965, -8.02332, 3.1934, 109.53658, -6.01328, -56.23985, 56.44511, -3.53917, -150.89093, 30.36821, -23.69317, -152.09174, -25.20395, 129.73512, -128.50223, -30.90591 ]
}
@ -994,6 +1023,7 @@
}
}
}
}
},
"up": {
"bones": {
@ -1075,45 +1105,56 @@
]
}
},
"deform": {
"attachments": {
"default": {
"body": {
"body": [
"body": {
"deform": [
{
"vertices": [ 9.78479, 0.43167, -8.5E-4, -9.79428, -11.07703, -0.48866, -0.00134, 11.08782, -20.53809, -0.9061, -28.18424, -1.2431, -4.9E-4, 28.21165, -28.17087, -1.24221, -3.1E-4, 28.19826, 0, 24.02027, -6.0E-5, 11.5683, -1.2E-4, -13.20591, 0, -22.67455, 28.15435, 1.2429, -5.5E-4, -28.18175, 28.14419, 1.24231, -0.0011, -28.17157, 20.9281, 0.92327, 0.10129, 0.00519, -1.2E-4, -0.10139, 0.59372, 0.02641, -7.3E-4, -0.59428, 15.61523, 0.6889, 15.26075, 0.674, -2.4E-4, -15.27561, 0, -0.2351, -14.31816, -0.63171, -13.76835, -0.60672, -1.8E-4, 13.78173, -1.2E-4, 12.47625, 0, -14.37328 ]
}
]
}
},
"head-base": {
"head-base": [
"head-base": {
"deform": [
{
"vertices": [ 18.08182, 3.28656, 18.08179, 2.69717, 18.08178, 2.69556, -2.08492, 2.81512, -2.08508, 2.31323, -2.08507, 2.30927, -8.5588, 0.05725, -8.55899, 0.05139, -8.55895, 0.04797, -3.56028, 0.02087, -3.56047, 0.02148, -3.56043, 0.01813, 4.05834, -0.03473, 4.05819, -0.02759, 10.06431, -0.07898, 10.06412, -0.06018, 10.06416, -0.06366, -1.18406, 0.43097, -1.1842, 0.3598, -1.1842, 0.35504, -22.98684, 1.70819, -22.98685, 1.40356, -22.98685, 1.40192, -22.18155, 1.67535, -22.18157, 1.3768, -22.18156, 1.37482, -21.46276, 1.13605, -21.46278, 0.93509, -21.46278, 0.93274, -11.08284, 0.68683, -11.08286, 0.56689, -11.08287, 0.56433, 0.1016, -3.78925, 0.10144, -3.10156, 0.10147, -3.10522, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, -1.74113, -4.18475, -1.7411, -4.18774, 15.8009, 1.18192, 15.80089, 1.1803, -1.88757, -4.98645, -1.8877, -4.08496, 0.13537, -5.04669, 0.13525, -4.13477, -4.33013, 1.79584, -4.33031, 1.47333, 4.45505, 5.67249, 4.45488, 4.65088, 0, 0, 0, 0, 0.18132, -6.76221, 0.18118, -5.54102, 0.40078, -0.00842, 0.40061, -0.00568, -10.01764, 0.73737, -10.0178, 0.60657, 10.43705, -0.08221, 10.43689, -0.06635, 0.27294, 0.21985, 0.27294, 0.18121, 0, 0, 0, 0, 0.17916, -0.00677, 0.179, -0.00452, 0.11242, -4.19293, 0.11229, -3.43506, 0.13193, -4.92053, 0.13181, -4.03156, 0.01666, -0.62231, 0.01653, -0.50916, 0.204, -7.60742, 0.20387, -6.23346, 0.1807, -6.73987, 0.18056, -5.52264, 0.2084, -7.77295, 0.20825, -6.36969, 0.23492, -8.75995, 0.23476, -7.17548, 0.2348, -7.1781, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.22325, -8.32697, 0.22312, -6.82336, 0.23393, -8.72394, 0.2338, -7.14856, 0.22255, -8.30029, 0.22242, -6.80145, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, -3.50412, 1.55554, -3.50416, 1.27625, -5.88762, 2.62024, -5.88765, 2.1488, -0.90049, -1.34583, -0.90065, -1.10168, 10.97694, 4.55176, 10.97691, 3.73422, 10.97687, 3.73248, -4.2139, 0.11591, -4.21404, 0.10239, -4.21406, 0.09705, 4.95192, 7.71997, 4.95192, 6.32831, 0.15553, -5.79968, 0.1554, -4.75214, 0.1638, -6.10944, 0.16368, -5.00592, 0.1761, -6.56738, 0.17597, -5.38116, 0.16425, -6.12555, 0.16413, -5.01947, 2.14045, 2.33923, 2.1404, 1.91858, -1.85151, -0.18054, -1.85164, -0.14532, 0, 0, 0, 0, 0, 0, 0, 0, 0.14525, -5.41821, 0.14508, -4.43677, 0.14511, -4.43958, -1.12234, 0.20605, -1.12251, 0.17688, -1.1225, 0.17065, -10.04741, 1.59747, -10.04749, 1.31299, -10.0475, 1.31073, -9.60033, 1.93549, -9.60038, 1.58783, -1.90081, -5.94379, -1.90096, -4.87024, -0.06005, 1.354, -0.06008, 1.11313, -0.0601, 1.11108, 24.57889, 4.97925, 24.57886, 4.08423, 24.57883, 4.08252, 1.27811, 5.86395, 1.27796, 4.80841, 1.27968, 3.76697, 1.27951, 3.08911, 1.03323, 2.66321, 1.03302, 2.18518, -2.23629, 0.79535, -2.23643, 0.65601, -2.23644, 0.65265, 3.64207, 0.25793, 3.6419, 0.2124, -3.56169, 1.526, -3.56186, 1.25299 ]
}
]
}
},
"L_foot": {
"L_foot": [
"L_foot": {
"deform": [
{
"vertices": [ 5.89397, 0.69042, 5.89397, 0.69042, 5.89397, 0.69042, 5.89397, 0.69042 ]
}
]
}
},
"L_wing": {
"L_wing": [
"L_wing": {
"deform": [
{
"vertices": [ -11.13373, 20.07786, -19.56781, -12.00009, 23.31055, 16.37385, -17.38553, 22.57391, 17.65799, -39.82292, 39.00579, 19.4036, -16.78632, -36.11907, 36.82366, -15.17023 ]
}
]
}
},
"R_foot": {
"R_foot": [
"R_foot": {
"deform": [
{
"vertices": [ 35.48705, -0.58566, 32.90477, 10.12547, 40.85446, 12.04202, 43.43665, 1.33094 ]
}
]
}
},
"R_wing": {
"R_wing": [
"R_wing": {
"deform": [
{
"vertices": [ 24.96088, -21.2647, 20.14355, 25.88189, 6.7001, -22.29713, 21.97984, 7.68417, 8.16104, -3.76462, 3.40096, 8.32676, 26.42206, -2.73223, 1.56473, 26.52477 ]
}
@ -1122,5 +1163,6 @@
}
}
}
}
}
}

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 KiB

After

Width:  |  Height:  |  Size: 303 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "oNeCFa8SiWU",
"spine": "4.0.31",
"hash": "g51gqFUAXaM",
"spine": "4.1.23-beta",
"x": -207.3,
"y": 119.41,
"width": 413.19,

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "1WHGXJIHCvk",
"spine": "4.0.31",
"hash": "/2dOCTLjcJ4",
"spine": "4.1.23-beta",
"x": -208.76,
"y": 119.41,
"width": 414.65,
@ -661,10 +661,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"token": {
"token": [
"token": {
"deform": [
{
"offset": 24,
"vertices": [ 1.14323, 6.73443, 1.14323, 6.73443, 0, 0, 0, 0, 0, 0, 0, 0, 1.14323, 6.73443, 1.14323, 6.73443, 1.14323, 6.73443, 0, 0, 1.15849, 4.43445, 1.15849, 4.43445, 1.15849, 4.43445, 0.73607, 5.7173, 0.73607, 5.7173, 0.73607, 5.7173, 0.73607, 5.7173, 0.73607, 5.7173, 1.02358, 4.49763, 1.15849, 4.43445, 1.14323, 6.73443, 1.14323, 6.73443, 1.14323, 6.73443, 1.14323, 6.73443, 1.14323, 6.73443 ]
@ -714,5 +715,6 @@
}
}
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 KiB

After

Width:  |  Height:  |  Size: 407 KiB

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 KiB

After

Width:  |  Height:  |  Size: 411 KiB

Binary file not shown.

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "Q9eFOmFPMXI",
"spine": "4.0.31",
"hash": "D5Ad2Zbw5iM",
"spine": "4.1.23-beta",
"x": -95.43,
"y": -18.79,
"width": 196.03,

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "lS/mQzJwi+I",
"spine": "4.0.31",
"hash": "SmUDxzck41o",
"spine": "4.1.23-beta",
"x": -221.27,
"y": -8.57,
"width": 470.72,
@ -2926,7 +2926,7 @@
{ "time": 0.2, "name": "muzzle02" },
{ "time": 0.2667, "name": "muzzle03" },
{ "time": 0.3333, "name": "muzzle04" },
{ "time": 0.3667, "name": null }
{ "time": 0.3667 }
]
}
},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 238 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "IQgkYFQG8ng",
"spine": "4.0.31",
"hash": "itfFESDjM1c",
"spine": "4.1.23-beta",
"x": -188.63,
"y": -7.94,
"width": 418.45,
@ -2427,19 +2427,19 @@
"side-glow1": {
"attachment": [
{ "name": "hoverglow-small" },
{ "time": 0.9667, "name": null }
{ "time": 0.9667 }
]
},
"side-glow2": {
"attachment": [
{ "time": 0.0667, "name": "hoverglow-small" },
{ "time": 1, "name": null }
{ "time": 1 }
]
},
"side-glow3": {
"attachment": [
{ "name": "hoverglow-small" },
{ "time": 0.9667, "name": null }
{ "time": 0.9667 }
]
}
},
@ -3479,18 +3479,21 @@
{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
]
},
"deform": {
"attachments": {
"default": {
"front-foot": {
"front-foot": [
"front-foot": {
"deform": [
{
"offset": 26,
"vertices": [ -0.02832, -5.37024, -0.02832, -5.37024, 3.8188, -3.7757, -0.02832, -5.37024, -3.82159, 3.77847 ]
}
]
}
},
"front-shin": {
"front-shin": [
"front-shin": {
"deform": [
{
"offset": 14,
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
@ -3511,9 +3514,11 @@
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
}
]
}
},
"hoverboard-board": {
"hoverboard-board": [
"hoverboard-board": {
"deform": [
{
"curve": [ 0.067, 0, 0.2, 1 ]
},
@ -3525,9 +3530,11 @@
},
{ "time": 1 }
]
}
},
"rear-foot": {
"rear-foot": [
"rear-foot": {
"deform": [
{
"offset": 28,
"vertices": [ -1.93078, 1.34782, -0.31417, 2.33363, 3.05122, 0.33946, 2.31472, -2.01678, 2.17583, -2.05795, -0.04277, -2.99459, 1.15429, 0.26328, 0.97501, -0.67169 ]
@ -3536,6 +3543,7 @@
}
}
}
}
},
"idle": {
"slots": {
@ -5203,7 +5211,7 @@
"portal-bg": {
"attachment": [
{ "name": "portal-bg" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-flare1": {
@ -5214,7 +5222,7 @@
{ "time": 1.2, "name": "portal-flare1" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare2": {
@ -5224,14 +5232,14 @@
{ "time": 1.1667, "name": "portal-flare1" },
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare3": {
"attachment": [
{ "time": 1.2, "name": "portal-flare3" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare4": {
@ -5239,33 +5247,33 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare1" },
{ "time": 1.2667, "name": "portal-flare2" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare5": {
"attachment": [
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare6": {
"attachment": [
{ "time": 1.2667, "name": "portal-flare3" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare7": {
"attachment": [
{ "time": 1.1333, "name": "portal-flare2" },
{ "time": 1.1667, "name": null }
{ "time": 1.1667 }
]
},
"portal-flare8": {
"attachment": [
{ "time": 1.2, "name": "portal-flare3" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare9": {
@ -5273,7 +5281,7 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3, "name": null }
{ "time": 1.3 }
]
},
"portal-flare10": {
@ -5281,25 +5289,25 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare1" },
{ "time": 1.2667, "name": "portal-flare3" },
{ "time": 1.3, "name": null }
{ "time": 1.3 }
]
},
"portal-shade": {
"attachment": [
{ "name": "portal-shade" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-streaks1": {
"attachment": [
{ "name": "portal-streaks1" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-streaks2": {
"attachment": [
{ "name": "portal-streaks2" },
{ "time": 3, "name": null }
{ "time": 3 }
]
}
},
@ -7696,7 +7704,7 @@
{ "time": 0.1, "name": "muzzle03" },
{ "time": 0.1333, "name": "muzzle04" },
{ "time": 0.1667, "name": "muzzle05" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-glow": {
@ -7725,7 +7733,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2333, "name": null }
{ "time": 0.2333 }
]
},
"muzzle-ring2": {
@ -7739,7 +7747,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-ring3": {
@ -7753,7 +7761,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-ring4": {
@ -7767,7 +7775,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
}
},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 238 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "Ytk7Zos6DR4",
"spine": "4.0.31",
"hash": "9GzkJCsNn3g",
"spine": "4.1.23-beta",
"x": -840,
"y": -766.03,
"width": 1680,

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "F+EPhClYhR8",
"spine": "4.0.31",
"hash": "QqiPXGOfONE",
"spine": "4.1.23-beta",
"x": -100.47,
"y": -9.21,
"width": 260.65,
@ -1966,10 +1966,11 @@
{ "mix": 0 }
]
},
"deform": {
"attachments": {
"default": {
"back-leg-path": {
"back-leg-path": [
"back-leg-path": {
"deform": [
{
"curve": [ 0.158, 0, 0.475, 1 ]
},
@ -2030,9 +2031,11 @@
},
{ "time": 1.6667 }
]
}
},
"front-leg-path": {
"front-leg-path": [
"front-leg-path": {
"deform": [
{
"curve": [ 0.075, 0, 0.189, 0.28 ]
},
@ -2108,5 +2111,6 @@
}
}
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 KiB

After

Width:  |  Height:  |  Size: 421 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "3P3VgYJ8Bxk",
"spine": "4.0.31",
"hash": "ulJOWXMG9PE",
"spine": "4.1.23-beta",
"x": -5852.65,
"y": -348.5,
"width": 7202.61,
@ -3420,7 +3420,7 @@
"slots": {
"rock": {
"attachment": [
{ "name": null }
{}
]
},
"smoke-glow": {
@ -3432,7 +3432,7 @@
],
"attachment": [
{ "time": 0.0667, "name": "smoke-glow" },
{ "time": 0.3, "name": null }
{ "time": 0.3 }
]
},
"smoke-puff1-bg": {
@ -4049,7 +4049,7 @@
],
"attachment": [
{ "time": 0.0667, "name": "smoke-glow" },
{ "time": 0.2667, "name": null }
{ "time": 0.2667 }
]
}
},
@ -4870,10 +4870,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"clipping": {
"clipping": [
"clipping": {
"deform": [
{
"time": 0.0667,
"offset": 54,
@ -4905,9 +4906,11 @@
"vertices": [ 4.59198, -4.59192 ]
}
]
}
},
"smoke-glow": {
"smoke-glow": [
"smoke-glow": {
"deform": [
{
"time": 0.1333,
"vertices": [ -14.17073, 19.14352, 0, 0, -10.97961, -15.09065, -5.79558, -24.82121, 0.68117, -17.78759, -1.1179, -5.4463, 0, 0, 0, 0, 17.52957, 6.89397, -0.33841, -2.21582, 5.51004, 18.88118, -6.80153, 20.91101 ]
@ -4931,6 +4934,7 @@
]
}
}
}
},
"drawOrder": [
{

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 KiB

After

Width:  |  Height:  |  Size: 418 KiB

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "mROo4Xkf3Fs",
"spine": "4.0.31",
"hash": "J/Kz2d3OlD0",
"spine": "4.1.23-beta",
"x": -87.7,
"y": -1.71,
"width": 227.65,

Binary file not shown.

View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "tBKgYacI7e4",
"spine": "4.0.31",
"hash": "tB4/IVbSSaY",
"spine": "4.1.23-beta",
"x": -564.6,
"y": -335.4,
"width": 1124.2,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 423 KiB

After

Width:  |  Height:  |  Size: 421 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 KiB

After

Width:  |  Height:  |  Size: 412 KiB

View File

@ -4,7 +4,7 @@ This folder contains formatter configuration files to be used with IDEs as well
You will need the following on your `PATH`:
- JDK 10+
- clang-format 12 (i.e. `brew install clang-format`). Also set the environment variable `CLANGFORMAT` to the path of the `clang-format` executable.
- clang-format 12.0.1 (i.e. `brew install clang-format`). Also set the environment variable `CLANGFORMAT` to the path of the `clang-format` executable.
- dotnet format (i.e. `dotnet tool install -g dotnet-format`, comes with dotnet 6 out of the box)
- tsfmt, (i.e. `npm install -g typescript-formatter`)

View File

@ -25,15 +25,13 @@ spotless {
'spine-sfml/**/*.cpp',
'spine-sfml/**/*.h',
'spine-ue4/**/*.cpp',
'spine-ue4/**/*.h',
'spine-godot/spine_godot/**.h',
'spine-godot/spine_godot/**.cpp'
clangFormat("12.0.1").pathToExe("$System.env.CLANGFORMAT").style('file')
'spine-ue4/**/*.h'
clangFormat("13.0.1").pathToExe("$System.env.CLANGFORMAT").style('file')
}
typescript {
target 'spine-ts/**/*.ts'
targetExclude 'spine-ts/**/*.d.ts'
target 'spine-ts/**/src/*.ts'
targetExclude 'spine-ts/**/*.d.ts', 'spine-ts/**/node_modules/**/*.ts'
tsfmt('7.2.2').tsfmtFile('formatters/tsfmt.json')
}
}

View File

@ -9,7 +9,6 @@ setup() {
cp $dir/build.gradle $dir/..
cp $dir/settings.gradle $dir/..
cp $dir/.editorconfig $dir/../spine-csharp
cp $dir/.editorconfig $dir/../spine-xna
cp $dir/.editorconfig $dir/../spine-monogame
cp $dir/.editorconfig $dir/../spine-unity
}
@ -19,7 +18,6 @@ cleanup() {
rm $dir/../build.gradle
rm $dir/../settings.gradle
rm $dir/../spine-csharp/.editorconfig
rm $dir/../spine-xna/.editorconfig
rm $dir/../spine-monogame/.editorconfig
rm $dir/../spine-unity/.editorconfig
}
@ -30,10 +28,11 @@ setup
# Execute spotless and dotnet-format
pushd $dir/..
./formatters/gradlew spotlessApply
dotnet-format spine-csharp/spine-csharp.sln
dotnet-format -f spine-xna
dotnet-format -f spine-monogame
dotnet-format -f spine-unity
if [ "$1" != "skipdotnet" ] ; then
dotnet-format spine-csharp/spine-csharp.sln
dotnet-format -f spine-monogame
dotnet-format -f spine-unity
fi
popd
# Delete Gradle, dotnet-format, and clang-format config files in root

View File

@ -1 +1,3 @@
include ':spine-libgdx'
include ':spine-libgdx:spine-libgdx'
include ':spine-libgdx:spine-libgdx-tests'
include ':spine-libgdx:spine-skeletonviewer'

View File

@ -14,7 +14,7 @@ For the official legal terms governing the Spine Runtimes, please read the [Spin
## Spine version
spine-c works with data exported from Spine 4.0.xx.
spine-c works with data exported from Spine 4.1.xx.
spine-c supports all Spine features.

View File

@ -34,6 +34,7 @@
#include <spine/Event.h>
#include <spine/Attachment.h>
#include <spine/VertexAttachment.h>
#include <spine/Sequence.h>
#include <spine/Array.h>
#include <stdint.h>
@ -99,6 +100,7 @@ typedef enum {
SP_TIMELINE_SHEAR,
SP_TIMELINE_TRANSLATE,
SP_TIMELINE_DEFORM,
SP_TIMELINE_SEQUENCE,
SP_TIMELINE_IKCONSTRAINT,
SP_TIMELINE_PATHCONSTRAINTMIX,
SP_TIMELINE_RGB2,
@ -131,7 +133,8 @@ typedef enum {
SP_PROPERTY_TRANSFORMCONSTRAINT = 1 << 15,
SP_PROPERTY_PATHCONSTRAINT_POSITION = 1 << 16,
SP_PROPERTY_PATHCONSTRAINT_SPACING = 1 << 17,
SP_PROPERTY_PATHCONSTRAINT_MIX = 1 << 18
SP_PROPERTY_PATHCONSTRAINT_MIX = 1 << 18,
SP_PROPERTY_SEQUENCE = 1 << 19
} spProperty;
#define SP_MAX_PROPERTY_IDS 3
@ -399,6 +402,20 @@ SP_API void spDeformTimeline_setFrame(spDeformTimeline *self, int frameIndex, fl
/**/
typedef struct spSequenceTimeline {
spTimeline super;
int slotIndex;
spAttachment *attachment;
} spSequenceTimeline;
SP_API spSequenceTimeline *spSequenceTimeline_create(int framesCount, int slotIndex, spAttachment *attachment);
SP_API void spSequenceTimeline_setFrame(spSequenceTimeline *self, int frameIndex, float time, int mode, int index, float delay);
/**/
/**/
typedef struct spEventTimeline {
spTimeline super;
spEvent **const events;

Some files were not shown because too many files have changed in this diff Show More