[unity] Updated Hero skeleton assets to new combined one with sword and morning star skins. Added example scene "SkeletonUtility Platformer HingeChain Physics" for demonstration of hinge chain physics.

This commit is contained in:
Harald Csaszar 2019-11-20 14:29:35 +01:00
parent 1aaf1446ac
commit 10ac204b1f
5 changed files with 9398 additions and 36 deletions

View File

@ -42,7 +42,7 @@ RenderSettings:
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
@ -54,7 +54,7 @@ LightmapSettings:
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 8
serializedVersion: 9
m_Resolution: 1
m_BakeResolution: 10
m_TextureWidth: 1024
@ -87,7 +87,7 @@ LightmapSettings:
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0}
m_ShadowMaskMode: 2
m_UseShadowmask: 1
--- !u!196 &5
NavMeshSettings:
serializedVersion: 2
@ -678,6 +678,7 @@ MonoBehaviour:
scale: 1
zPosition: 1
overrideAlpha: 1
hierarchy: {fileID: 658011010}
--- !u!4 &380101355
Transform:
m_ObjectHideFlags: 0
@ -1069,6 +1070,97 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 542594152}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &593551843
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 593551844}
- component: {fileID: 593551846}
- component: {fileID: 593551845}
m_Layer: 0
m_Name: Description 4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &593551844
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 593551843}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 18.79, y: 3.13, z: -2.57}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1381317420}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!102 &593551845
TextMesh:
serializedVersion: 3
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 593551843}
m_Text: 'See the example scene
"SkeletonUtility Platformer HingeChain Physics".
for added cape physics and
having the hero swing a morning star
'
m_OffsetZ: 0
m_CharacterSize: 0.11
m_LineSpacing: 1
m_Anchor: 6
m_Alignment: 0
m_TabSize: 4
m_FontSize: 16
m_FontStyle: 0
m_RichText: 1
m_Font: {fileID: 0}
m_Color:
serializedVersion: 2
rgba: 4285953654
--- !u!23 &593551846
MeshRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 593551843}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &593931653
GameObject:
m_ObjectHideFlags: 0
@ -1278,6 +1370,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
boneRoot: {fileID: 1776464689}
flipBy180DegreeRotation: 0
skeletonRenderer: {fileID: 658011011}
--- !u!114 &658011011
MonoBehaviour:
@ -1291,7 +1384,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
skeletonDataAsset: {fileID: 11400000, guid: 2f899e95232e6144786de8fb99678a8d, type: 2}
initialSkinName: default
initialSkinName: weapon/sword
initialFlipX: 0
initialFlipY: 0
separatorSlotNames: []
@ -1304,6 +1397,11 @@ MonoBehaviour:
singleSubmesh: 0
addNormals: 0
calculateTangents: 0
maskInteraction: 0
maskMaterials:
materialsMaskDisabled: []
materialsInsideMask: []
materialsOutsideMask: []
disableRenderingOnOverride: 1
_animationName: Idle
loop: 1
@ -1805,6 +1903,7 @@ MonoBehaviour:
scale: 1
zPosition: 1
overrideAlpha: 1
hierarchy: {fileID: 658011010}
--- !u!1 &1018673310
GameObject:
m_ObjectHideFlags: 0
@ -1875,6 +1974,7 @@ MonoBehaviour:
scale: 1
zPosition: 1
overrideAlpha: 1
hierarchy: {fileID: 658011010}
--- !u!1 &1074999553
GameObject:
m_ObjectHideFlags: 0
@ -1923,6 +2023,20 @@ Light:
m_Lightmapping: 1
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
@ -2311,7 +2425,7 @@ Transform:
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!199 &1189703949
ParticleSystemRenderer:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
@ -2360,6 +2474,7 @@ ParticleSystemRenderer:
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!198 &1189703950
ParticleSystem:
m_ObjectHideFlags: 0
@ -2372,7 +2487,9 @@ ParticleSystem:
looping: 0
prewarm: 0
playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -2858,14 +2975,29 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
ShapeModule:
serializedVersion: 4
serializedVersion: 5
enabled: 1
type: 4
angle: 70.14339
length: 5
boxX: 1
boxY: 1
boxZ: 1
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_Mesh: {fileID: 0}
m_MeshRenderer: {fileID: 0}
m_SkinnedMeshRenderer: {fileID: 0}
m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0
m_UseMeshMaterialIndex: 0
m_UseMeshColors: 1
alignToDirection: 0
randomDirectionAmount: 1
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 1
mode: 0
@ -2956,18 +3088,6 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
placementMode: 0
m_Mesh: {fileID: 0}
m_MeshRenderer: {fileID: 0}
m_SkinnedMeshRenderer: {fileID: 0}
m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0
m_MeshScale: 1
m_UseMeshMaterialIndex: 0
m_UseMeshColors: 1
alignToDirection: 0
randomDirectionAmount: 1
sphericalDirectionAmount: 0
EmissionModule:
enabled: 1
serializedVersion: 4
@ -3355,6 +3475,7 @@ ParticleSystem:
m_NumAlphaKeys: 2
UVModule:
enabled: 0
mode: 0
frameOverTime:
serializedVersion: 2
minMaxState: 1
@ -3434,6 +3555,8 @@ ParticleSystem:
flipU: 0
flipV: 0
randomRow: 1
sprites:
- sprite: {fileID: 0}
VelocityModule:
enabled: 0
x:
@ -4206,6 +4329,129 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
remapEnabled: 0
positionAmount:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
rotationAmount:
serializedVersion: 2
minMaxState: 0
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
sizeAmount:
serializedVersion: 2
minMaxState: 0
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
SizeBySpeedModule:
enabled: 0
curve:
@ -4495,6 +4741,10 @@ ParticleSystem:
serializedVersion: 3
type: 0
collisionMode: 0
colliderForce: 0
multiplyColliderForceByParticleSize: 0
multiplyColliderForceByParticleSpeed: 0
multiplyColliderForceByCollisionAngle: 1
plane0: {fileID: 0}
plane1: {fileID: 0}
plane2: {fileID: 0}
@ -4798,6 +5048,7 @@ ParticleSystem:
sizeAffectsWidth: 1
sizeAffectsLifetime: 0
inheritParticleColor: 1
generateLightingData: 0
colorOverLifetime:
serializedVersion: 2
minMaxState: 0
@ -5501,21 +5752,6 @@ MonoBehaviour:
forceCrouchVelocity: 30
forceCrouchDuration: 0.4
animationHandle: {fileID: 1204355835}
OnJump:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnLand:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnHardLand:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
--- !u!114 &1204355834
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5882,6 +6118,7 @@ Transform:
- {fileID: 16304517}
- {fileID: 522034803}
- {fileID: 1512255394}
- {fileID: 593551844}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 215ee35c3c4c6f24a918378a3eb209e2
timeCreated: 1574255533
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,54 @@
/******************************************************************************
* Spine Runtimes License Agreement
* Last updated May 1, 2019. Replaces all prior versions.
*
* Copyright (c) 2013-2019, Esoteric Software LLC
*
* Integration of the Spine Runtimes into software or otherwise creating
* derivative works of the Spine Runtimes is permitted under the terms and
* conditions of Section 2 of the Spine Editor License Agreement:
* http://esotericsoftware.com/spine-editor-license
*
* Otherwise, it is permitted to integrate the Spine Runtimes into software
* or otherwise create derivative works of the Spine Runtimes (collectively,
* "Products"), provided that each user of the Products must obtain their own
* Spine Editor license and redistribution of the Products in any form must
* include this license and copyright notice.
*
* THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS
* INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/
using UnityEngine;
namespace Spine.Unity.Examples {
/// <summary>
/// This component is intended to increase the physics solver iteration count
/// for Rigidbody Joint setups which would otherwise be too unstable.
///
/// To use this example component, add it to a GameObject which is parent of
/// one or more Rigidbody instances. The physics setting "solver iteration count"
/// will be overwritten by the provided value.
/// </summary>
[DisallowMultipleComponent]
public class SetRigidbodySolverIterations : MonoBehaviour
{
public int solverIterations = 30;
void Awake () {
var rigidbodies = this.GetComponentsInChildren<Rigidbody>();
foreach (var rb in rigidbodies) {
rb.solverIterations = solverIterations;
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0710ab226a06cfa4689c784fbd9d1753
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: