diff --git a/Assets/Resources/Games/nailCarpenter.prefab b/Assets/Resources/Games/nailCarpenter.prefab
index 4a9dced54..48c54d49a 100644
--- a/Assets/Resources/Games/nailCarpenter.prefab
+++ b/Assets/Resources/Games/nailCarpenter.prefab
@@ -319,6 +319,7 @@ GameObject:
m_Component:
- component: {fileID: 2386958562105982188}
- component: {fileID: 8184214599578109171}
+ - component: {fileID: 4107796134930477793}
m_Layer: 0
m_Name: Sprite
m_TagString: Untagged
@@ -387,12 +388,33 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 2.06, y: 5.1213555}
+ m_Size: {x: 6.6800003, y: 4.39}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!95 &4107796134930477793
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 392625137949358842}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: a62323d76741c52498ad0eeb655934e9, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
--- !u!1 &516766874453103253
GameObject:
m_ObjectHideFlags: 0
@@ -507,7 +529,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 6
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &628562932587900598
SpriteRenderer:
@@ -615,7 +637,6 @@ MonoBehaviour:
baseNail: {fileID: 7504610799131467556}
baseLongNail: {fileID: 4122843866948130824}
baseSweet: {fileID: 7846700753925185796}
- splashEffect: {fileID: 0}
Carpenter: {fileID: 2757472879240741117}
EyeAnim: {fileID: 2857868484672891618}
EffectExclamRed: {fileID: 5086085623578673087}
@@ -738,7 +759,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &498580287239016483
SpriteRenderer:
@@ -907,7 +928,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1958010526323924417
SpriteRenderer:
@@ -1264,112 +1285,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &4848528940473401432
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1343630282582536630}
- - component: {fileID: 1040459508249454975}
- - component: {fileID: 4520902216272165244}
- m_Layer: 0
- m_Name: Shock
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1343630282582536630
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4848528940473401432}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 4.3200006, y: 6.3999996, z: 0}
- m_LocalScale: {x: 0.82348216, y: 0.82348216, z: 0.82348216}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1040459508249454975
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4848528940473401432}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 3
- m_Sprite: {fileID: -3836040944532565682, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!95 &4520902216272165244
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4848528940473401432}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 210a4e33fafd33648a08e2d41e9e5e8a, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
--- !u!1 &4871857941010608731
GameObject:
m_ObjectHideFlags: 0
@@ -1434,7 +1349,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &779285172543893336
SpriteRenderer:
@@ -1760,8 +1675,6 @@ Transform:
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_ConstrainProportionsScale: 1
m_Children:
- - {fileID: 2953416184645660492}
- - {fileID: 1343630282582536630}
- {fileID: 2245184887777049228}
- {fileID: 902478847085845914}
- {fileID: 2801679327505365880}
@@ -1791,112 +1704,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
---- !u!1 &6276431434877635895
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2953416184645660492}
- - component: {fileID: 4235379081842009871}
- - component: {fileID: 8341707499396311101}
- m_Layer: 0
- m_Name: Sweat
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2953416184645660492
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6276431434877635895}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.30514, y: 3.807425, z: 0}
- m_LocalScale: {x: 0.7746297, y: 0.7746297, z: 0.7746297}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &4235379081842009871
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6276431434877635895}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: 3476064484651541662, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!95 &8341707499396311101
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6276431434877635895}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: f383738438c8c364a99ba374f24c2b05, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
--- !u!1 &7221550247814562608
GameObject:
m_ObjectHideFlags: 0
@@ -2012,7 +1819,7 @@ Transform:
- {fileID: 4076638745649260554}
- {fileID: 2862695934344722450}
m_Father: {fileID: 7328263959058613448}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7266185494511890522
GameObject:
@@ -2139,20 +1946,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
targetBeat: 0
- sweetSprites:
- - {fileID: -53022554, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 1585842764, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 2042456146, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 1165805359, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: -594144686, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 2086215142, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 1776179193, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: -227709912, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 446269152, guid: 135c6f0d85710084799448c4874e0784, type: 3}
- - {fileID: 1988436020, guid: 135c6f0d85710084799448c4874e0784, type: 3}
sweetType: 0
- sweetSprite: {fileID: 8184214599578109171}
- pudAnim: {fileID: 0}
+ sweetAnim: {fileID: 4107796134930477793}
--- !u!1 &7940810347463623349
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png
index adfeefffc..211b61a81 100644
Binary files a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png and b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png.meta
index 7a1ddd006..897d052a2 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter.png.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
-guid: 32d1d516dd9e8a248a28427c20e22955
+guid: fd8231e93cfaecb4482d868201d546a9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
- mipMapMode: 0
- enableMipMap: 0
+ mipMapMode: 1
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
- aniso: 1
+ aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1
@@ -63,14 +63,14 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
- cookieLightType: 0
+ cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -79,10 +79,10 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -91,10 +91,10 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png
index 0934a7670..356897611 100644
Binary files a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png and b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png.meta
index 8f07cb061..a68670d50 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/nailCarpenter_mask.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
-guid: 9a609aff6f165c74493a8eaa39e88dde
+guid: afe9efa1730d67d4c9cd6d803ed230c6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
+ mipMapMode: 1
+ enableMipMap: 1
+ sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
- aniso: 1
+ aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1
@@ -63,14 +63,14 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
- cookieLightType: 0
+ cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -79,10 +79,10 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -91,10 +91,10 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Carpenter.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Carpenter.controller
index 2f6955bad..b4889ceaa 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Carpenter.controller
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Carpenter.controller
@@ -57,7 +57,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: carpenterPower
+ m_Name: carpenterArmUp
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/LongNail.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/LongNail.controller
index 38a4ecdff..3b40ebf73 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/LongNail.controller
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/LongNail.controller
@@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7271644276132071185
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: longNailBendLeft
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 8edd1ce1cc1cedb43940a4c530e275fd, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &-3337252820283642816
AnimatorState:
serializedVersion: 6
@@ -74,6 +100,32 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
+--- !u!1102 &243100611544729756
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: longNailBendRight
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 5224a3f8f5333714a8154d0fd0dfa19b, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1107 &4512912133804348782
AnimatorStateMachine:
serializedVersion: 6
@@ -92,6 +144,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -1633523492391771366}
m_Position: {x: 310, y: 150, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -7271644276132071185}
+ m_Position: {x: 345, y: 215, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 243100611544729756}
+ m_Position: {x: 380, y: 280, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Nail.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Nail.controller
index fdfdcbc91..85747ee02 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Nail.controller
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Nail.controller
@@ -11,13 +11,22 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -8524752105305345992}
- m_Position: {x: 240, y: 120, z: 0}
+ m_Position: {x: 480, y: 40, z: 0}
- serializedVersion: 1
m_State: {fileID: -1410022145023667833}
m_Position: {x: 240, y: 20, z: 0}
- serializedVersion: 1
m_State: {fileID: 403443316709249489}
m_Position: {x: 275, y: 85, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8353160983539747381}
+ m_Position: {x: 310, y: 150, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -9155058905106198520}
+ m_Position: {x: 345, y: 215, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8811336382301164481}
+ m_Position: {x: 400, y: 280, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -28,6 +37,58 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1410022145023667833}
+--- !u!1102 &-9155058905106198520
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: nailBendLeft
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: e4d327d290e7dd14eb07ef62e4e9765d, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-8811336382301164481
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: nailBendRight
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 1836a2c035adacf4a96e95db99f44d44, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &-8524752105305345992
AnimatorState:
serializedVersion: 6
@@ -128,3 +189,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &8353160983539747381
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: nailMiss
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 1836a2c035adacf4a96e95db99f44d44, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Pudding.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Pudding.controller
deleted file mode 100644
index a86492448..000000000
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Pudding.controller
+++ /dev/null
@@ -1,101 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1107 &-6849811874378208298
-AnimatorStateMachine:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Base Layer
- m_ChildStates:
- - serializedVersion: 1
- m_State: {fileID: 2893444091354688168}
- m_Position: {x: 260, y: 130, z: 0}
- - serializedVersion: 1
- m_State: {fileID: 682558441940608503}
- m_Position: {x: 260, y: 20, z: 0}
- m_ChildStateMachines: []
- m_AnyStateTransitions: []
- m_EntryTransitions: []
- m_StateMachineTransitions: {}
- m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
- m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 682558441940608503}
---- !u!91 &9100000
-AnimatorController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Pudding
- serializedVersion: 5
- m_AnimatorParameters: []
- m_AnimatorLayers:
- - serializedVersion: 5
- m_Name: Base Layer
- m_StateMachine: {fileID: -6849811874378208298}
- m_Mask: {fileID: 0}
- m_Motions: []
- m_Behaviours: []
- m_BlendingMode: 0
- m_SyncedLayerIndex: -1
- m_DefaultWeight: 0
- m_IKPass: 0
- m_SyncedLayerAffectsTiming: 0
- m_Controller: {fileID: 9100000}
---- !u!1102 &682558441940608503
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: puddingIdle
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 079d68750a2904746a3994f657fff853, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
---- !u!1102 &2893444091354688168
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: puddingBreak
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 37c9c049cdacb0047baaf82d4a661bcd, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Sweet.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Sweet.controller
new file mode 100644
index 000000000..a28c30d7b
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Sweet.controller
@@ -0,0 +1,333 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8070186423553084032
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: shortCakeIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: f6b4cafa56337b34283f911f95ea986f, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-6849811874378208298
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 2893444091354688168}
+ m_Position: {x: 500, y: 20, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 682558441940608503}
+ m_Position: {x: 260, y: 20, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8178277134864833334}
+ m_Position: {x: 295, y: 85, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 3216438941097669336}
+ m_Position: {x: 330, y: 150, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8070186423553084032}
+ m_Position: {x: 365, y: 215, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 7213828797245955335}
+ m_Position: {x: 400, y: 280, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 3296339952172564804}
+ m_Position: {x: 435, y: 345, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 982607719459697762}
+ m_Position: {x: 470, y: 410, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 2842904788331255049}
+ m_Position: {x: 505, y: 475, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -6609778618870614436}
+ m_Position: {x: 540, y: 540, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 682558441940608503}
+--- !u!1102 &-6609778618870614436
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: layerCakeIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 077b5f941c83ae74f9f9ed17707c9b8a, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Sweet
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -6849811874378208298}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1102 &682558441940608503
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: puddingIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 079d68750a2904746a3994f657fff853, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &982607719459697762
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: ccb51a71577a66341b38a7bb22167e2f, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &2842904788331255049
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: layerCakeBreak
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: e238d9cf04a6c3b4683940d85463c6b7, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &2893444091354688168
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: puddingBreak
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 37c9c049cdacb0047baaf82d4a661bcd, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &3216438941097669336
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryPuddingBreak
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 3ecb3aea07ea958499179cd078eea715, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &3296339952172564804
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryBreak
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 5050d5a1af57cff42b2eebe7de2a4306, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &7213828797245955335
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: shortCakeBreak
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: c140d92db0ec6d540ab5d4ab0ab269f9, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &8178277134864833334
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryPuddingIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: deaa67aa7cbe60c49af400effe1cad7a, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Pudding.controller.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Sweet.controller.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Pudding.controller.meta
rename to Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/Sweet.controller.meta
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim
new file mode 100644
index 000000000..ef3c84fc1
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryBreak
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 1776179193, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: -227709912, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 1776179193, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: -227709912, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.06666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim.meta
new file mode 100644
index 000000000..304a4bfdf
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryBreak.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5050d5a1af57cff42b2eebe7de2a4306
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim
new file mode 100644
index 000000000..74c214d0a
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim
@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryIdle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 1776179193, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 1776179193, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.016666668
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim.meta
new file mode 100644
index 000000000..5ecfafce1
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccb51a71577a66341b38a7bb22167e2f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim
new file mode 100644
index 000000000..a15df0461
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryPuddingBreak
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 2042456146, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 1165805359, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 2042456146, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 1165805359, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.06666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim.meta
new file mode 100644
index 000000000..02822e40a
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingBreak.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ecb3aea07ea958499179cd078eea715
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim
new file mode 100644
index 000000000..eb065fb53
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim
@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: cherryPuddingIdle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 2042456146, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 2042456146, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.016666668
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim.meta
new file mode 100644
index 000000000..482dee141
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/cherryPuddingIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: deaa67aa7cbe60c49af400effe1cad7a
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim
new file mode 100644
index 000000000..ed11541f2
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: layerCakeBreak
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 446269152, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 1988436020, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 446269152, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 1988436020, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.06666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim.meta
new file mode 100644
index 000000000..585e9797a
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeBreak.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e238d9cf04a6c3b4683940d85463c6b7
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim
new file mode 100644
index 000000000..658bea063
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim
@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: layerCakeIdle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 446269152, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 446269152, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.016666668
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim.meta
new file mode 100644
index 000000000..995ce52f4
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/layerCakeIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 077b5f941c83ae74f9f9ed17707c9b8a
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingBreak.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingBreak.anim
index f1d3d14ae..2c9aa43f9 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingBreak.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingBreak.anim
@@ -20,7 +20,9 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: -167048344, guid: 3c043f7f9f4f0584786494e33406fb6e, type: 3}
+ value: {fileID: -53022554, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 1585842764, guid: 135c6f0d85710084799448c4874e0784, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -40,18 +42,19 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: -167048344, guid: 3c043f7f9f4f0584786494e33406fb6e, type: 3}
+ - {fileID: -53022554, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 1585842764, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.016666668
+ m_StopTime: 0.06666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingIdle.anim
index b304f6ba9..f7b3d62e5 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingIdle.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/puddingIdle.anim
@@ -17,21 +17,36 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -53022554, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -53022554, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim
new file mode 100644
index 000000000..6b5046092
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: shortCakeBreak
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -594144686, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 2086215142, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -594144686, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 2086215142, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.06666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim.meta
new file mode 100644
index 000000000..dd4e129f2
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeBreak.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c140d92db0ec6d540ab5d4ab0ab269f9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim
new file mode 100644
index 000000000..fb20feab1
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim
@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: shortCakeIdle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -594144686, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -594144686, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.016666668
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim.meta b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim.meta
new file mode 100644
index 000000000..838897078
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/Sweet/shortCakeIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6b4cafa56337b34283f911f95ea986f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
index 51d18f288..44d41407a 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
@@ -54,7 +54,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0, y: 1.3, z: 0}
+ value: {x: 0, y: 1.1, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -63,7 +63,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.05
- value: {x: -0.02, y: 1.08, z: 0}
+ value: {x: 0, y: 1.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -72,7 +72,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.25
- value: {x: 0, y: 1.3, z: 0}
+ value: {x: 0, y: 1.1, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -251,24 +251,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.25
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -288,24 +270,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
- value: -0.02
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.25
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -318,7 +282,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 1.3
+ value: 1.1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -327,7 +291,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
- value: 1.08
+ value: 1.05
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -336,7 +300,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
- value: 1.3
+ value: 1.1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -362,24 +326,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.25
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterIdle.anim
index cff556abb..78c99ab00 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterIdle.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterIdle.anim
@@ -14,24 +14,85 @@ AnimationClip:
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
- m_PositionCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: 1.1, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Body
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: 3.36, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Head
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -1543273638, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ attribute: m_Sprite
+ path: Arm
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 2685614196
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 2073732236
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 130111906
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping:
+ - {fileID: -1543273638, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -46,7 +107,121 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Body
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1.1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Body
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Body
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Head
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 3.36
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Head
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Head
+ classID: 4
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/exclamAppear.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/exclamAppear.anim
index 12f77357c..9595b4c38 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/exclamAppear.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/exclamAppear.anim
@@ -30,7 +30,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -58,7 +58,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -86,7 +86,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -114,8 +114,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
- value: 0.028198242
+ time: 0.25
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 1
@@ -171,7 +171,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.16666667
+ m_StopTime: 0.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -200,7 +200,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -228,7 +228,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -256,7 +256,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
+ time: 0.25
value: 1
inSlope: 0
outSlope: 0
@@ -284,8 +284,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.16666667
- value: 0.028198242
+ time: 0.25
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 1
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eye.controller b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eye.controller
index c1757f1b1..02c7aa024 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eye.controller
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eye.controller
@@ -1,5 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8991347335423006864
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: eyeSmile
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: f66b4c7a373cc7d43a24327564f0ae67, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-2988018621967053990
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 1886951684169529561}
+ m_Position: {x: 200, y: 0, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8989804358782864153}
+ m_Position: {x: 235, y: 65, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8991347335423006864}
+ m_Position: {x: 270, y: 130, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 8989804358782864153}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -9,4 +63,68 @@ AnimatorController:
m_Name: eye
serializedVersion: 5
m_AnimatorParameters: []
- m_AnimatorLayers: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -2988018621967053990}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1102 &1886951684169529561
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: eyeBlink
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 06b1b3a4e8dcee547a9edc5dc3bf2548, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &8989804358782864153
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: eyeOpen
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: aa83a522fc67ea645b2116a174ba1fca, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeBlink.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeBlink.anim
index 44a142bc1..365fb0a8d 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeBlink.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeBlink.anim
@@ -21,7 +21,7 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 1041909238, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.33333334
+ - time: 0.16666667
value: {fileID: 288899377, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
attribute: m_Sprite
path:
@@ -49,7 +49,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.35000002
+ m_StopTime: 0.18333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeSmile.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeSmile.anim
index 831f37430..eff71c439 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeSmile.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/eyeSmile.anim
@@ -17,26 +17,47 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 288899377, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ - time: 0.16666667
+ value: {fileID: 39671668, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ - time: 0.5
+ value: {fileID: 288899377, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 288899377, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ - {fileID: 39671668, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
+ - {fileID: 288899377, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.51666665
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendLeft.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendLeft.anim
index 3f8ce3f60..8d54a4c3f 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendLeft.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendLeft.anim
@@ -16,27 +16,80 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
- m_FloatCurves: []
- m_PPtrCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_FlipX
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -251074732, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 1922842219, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 555744692
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -251074732, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 1922842219, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.06666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -46,7 +99,35 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_FlipX
+ path:
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendRight.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendRight.anim
index d8c7b7a72..dba17655f 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendRight.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailBendRight.anim
@@ -17,26 +17,44 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -251074732, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 1922842219, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -251074732, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 1922842219, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.06666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailHammered.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailHammered.anim
index 8ccf26f53..6483f8621 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailHammered.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailHammered.anim
@@ -20,13 +20,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -2.4, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -4.1, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
- inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -54,12 +63,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0
+ m_StopTime: 0.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -80,8 +89,17 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -94,13 +112,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -2.4
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -4.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -118,8 +145,17 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailIdle.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailIdle.anim
index c16da0350..f3f4cbedf 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailIdle.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailIdle.anim
@@ -19,7 +19,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
+ time: 0.05
value: {x: 0, y: -2.4, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -54,7 +54,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0
+ m_StopTime: 0.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -74,7 +74,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
+ time: 0.05
value: 0
inSlope: 0
outSlope: 0
@@ -93,7 +93,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
+ time: 0.05
value: -2.4
inSlope: 0
outSlope: 0
@@ -112,7 +112,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 0
+ time: 0.05
value: 0
inSlope: 0
outSlope: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailWeakHammered.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailWeakHammered.anim
index 546af1158..0ab5e9ace 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailWeakHammered.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/longNailWeakHammered.anim
@@ -20,13 +20,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -2.4, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -3.3, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
- inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -36,13 +45,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -3.5, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -1.7, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
- inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -54,6 +72,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -76,13 +103,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- - serializedVersion: 2
- path: 3319962672
- attribute: 2086281974
- script: {fileID: 0}
- typeID: 1
- customType: 0
- isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1
@@ -97,18 +117,25 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3319962672
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0
+ m_StopTime: 0.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -129,8 +156,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -143,13 +170,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -2.4
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -3.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -167,8 +203,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -181,6 +217,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -205,8 +250,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -219,13 +264,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -3.5
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -1.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -243,8 +297,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendLeft.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendLeft.anim
index da808a835..af458c064 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendLeft.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendLeft.anim
@@ -16,27 +16,80 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
- m_FloatCurves: []
- m_PPtrCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_FlipX
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 2007520685, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 267010933, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 555744692
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 2007520685, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 267010933, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.06666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -46,7 +99,35 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_FlipX
+ path:
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendRight.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendRight.anim
index 8d3207140..a01266c77 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendRight.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailBendRight.anim
@@ -17,26 +17,44 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 2007520685, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - time: 0.05
+ value: {fileID: 267010933, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 2007520685, guid: 135c6f0d85710084799448c4874e0784, type: 3}
+ - {fileID: 267010933, guid: 135c6f0d85710084799448c4874e0784, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.06666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailHammered.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailHammered.anim
index b33652c32..fe0146faf 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailHammered.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailHammered.anim
@@ -20,6 +20,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -2.4, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -4.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -54,12 +63,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0
+ m_StopTime: 0.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -82,6 +91,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -94,6 +112,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -2.4
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -4.05
inSlope: 0
outSlope: 0
@@ -120,6 +147,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailStrongHammered.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailStrongHammered.anim
index c0b641616..4d89fd691 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailStrongHammered.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/nailStrongHammered.anim
@@ -20,6 +20,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -2.4, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -4.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -36,6 +45,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: {x: 0, y: -3.5, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: Infinity, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.05
value: {x: 0, y: -0.2, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -54,6 +72,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -76,13 +103,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- - serializedVersion: 2
- path: 3319962672
- attribute: 2086281974
- script: {fileID: 0}
- typeID: 1
- customType: 0
- isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1
@@ -97,18 +117,25 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3319962672
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0
+ m_StopTime: 0.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -131,6 +158,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -143,6 +179,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -2.4
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -4.05
inSlope: 0
outSlope: 0
@@ -169,6 +214,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -181,6 +235,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.05
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -219,13 +282,22 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
+ value: -3.5
+ inSlope: 0
+ outSlope: Infinity
+ tangentMode: 97
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
value: -0.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
- inWeight: 0
- outWeight: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
diff --git a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
index 71831c2ce..3fc45216a 100644
--- a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
+++ b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
@@ -44,7 +44,7 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("fillRatio", new EntityTypes.Float(0f, 1f, 0.3f), "Ratio", "Set the speed that the background should scroll."),
+ new Param("fillRatio", new EntityTypes.Float(0f, 1f, 0.3f), "Ratio", "Set the ratio of closing the fusuma."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action."),
new Param("mute", false, "Mute", "Toggle if the cue should be muted.")
}
@@ -83,16 +83,6 @@ namespace HeavenStudio.Games
private bool missed;
private bool hasSlurped;
- enum sweetsType
- {
- Pudding=0,
- CherryPudding=1,
- ShortCake=2,
- Cherry=3,
- LayerCake=4,
- };
-
-
const int IAAltDownCat = IAMAXCAT;
const int IAAltUpCat = IAMAXCAT + 1;
@@ -223,9 +213,9 @@ namespace HeavenStudio.Games
})
});
SpawnSweet(targetNailBeat, startBeat,
- (b==0 ? (int)sweetsType.ShortCake : (int)sweetsType.Cherry));
+ (b==0 ? Sweet.sweetsType.ShortCake : Sweet.sweetsType.Cherry));
SpawnNail(targetNailBeat+0.5f, startBeat);
- SpawnSweet(targetNailBeat+1.0f, startBeat, (int)sweetsType.Cherry);
+ SpawnSweet(targetNailBeat+1.0f, startBeat, Sweet.sweetsType.Cherry);
SpawnNail(targetNailBeat+1.25f, startBeat);
SpawnNail(targetNailBeat+1.75f, startBeat);
}
@@ -249,8 +239,8 @@ namespace HeavenStudio.Games
{
sounds.Add(new MultiSound.Sound("nailCarpenter/one", targetNailBeat));
SpawnSweet(targetNailBeat, startBeat,
- (IsInRange(cherryTargetBeats, targetNailBeat) ? (int)sweetsType.Cherry :
- (int)sweetsType.Pudding));
+ (IsInRange(cherryTargetBeats, targetNailBeat) ? Sweet.sweetsType.Cherry :
+ Sweet.sweetsType.Pudding));
SpawnNail(targetNailBeat+0.5f, startBeat);
}
}
@@ -272,8 +262,8 @@ namespace HeavenStudio.Games
{
sounds.Add(new MultiSound.Sound("nailCarpenter/three", targetNailBeat));
SpawnSweet(targetNailBeat, startBeat,
- (IsInRange(cherryTargetBeats, targetNailBeat) ? (int)sweetsType.Cherry :
- (int)sweetsType.CherryPudding));
+ (IsInRange(cherryTargetBeats, targetNailBeat) ? Sweet.sweetsType.Cherry :
+ Sweet.sweetsType.CherryPudding));
SpawnNail(targetNailBeat+0.5f, startBeat);
SpawnNail(targetNailBeat+1.0f, startBeat);
SpawnNail(targetNailBeat+1.5f, startBeat);
@@ -309,8 +299,8 @@ namespace HeavenStudio.Games
}),
});
SpawnSweet(targetNailBeat, startBeat,
- (IsInRange(cherryTargetBeats, targetNailBeat) ? (int)sweetsType.Cherry :
- (int)sweetsType.LayerCake));
+ (IsInRange(cherryTargetBeats, targetNailBeat) ? Sweet.sweetsType.Cherry :
+ Sweet.sweetsType.LayerCake));
SpawnNail(targetNailBeat+0.5f, startBeat);
SpawnLongNail(targetNailBeat+1f, startBeat);
}
@@ -373,17 +363,17 @@ namespace HeavenStudio.Games
newNail.Init();
newNail.gameObject.SetActive(true);
}
- private void SpawnSweet(double beat, double startBeat, int sweetType)
+ private void SpawnSweet(double beat, double startBeat, Sweet.sweetsType sweetType)
{
var newSweet = Instantiate(baseSweet, nailHolder).GetComponent();
newSweet.targetBeat = beat;
- newSweet.sweetType = 2*sweetType;
+ newSweet.sweetType = sweetType;
var sweetX = (beat - startBeat) * -nailDistance / 2f;
newSweet.transform.localPosition = new Vector3((float)sweetX, 0f, 0f);
- newSweet.Init();
newSweet.gameObject.SetActive(true);
+ newSweet.Init();
}
bool IsInRange(List list, double num)
diff --git a/Assets/Scripts/Games/NailCarpenter/Sweet.cs b/Assets/Scripts/Games/NailCarpenter/Sweet.cs
index 2895c6730..72150eeaa 100644
--- a/Assets/Scripts/Games/NailCarpenter/Sweet.cs
+++ b/Assets/Scripts/Games/NailCarpenter/Sweet.cs
@@ -11,10 +11,18 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
public class Sweet : MonoBehaviour
{
public double targetBeat;
- public Sprite[] sweetSprites;
- public int sweetType;
- public SpriteRenderer sweetSprite;
- public Animator pudAnim;
+ public sweetsType sweetType;
+ public Animator sweetAnim;
+ // public SpriteRenderer sweetSprite;
+
+ public enum sweetsType
+ {
+ Pudding=0,
+ CherryPudding=1,
+ ShortCake=2,
+ Cherry=3,
+ LayerCake=4,
+ };
private NailCarpenter game;
@@ -22,18 +30,61 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
{
game = NailCarpenter.instance;
- sweetSprite.sprite = sweetSprites[sweetType];
+ AwakeAnim();
game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_BasicPress, HammmerJust, Empty, Empty);
game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_AltFinish, HammmerJust, Empty, Empty);
}
+ private void AwakeAnim()
+ {
+ Debug.Log(sweetType);
+ switch(sweetType)
+ {
+ case sweetsType.Pudding:
+ sweetAnim.Play("puddingIdle", -1, 0);
+ break;
+ case sweetsType.CherryPudding:
+ sweetAnim.Play("cherryPuddingIdle", -1, 0);
+ break;
+ case sweetsType.ShortCake:
+ sweetAnim.Play("shortCakeIdle", -1, 0);
+ break;
+ case sweetsType.Cherry:
+ sweetAnim.Play("cherryIdle", -1, 0);
+ break;
+ case sweetsType.LayerCake:
+ sweetAnim.Play("layerCakeIdle", -1, 0);
+ break;
+ }
+ }
+ private void BreakAnim()
+ {
+ switch(sweetType)
+ {
+ case sweetsType.Pudding:
+ sweetAnim.DoScaledAnimationAsync("puddingBreak", 0.5f);
+ break;
+ case sweetsType.CherryPudding:
+ sweetAnim.DoScaledAnimationAsync("cherryPuddingBreak", 0.5f);
+ break;
+ case sweetsType.ShortCake:
+ sweetAnim.DoScaledAnimationAsync("shortCakeBreak", 0.5f);
+ break;
+ case sweetsType.Cherry:
+ sweetAnim.DoScaledAnimationAsync("cherryBreak", 0.5f);
+ break;
+ case sweetsType.LayerCake:
+ sweetAnim.DoScaledAnimationAsync("layerCakeBreak", 0.5f);
+ break;
+ }
+ }
private void HammmerJust(PlayerActionEvent caller, float state)
{
game.ScoreMiss();
+ BreakAnim();
game.Carpenter.DoScaledAnimationAsync("carpenterHit", 0.5f);
SoundByte.PlayOneShot("miss");
game.EyeAnim.DoScaledAnimationAsync("eyeBlink", 0.5f);
- sweetSprite.sprite = sweetSprites[sweetType+1];
}
private void Empty(PlayerActionEvent caller) { }